X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Findexfile.C;h=61e81cb5e48070f76c3ec0a871d2ba6c883b2275;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=dfb5d6b2d21b36993198bd81a7f570c440b2f54a;hpb=49f85559268fc040fe7ba5611cc0520793cf728b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/indexfile.C b/cinelerra-5.1/cinelerra/indexfile.C
index dfb5d6b2..61e81cb5 100644
--- a/cinelerra-5.1/cinelerra/indexfile.C
+++ b/cinelerra-5.1/cinelerra/indexfile.C
@@ -141,7 +141,6 @@ IndexFile::IndexFile(MWindow *mwindow,
 	this->mwindow = mwindow;
 	this->indexable = indexable;
 	redraw_timer = new Timer;
-
 	if(indexable)
 	{
 		indexable->add_user();
@@ -433,6 +432,9 @@ SET_TRACE
 
 // open the source file
 	if(open_source()) return 1;
+	source_channels = indexable->get_audio_channels();
+	source_samplerate = indexable->get_sample_rate();
+	source_length = indexable->get_audio_samples();
 
 SET_TRACE
 
@@ -738,9 +740,7 @@ SET_TRACE
 	int prev_y2 = center_pixel;
 	int first_frame = 1;
 	int zoom_y = mwindow->edl->local_session->zoom_y, zoom_y2 = zoom_y / 2;
-	int max_y = canvas->get_h();
-	int zmax_y = center_pixel + zoom_y2 - 1;
-	if( zmax_y < max_y ) max_y = zmax_y;
+	int max_y = center_pixel + zoom_y2 - 1;
 SET_TRACE
 
 	for(int bufferposition = 0;
@@ -868,16 +868,19 @@ int IndexFile::read_info(Indexable *test_indexable)
 // Read the file format & index state.
 		if(test_indexable->is_asset)
 		{
-			Asset *asset = (Asset*)test_indexable;
+			Asset *test_asset = (Asset *)test_indexable;
+			Asset *asset = new Asset;
 			asset->read(&xml);
-
+			int ret = 0;
 //printf("IndexFile::read_info %d %f\n", __LINE__, asset->get_frame_rate());
 
-			if(asset->format == FILE_UNKNOWN)
-			{
+			if( asset->format == FILE_UNKNOWN ||
+			    test_asset->format != asset->format ) {
 if(debug) printf("IndexFile::read_info %d\n", __LINE__);
-				return 1;
+				ret = 1;
 			}
+			asset->remove_user();
+			if( ret ) return ret;
 		}
 		else
 		{