rework keyframe hide popup, keyframe auto render, textbox set_selection wide text

[goodguy/history.git] / cinelerra-5.1 / cinelerra / file.C

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index f5932e3e8f07a58a1e2b89ac9c50d126443b452d..ddc1a459c0d51db2d63a9ed871bea77806b34d42 100644 (file)
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -65,6 +65,7 @@
 #include "formattools.h"
 #include "framecache.h"
 #include "language.h"
+#include "mainprogress.inc"
 #include "mutex.h"
 #include "mwindow.h"
 #include "packagingengine.h"
@@ -710,12 +711,9 @@ int File::close_file(int ignore_thread)
 
 
 
-int File::get_index(char *index_path)
+int File::get_index(IndexFile *index_file, MainProgressBar *progress_bar)
 {
-       if(file) {
-               return file->get_index(index_path);
-       }
-       return 1;
+       return !file ? -1 : file->get_index(index_file, progress_bar);
 }
 
 
@@ -1435,6 +1433,7 @@ int File::get_best_colormodel(Asset *asset, int driver)
                case FILE_CR2:
                case FILE_CR2_LIST:     return FileCR2::get_best_colormodel(asset, driver);
                case FILE_DB:           return FileDB::get_best_colormodel(asset, driver);
+               case FILE_FFMPEG:       return FileFFMPEG::get_best_colormodel(asset, driver);
        }
 
        return BC_RGB888;