fix messed up cut/paste in thirdparty/Makefile / last checkin

[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..57b09f0eac0aad61c38787bb2877dc4b55b9c733 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"
@@ -176,6 +177,7 @@ int File::get_options(FormatTools *format,
                                audio_options,
                                video_options);
                        break;
+#ifdef HAVE_DV
                case FILE_RAWDV:
                        FileDV::get_parameters(parent_window,
                                asset,
@@ -183,6 +185,7 @@ int File::get_options(FormatTools *format,
                                audio_options,
                                video_options);
                        break;
+#endif
                case FILE_PCM:
                case FILE_WAV:
                case FILE_AU:
@@ -416,12 +419,14 @@ int File::open_file(Preferences *preferences,
                                file = new FileScene(this->asset, this);
                                break;
                        }
+#ifdef HAVE_DV
                        if(FileDV::check_sig(this->asset)) {
 // libdv
                                fclose(stream);
                                file = new FileDV(this->asset, this);
                                break;
                        }
+#endif
                        if(FileSndFile::check_sig(this->asset)) {
 // libsndfile
                                fclose(stream);
@@ -591,11 +596,11 @@ int File::open_file(Preferences *preferences,
                case FILE_VORBIS:
                        file = new FileVorbis(this->asset, this);
                        break;
-
+#ifdef HAVE_DV
                case FILE_RAWDV:
                        file = new FileDV(this->asset, this);
                        break;
-
+#endif
 // try plugins
                default:
                        return 1;
@@ -710,12 +715,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);
 }
 
 
@@ -1422,7 +1424,9 @@ int File::get_best_colormodel(Asset *asset, int driver)
 {
        switch(asset->format)
        {
+#ifdef HAVE_FIREWIRE
                case FILE_RAWDV:        return FileDV::get_best_colormodel(asset, driver);
+#endif
                case FILE_MPEG:         return FileMPEG::get_best_colormodel(asset, driver);
                case FILE_JPEG:
                case FILE_JPEG_LIST:    return FileJPEG::get_best_colormodel(asset, driver);
@@ -1435,6 +1439,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;