olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

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

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index 74c4cf09f17a3d2985e56d7a03db0cf12d025fd5..312f39c8bb218776556fb6584ec28f4c883855ec 100644 (file)
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -27,7 +27,9 @@
 #include "filesystem.h"
 #include "formattools.h"
 #include "language.h"
+#ifdef HAVE_DV
 #include "libdv.h"
+#endif
 #include "libmjpeg.h"
 #include "maxchannels.h"
 #include "mwindow.h"
@@ -46,7 +48,6 @@ FormatTools::FormatTools(MWindow *mwindow,
        this->mwindow = mwindow;
        this->window = window;
        this->asset = asset;
-       this->plugindb = mwindow->plugindb;
 
        aparams_button = 0;
        vparams_button = 0;
@@ -164,7 +165,7 @@ void FormatTools::create_objects(
        format_button->create_objects();
        x += format_button->get_w() + 5;
        window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, 70, 1, asset->fformat));
-       FFMPEG::set_asset_format(asset, asset->fformat);
+       FFMPEG::set_asset_format(asset, mwindow->edl, asset->fformat);
        x += ffmpeg_type->get_w();
        window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y, this));
        format_ffmpeg->create_objects();
@@ -261,11 +262,12 @@ void FormatTools::update_driver(int driver)
                        format_text->update(File::formattostr(asset->format));
 
                        switch(driver) {
+#ifdef HAVE_DV
                        case CAPTURE_IEC61883:
                        case CAPTURE_FIREWIRE:
                                locked_compressor = (char*)CODEC_TAG_DVSD;
                                break;
-
+#endif
                        case VIDEO4LINUX2JPEG:
                                locked_compressor = (char*)CODEC_TAG_MJPEG;
                                break;
@@ -753,7 +755,7 @@ int FormatFormat::handle_event()
 
 
 FormatFFMPEG::FormatFFMPEG(int x, int y, FormatTools *format)
- : FFMPEGPopup(format->plugindb, x, y)
+ : FFMPEGPopup(x, y)
 {
        this->format = format;
 }
@@ -770,7 +772,7 @@ int FormatFFMPEG::handle_event()
                format->ffmpeg_type->update(text);
                format->asset->ff_audio_options[0] = 0;
                format->asset->ff_video_options[0] = 0;
-               FFMPEG::set_asset_format(format->asset, text);
+               FFMPEG::set_asset_format(format->asset, format->mwindow->edl, text);
                format->update_extension();
                format->close_format_windows();
                format->update_format();