p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

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

diff --git a/cinelerra-5.1/cinelerra/fileogg.C b/cinelerra-5.1/cinelerra/fileogg.C
index a0fc9b18e01f3c617fedc91303610db681d9824a..99995fe975711988a77aec82167f866e9b3851c2 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileogg.C
+++ b/cinelerra-5.1/cinelerra/fileogg.C
@@ -100,10 +100,8 @@ FileOGG::~FileOGG()
 }
 
 void FileOGG::get_parameters(BC_WindowBase *parent_window,
-       Asset *asset,
-       BC_WindowBase* &format_window,
-       int audio_options,
-       int video_options)
+       Asset *asset, BC_WindowBase* &format_window,
+       int audio_options, int video_options, EDL *edl)
 {
        if(audio_options)
        {
@@ -2005,8 +2003,7 @@ OGGConfigAudio::OGGConfigAudio(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Audio Compression"),
        parent_window->get_abs_cursor_x(1),
        parent_window->get_abs_cursor_y(1),
-       350,
-       250)
+       350, 250)
 {
        this->parent_window = parent_window;
        this->asset = asset;
@@ -2132,8 +2129,7 @@ OGGConfigVideo::OGGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
        parent_window->get_abs_cursor_x(1),
        parent_window->get_abs_cursor_y(1),
-       450,
-       220)
+       450, 220)
 {
        this->parent_window = parent_window;
        this->asset = asset;
@@ -2158,18 +2154,10 @@ void OGGConfigVideo::create_objects()
        y += 30;
 
        add_subwindow(new BC_Title(x, y, _("Quality:")));
-       add_subwindow(new BC_ISlider(x + 80,
-               y,
-               0,
-               200,
-               200,
-               0,
-               63,
-               asset->theora_quality,
-               0,
-               0,
-               &asset->theora_quality));
-
+       add_subwindow(new BC_ISlider(x + 80, y, 0,
+               200, 200, 0, 63,
+               asset->theora_quality, 0,
+               0, &asset->theora_quality));
 
        add_subwindow(fixed_quality = new OGGTheoraFixedQuality(x2, y, this));
        y += 30;
@@ -2199,8 +2187,6 @@ void OGGConfigVideo::create_objects()
 }
 
 
-
-
 int OGGConfigVideo::close_event()
 {
        set_done(0);