X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffile.C;h=ad8cf7fc4c294ee08a9160fd6a732a69e34830a2;hb=9c8644d5f3f05b52a81c259c32217bcd57792ae5;hp=c53842842e6380e84fb91f46c0ab0d49a12c0270;hpb=f4204ea29aa3760a91c10791944ab848dd74ef8c;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index c5384284..ad8cf7fc 100644
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -415,8 +415,11 @@ int File::probe()
 			return FILE_OK;
 		}
 		if( !strcmp(pref->name,"GIF") ) { // GIF file
-			if( !FileGIF::check_sig(this->asset)) continue;
-			file = new FileGIF(this->asset, this);
+			if( FileGIFList::check_sig(this->asset) )
+				file = new FileGIFList(this->asset, this);
+			else if( FileGIF::check_sig(this->asset) )
+				file = new FileGIF(this->asset, this);
+			else continue;
 			return FILE_OK;
 		}
 #ifdef HAVE_EXR
@@ -526,9 +529,12 @@ int File::open_file(Preferences *preferences,
 		break;
 
 	case FILE_GIF:
-	case FILE_GIF_LIST:
 		file = new FileGIF(this->asset, this);
 		break;
+	case FILE_GIF_LIST:
+		file = new FileGIFList(this->asset, this);
+		break;
+
 #ifdef HAVE_OPENEXR
 	case FILE_EXR:
 	case FILE_EXR_LIST:
@@ -651,17 +657,10 @@ void File::delete_temp_frame_buffer()
 
 int File::close_file(int ignore_thread)
 {
-	const int debug = 0;
-
-	if( debug ) printf("File::close_file file=%p %d\n", file, __LINE__);
-
 	if( !ignore_thread ) {
 		stop_audio_thread();
 		stop_video_thread();
 	}
-
-
-	if( debug ) printf("File::close_file file=%p %d\n", file, __LINE__);
 	if( file ) {
 // The file's asset is a copy of the argument passed to open_file so the
 // user must copy lengths from the file's asset.
@@ -673,28 +672,18 @@ int File::close_file(int ignore_thread)
 		file->close_file();
 		delete file;
 	}
-	if( debug ) printf("File::close_file file=%p %d\n", file, __LINE__);
 
 	delete_temp_samples_buffer();
 	delete_temp_frame_buffer();
-	if( debug ) printf("File::close_file file=%p %d\n", file, __LINE__);
-
-	if( debug ) printf("File::close_file file=%p %d\n", file, __LINE__);
-
 	reset_parameters();
-	if( debug ) printf("File::close_file file=%p %d\n", file, __LINE__);
 	return 0;
 }
 
-
-
 int File::get_index(IndexFile *index_file, MainProgressBar *progress_bar)
 {
 	return !file ? -1 : file->get_index(index_file, progress_bar);
 }
 
-
-
 int File::start_audio_thread(int buffer_size, int ring_buffers)
 {
 	this->audio_ring_buffers = ring_buffers;
@@ -707,20 +696,16 @@ int File::start_audio_thread(int buffer_size, int ring_buffers)
 	return 0;
 }
 
-int File::start_video_thread(int buffer_size,
-	int color_model,
-	int ring_buffers,
-	int compressed)
+int File::start_video_thread(int buffer_size, int color_model,
+		int ring_buffers, int compressed)
 {
 	this->video_ring_buffers = ring_buffers;
 	this->video_buffer_size = buffer_size;
 
 	if( !video_thread ) {
 		video_thread = new FileThread(this, 0, 1);
-		video_thread->start_writing(buffer_size,
-			color_model,
-			ring_buffers,
-			compressed);
+		video_thread->start_writing(buffer_size, color_model,
+				ring_buffers, compressed);
 	}
 	return 0;
 }
@@ -1149,6 +1134,7 @@ int File::read_frame(VFrame *frame, int is_thread)
 
 		if( !temp_frame ) {
 			temp_frame = new VFrame(asset->width, asset->height, supported_colormodel, 0);
+			temp_frame->clear_frame();
 		}
 
 //			printf("File::read_frame %d\n", __LINE__);
@@ -1215,6 +1201,8 @@ int File::strtoformat(const char *format)
 	if( !strcasecmp(format, _(EXR_NAME)) ) return FILE_EXR;
 	if( !strcasecmp(format, _(EXR_LIST_NAME)) ) return FILE_EXR_LIST;
 	if( !strcasecmp(format, _(FLAC_NAME)) ) return FILE_FLAC;
+	if( !strcasecmp(format, _(GIF_NAME)) ) return FILE_GIF;
+	if( !strcasecmp(format, _(GIF_LIST_NAME)) ) return FILE_GIF_LIST;
 	if( !strcasecmp(format, _(CR2_NAME)) ) return FILE_CR2;
 	if( !strcasecmp(format, _(CR2_LIST_NAME)) ) return FILE_CR2_LIST;
 	if( !strcasecmp(format, _(MPEG_NAME)) ) return FILE_MPEG;
@@ -1249,6 +1237,8 @@ const char* File::formattostr(int format)
 	case FILE_CR2:		return _(CR2_NAME);
 	case FILE_CR2_LIST:	return _(CR2_LIST_NAME);
 	case FILE_FLAC:		return _(FLAC_NAME);
+	case FILE_GIF:		return _(GIF_NAME);
+	case FILE_GIF_LIST:	return _(GIF_LIST_NAME);
 	case FILE_EXR:		return _(EXR_NAME);
 	case FILE_EXR_LIST:	return _(EXR_LIST_NAME);
 #ifdef HAVE_LIBZMPEG
@@ -1397,6 +1387,8 @@ int File::renders_video(int format)
 	case FILE_CR2_LIST:
 	case FILE_EXR:
 	case FILE_EXR_LIST:
+	case FILE_GIF:
+	case FILE_GIF_LIST:
 	case FILE_PNG:
 	case FILE_PNG_LIST:
 	case FILE_PPM:
@@ -1468,19 +1460,21 @@ const char* File::get_tag(int format)
 	case FILE_RAWDV:        return "dv";
 	case FILE_DB:           return "db";
 	case FILE_EXR:          return "exr";
-	case FILE_EXR_LIST:     return "exr";
+	case FILE_EXR_LIST:     return "exrs";
 	case FILE_FLAC:         return "flac";
 	case FILE_JPEG:         return "jpg";
-	case FILE_JPEG_LIST:    return "jpg";
+	case FILE_JPEG_LIST:    return "jpgs";
+	case FILE_GIF:          return "gif";
+	case FILE_GIF_LIST:     return "gifs";
 	case FILE_PCM:          return "pcm";
 	case FILE_PNG:          return "png";
-	case FILE_PNG_LIST:     return "png";
+	case FILE_PNG_LIST:     return "pngs";
 	case FILE_PPM:          return "ppm";
-	case FILE_PPM_LIST:     return "ppm";
+	case FILE_PPM_LIST:     return "ppms";
 	case FILE_TGA:          return "tga";
-	case FILE_TGA_LIST:     return "tga";
+	case FILE_TGA_LIST:     return "tgas";
 	case FILE_TIFF:         return "tif";
-	case FILE_TIFF_LIST:    return "tif";
+	case FILE_TIFF_LIST:    return "tifs";
 	case FILE_VMPEG:        return "m2v";
 	case FILE_WAV:          return "wav";
 	case FILE_FFMPEG:       return "ffmpg";