From: Dan Dennedy <dan@dennedy.org>
Date: Mon, 5 Sep 2011 06:17:44 +0000 (-0700)
Subject: Change previous mods to use mlt_multitrack_count()
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=383b7998066f7eb715ac9decd468c02e8937a5a6;p=mlt

Change previous mods to use mlt_multitrack_count()
---

diff --git a/src/modules/melt/producer_melt.c b/src/modules/melt/producer_melt.c
index 8192f2c8..310bc14c 100644
--- a/src/modules/melt/producer_melt.c
+++ b/src/modules/melt/producer_melt.c
@@ -450,8 +450,8 @@ mlt_producer producer_melt_init( mlt_profile profile, mlt_service_type type, con
 	}
 
 	// Set the size of the producer_avformat cache to the number of tracks.
-	if ( track > mlt_service_cache_get_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat" ) )
-		mlt_service_cache_set_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat", track + 2 );
+	if ( mlt_multitrack_count( multitrack ) > mlt_service_cache_get_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat" ) )
+		mlt_service_cache_set_size( MLT_PLAYLIST_SERVICE( playlist ), "producer_avformat", mlt_multitrack_count( multitrack ) + 2 );
 
 	// Connect last producer to playlist
 	if ( producer != NULL && !mlt_producer_is_cut( producer ) )
diff --git a/src/modules/xml/producer_xml.c b/src/modules/xml/producer_xml.c
index bc73f49c..08003c9e 100644
--- a/src/modules/xml/producer_xml.c
+++ b/src/modules/xml/producer_xml.c
@@ -881,8 +881,8 @@ static void on_end_track( deserialise_context context, const xmlChar *name )
 			}
 
 			// Set the size of the producer_avformat cache to the number of tracks.
-			if ( multitrack->count > mlt_service_cache_get_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat" ) )
-				mlt_service_cache_set_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat", multitrack->count + 2 );
+			if ( mlt_multitrack_count( multitrack ) > mlt_service_cache_get_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat" ) )
+				mlt_service_cache_set_size( MLT_MULTITRACK_SERVICE(multitrack), "producer_avformat", mlt_multitrack_count( multitrack ) + 2 );
 		}
 
 		if ( parent != NULL )