X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltPlaylist.cpp;h=14245947c7f7dce69a050a44c6f0a38dd5742f53;hb=c1dda4b336a041cef7ad422a9dffc4705c7128fa;hp=350e53b7ade6f5f0ef29c5c8bdec46439737224e;hpb=47fb1506a99bae1c9cb90f313176f9dab58d5854;p=melted

diff --git a/mlt++/src/MltPlaylist.cpp b/mlt++/src/MltPlaylist.cpp
index 350e53b..1424594 100644
--- a/mlt++/src/MltPlaylist.cpp
+++ b/mlt++/src/MltPlaylist.cpp
@@ -44,7 +44,7 @@ ClipInfo::ClipInfo( mlt_playlist_clip_info *info ) :
 	producer( new Producer( info->producer ) ),
 	cut( new Producer( info->cut ) ),
 	start( info->start ),
-	resource( strdup( info->resource ) ),
+	resource( info->resource? strdup( info->resource )  : 0 ),
 	frame_in( info->frame_in ),
 	frame_out( info->frame_out ),
 	frame_count( info->frame_count ),
@@ -96,6 +96,7 @@ Playlist::Playlist( Service &producer ) :
 }
 
 Playlist::Playlist( Playlist &playlist ) :
+	Mlt::Producer( playlist ),
 	instance( playlist.get_playlist( ) )
 {
 	inc_ref( );
@@ -160,7 +161,8 @@ Producer *Playlist::current( )
 ClipInfo *Playlist::clip_info( int index, ClipInfo *info )
 {
 	mlt_playlist_clip_info clip_info;
-	mlt_playlist_get_clip_info( get_playlist( ), &clip_info, index );
+	if ( mlt_playlist_get_clip_info( get_playlist( ), &clip_info, index ) )
+		return NULL;
 	if ( info == NULL )
 		return new ClipInfo( &clip_info );
 	info->update( &clip_info );