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

diff --git a/cinelerra-5.1/cinelerra/aboutprefs.C b/cinelerra-5.1/cinelerra/aboutprefs.C
index 5f286aef8b7be528b0b2e2eb45be9728b10a5941..d07ce4deac0d5ee77e97dab2596e7afd6cf65f4c 100644 (file)
--- a/cinelerra-5.1/cinelerra/aboutprefs.C
+++ b/cinelerra-5.1/cinelerra/aboutprefs.C
@@ -45,6 +45,7 @@ AboutPrefs::~AboutPrefs()
 
 void AboutPrefs::create_objects()
 {
 
 void AboutPrefs::create_objects()
 {

+       lock_window("AboutPrefs::create_objects");

        int x, y;
 
 
        int x, y;
 
 


@@ -147,6 +148,7 @@ void AboutPrefs::create_objects()
 
        flash();
        flush();
 
        flash();
        flush();

+       unlock_window();

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index f4fe0c3ad3f2f05d3d640ce027115c63ebd46ca6..4b42feff174dc601e3ceef53908c89d335158b0e 100644 (file)
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -72,7 +72,6 @@ int Asset::init_values()
        path[0] = 0;
 // Has to be unknown for file probing to succeed
        format = FILE_UNKNOWN;
        path[0] = 0;
 // Has to be unknown for file probing to succeed
        format = FILE_UNKNOWN;

-       fformat[0] = 0;

        bits = 0;
        byte_order = 0;
        signed_ = 0;
        bits = 0;
        byte_order = 0;
        signed_ = 0;


@@ -84,6 +83,7 @@ int Asset::init_values()
        strcpy(vcodec, "");
        strcpy(acodec, "");
 
        strcpy(vcodec, "");
        strcpy(acodec, "");
 

+       strcpy(fformat,"mp4");

        ff_audio_options[0] = 0;
        ff_sample_format[0] = 0;
        ff_audio_bitrate = 0;
        ff_audio_options[0] = 0;
        ff_sample_format[0] = 0;
        ff_audio_bitrate = 0;

diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C
index 301cf482d94b0e2450acaa9ab6d87ed103340722..ad809f614e610a45a10727474fe55b6286786dfb 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -937,10 +937,12 @@ void DetailAssetWindow::create_objects()
                        break;
                }
        }
                        break;
                }
        }

+       lock_window("DetailAssetWindow::create_objects");

        text = new BC_ScrollTextBox(this, x, y, get_w()-32, 23, info, -len);
        text->create_objects();  text->set_text_row(0);
        add_subwindow(new BC_OKButton(this));
        show_window();
        text = new BC_ScrollTextBox(this, x, y, get_w()-32, 23, info, -len);
        text->create_objects();  text->set_text_row(0);
        add_subwindow(new BC_OKButton(this));
        show_window();

+       unlock_window();

 }
 
 void DetailAssetDialog::start(Asset *asset, int x, int y)
 }
 
 void DetailAssetDialog::start(Asset *asset, int x, int y)

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 059e5850d86de696bbe8462c77bb503c41c7e1fd..59357d184851754ac3c031c508e95c92f0aac12a 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -580,6 +580,7 @@ AssetCopyWindow::~AssetCopyWindow()
 
 void AssetCopyWindow::create_objects()
 {
 
 void AssetCopyWindow::create_objects()
 {

+       lock_window("AssetCopyWindow::create_objects");

        BC_Title *title;
        int x = 10, y = 10, pad = 5;
        add_subwindow(title = new BC_Title(x, y, _("List of asset paths:")));
        BC_Title *title;
        int x = 10, y = 10, pad = 5;
        add_subwindow(title = new BC_Title(x, y, _("List of asset paths:")));


@@ -594,6 +595,7 @@ void AssetCopyWindow::create_objects()
 
        add_subwindow(new BC_OKButton(this));
        show_window();
 
        add_subwindow(new BC_OKButton(this));
        show_window();

+       unlock_window();

 }
 
 int AssetCopyWindow::resize_event(int w, int h)
 }
 
 int AssetCopyWindow::resize_event(int w, int h)


@@ -705,6 +707,7 @@ AssetPasteWindow::~AssetPasteWindow()
 
 void AssetPasteWindow::create_objects()
 {
 
 void AssetPasteWindow::create_objects()
 {

+       lock_window("AssetPasteWindow::create_objects()");

        BC_Title *title;
        int x = 10, y = 10, pad = 5;
        add_subwindow(title = new BC_Title(x, y, _("Enter list of asset paths:")));
        BC_Title *title;
        int x = 10, y = 10, pad = 5;
        add_subwindow(title = new BC_Title(x, y, _("Enter list of asset paths:")));


@@ -717,6 +720,7 @@ void AssetPasteWindow::create_objects()
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();

+       unlock_window();

 }
 
 int AssetPasteWindow::resize_event(int w, int h)
 }
 
 int AssetPasteWindow::resize_event(int w, int h)

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index bffaa2d1268d9a1ebdc933ef5822a31fe2cf1b5c..7ea4759f49fdc36d402fc243b9a5529096a12a10 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -651,7 +651,6 @@ void AssetPicon::create_objects()
                                        open_render_engine(edl, 0);
                                        render_video(0, gui->temp_picon);
                                        close_render_engine();
                                        open_render_engine(edl, 0);
                                        render_video(0, gui->temp_picon);
                                        close_render_engine();

-                                       gui->lock_window("AssetPicon::create_objects 0");

                                        icon_vframe = new VFrame(0,
                                                -1, pixmap_w, pixmap_h, BC_RGB888, -1);
                                        icon_vframe->transfer_from(gui->temp_picon);
                                        icon_vframe = new VFrame(0,
                                                -1, pixmap_w, pixmap_h, BC_RGB888, -1);
                                        icon_vframe->transfer_from(gui->temp_picon);


@@ -661,6 +660,7 @@ void AssetPicon::create_objects()
                                        pixmap_w = icon_vframe->get_w();
                                        pixmap_h = icon_vframe->get_h();
                                }
                                        pixmap_w = icon_vframe->get_w();
                                        pixmap_h = icon_vframe->get_h();
                                }

+                               gui->lock_window("AssetPicon::create_objects 0");

                                icon = new BC_Pixmap(gui, pixmap_w, pixmap_h);
                                icon->draw_vframe(icon_vframe,
                                        0, 0, pixmap_w, pixmap_h, 0, 0);
                                icon = new BC_Pixmap(gui, pixmap_w, pixmap_h);
                                icon->draw_vframe(icon_vframe,
                                        0, 0, pixmap_w, pixmap_h, 0, 0);


@@ -1209,6 +1209,7 @@ AWindowRemovePluginGUI::
 
 void AWindowRemovePluginGUI::create_objects()
 {
 
 void AWindowRemovePluginGUI::create_objects()
 {

+       lock_window("AWindowRemovePluginGUI::create_objects");

        BC_Button *ok_button = new BC_OKButton(this);
        add_subwindow(ok_button);
        BC_Button *cancel_button = new BC_CancelButton(this);
        BC_Button *ok_button = new BC_OKButton(this);
        add_subwindow(ok_button);
        BC_Button *cancel_button = new BC_CancelButton(this);


@@ -1222,6 +1223,7 @@ void AWindowRemovePluginGUI::create_objects()
                0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0);
        add_subwindow(list);
        show_window();
                0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0);
        add_subwindow(list);
        show_window();

+       unlock_window();

 }
 
 int AWindowRemovePlugin::remove_plugin(PluginServer *plugin, ArrayList<BC_ListBoxItem*> &folder)
 }
 
 int AWindowRemovePlugin::remove_plugin(PluginServer *plugin, ArrayList<BC_ListBoxItem*> &folder)

diff --git a/cinelerra-5.1/cinelerra/channeledit.C b/cinelerra-5.1/cinelerra/channeledit.C
index f85cd2850cc03cf25585a3ed5218e7636d2ee563..9a81984e5d907a981f89d0b2058a472f9fe94963 100644 (file)
--- a/cinelerra-5.1/cinelerra/channeledit.C
+++ b/cinelerra-5.1/cinelerra/channeledit.C
@@ -186,6 +186,7 @@ ChannelEditWindow::~ChannelEditWindow()
 
 void ChannelEditWindow::create_objects()
 {
 
 void ChannelEditWindow::create_objects()
 {

+       lock_window("ChannelEditWindow::create_objects");

        int x = 10, y = 10;
 
 // Create channel list
        int x = 10, y = 10;
 
 // Create channel list


@@ -231,6 +232,7 @@ void ChannelEditWindow::create_objects()
        edit_thread = new ChannelEditEditThread(this, channel_picker);
        picture_thread = new ChannelEditPictureThread(channel_picker);
        show_window();
        edit_thread = new ChannelEditEditThread(this, channel_picker);
        picture_thread = new ChannelEditPictureThread(channel_picker);
        show_window();

+       unlock_window();

 }
 
 int ChannelEditWindow::close_event()
 }
 
 int ChannelEditWindow::close_event()


@@ -627,36 +629,19 @@ int ChannelEditPicture::handle_event()
 }
 
 
 }
 
 

-
-
-
-
-
-
-
-
-
-
-// ========================= confirm overwrite by channel scannin
-
+// ========================= confirm overwrite by channel scanning

 
 ConfirmScan::ConfirmScan(ChannelEditWindow *gui, int x, int y)
  : BC_Window(_(PROGRAM_NAME ": Scan confirm"),
 
 ConfirmScan::ConfirmScan(ChannelEditWindow *gui, int x, int y)
  : BC_Window(_(PROGRAM_NAME ": Scan confirm"),

-       x,
-       y,
-       350,
-       BC_OKButton::calculate_h() + 130,
-       0,
-       0,
-       0,
-       0,
-       1)
+       x, y, 350, BC_OKButton::calculate_h() + 130,
+       0, 0, 0, 0, 1)

 {
        this->gui = gui;
 }
 
 void ConfirmScan::create_objects()
 {
 {
        this->gui = gui;
 }
 
 void ConfirmScan::create_objects()
 {

+       lock_window("ConfirmScan::create_objects");

        int x = 10, y = 10;
        int y2 = 0, x2 = 0;
        BC_Title *title;
        int x = 10, y = 10;
        int y2 = 0, x2 = 0;
        BC_Title *title;


@@ -704,14 +689,9 @@ void ConfirmScan::create_objects()
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();

+       unlock_window();

 }
 
 }
 

-
-
-
-
-
-

 ConfirmScanThread::ConfirmScanThread(ChannelEditWindow *gui)
  : BC_DialogThread()
 {
 ConfirmScanThread::ConfirmScanThread(ChannelEditWindow *gui)
  : BC_DialogThread()
 {


@@ -996,13 +976,7 @@ ChannelEditEditWindow::ChannelEditEditWindow(ChannelEditEditThread *thread,
  : BC_Window(_(PROGRAM_NAME ": Edit Channel"),
        channel_picker->parent_window->get_abs_cursor_x(1),
        channel_picker->parent_window->get_abs_cursor_y(1),
  : BC_Window(_(PROGRAM_NAME ": Edit Channel"),
        channel_picker->parent_window->get_abs_cursor_x(1),
        channel_picker->parent_window->get_abs_cursor_y(1),

-       390,
-       300,
-       390,
-       300,
-       0,
-       0,
-       1)
+       390, 300, 390, 300, 0, 0, 1)

 {
        this->channel_picker = channel_picker;
        this->window = window;
 {
        this->channel_picker = channel_picker;
        this->window = window;


@@ -1011,8 +985,10 @@ ChannelEditEditWindow::ChannelEditEditWindow(ChannelEditEditThread *thread,
 ChannelEditEditWindow::~ChannelEditEditWindow()
 {
 }
 ChannelEditEditWindow::~ChannelEditEditWindow()
 {
 }

+

 void ChannelEditEditWindow::create_objects(Channel *channel)
 {
 void ChannelEditEditWindow::create_objects(Channel *channel)
 {

+       lock_window("ChannelEditEditWindow::create_objects");

        this->new_channel = channel;
        Channel *channel_usage = channel_picker->get_channel_usage();
        title_text = 0;
        this->new_channel = channel;
        Channel *channel_usage = channel_picker->get_channel_usage();
        title_text = 0;


@@ -1088,6 +1064,7 @@ void ChannelEditEditWindow::create_objects(Channel *channel)
        x += 200;
        add_subwindow(new BC_CancelButton(this));
        show_window();
        x += 200;
        add_subwindow(new BC_CancelButton(this));
        show_window();

+       unlock_window();

 }
 
 ChannelEditEditTitle::ChannelEditEditTitle(int x,
 }
 
 ChannelEditEditTitle::ChannelEditEditTitle(int x,


@@ -1392,10 +1369,8 @@ ChannelEditPictureWindow::ChannelEditPictureWindow(ChannelEditPictureThread *thr
  : BC_Window(_(PROGRAM_NAME ": Picture"),
        channel_picker->mwindow->session->picture_x,
        channel_picker->mwindow->session->picture_y,
  : BC_Window(_(PROGRAM_NAME ": Picture"),
        channel_picker->mwindow->session->picture_x,
        channel_picker->mwindow->session->picture_y,

-       calculate_w(channel_picker),
-       calculate_h(channel_picker),
-       calculate_w(channel_picker),
-       calculate_h(channel_picker))
+       calculate_w(channel_picker), calculate_h(channel_picker),
+       calculate_w(channel_picker), calculate_h(channel_picker))

 {
        this->thread = thread;
        this->channel_picker = channel_picker;
 {
        this->thread = thread;
        this->channel_picker = channel_picker;


@@ -1504,6 +1479,7 @@ int ChannelEditPictureWindow::calculate_w(ChannelPicker *channel_picker)
 
 void ChannelEditPictureWindow::create_objects()
 {
 
 void ChannelEditPictureWindow::create_objects()
 {

+       lock_window("ChannelEditPictureWindow::create_objects");

        int x = 10, y = 10;
        int widget_border = ((Theme*)channel_picker->get_theme())->widget_border;
        int x1 = get_w() - BC_Pot::calculate_w() * 2 - widget_border * 2;
        int x = 10, y = 10;
        int widget_border = ((Theme*)channel_picker->get_theme())->widget_border;
        int x1 = get_w() - BC_Pot::calculate_w() * 2 - widget_border * 2;


@@ -1592,6 +1568,7 @@ void ChannelEditPictureWindow::create_objects()
        y += pad;
        add_subwindow(new BC_OKButton(this));
        show_window();
        y += pad;
        add_subwindow(new BC_OKButton(this));
        show_window();

+       unlock_window();

 }
 
 int ChannelEditPictureWindow::translation_event()
 }
 
 int ChannelEditPictureWindow::translation_event()

diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C
index 3d1fa69f3ea2440de618713802b704eb54167ab6..177f2840447b3a87e77291d37323140bdc58847b 100644 (file)
--- a/cinelerra-5.1/cinelerra/channelinfo.C
+++ b/cinelerra-5.1/cinelerra/channelinfo.C
@@ -259,6 +259,7 @@ int ChanSearchList::move_column_event()
 
 void ChanSearchGUI::create_objects()
 {
 
 void ChanSearchGUI::create_objects()
 {

+       lock_window("ChanSearchGUI::create_objects");

        int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + 5;
        int padx = BC_Title::calculate_w(this, (char*)"X", MEDIUMFONT);
        int x = padx/2, y = pady/4;
        int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + 5;
        int padx = BC_Title::calculate_w(this, (char*)"X", MEDIUMFONT);
        int x = padx/2, y = pady/4;


@@ -301,6 +302,7 @@ void ChanSearchGUI::create_objects()
 
        set_icon(iwindow->mwindow->theme->get_image("record_icon"));
        search_text->activate();
 
        set_icon(iwindow->mwindow->theme->get_image("record_icon"));
        search_text->activate();

+       unlock_window();

 }
 
 ChanSearchGUI::ChanSearchGUI(ChanSearch *cswindow)
 }
 
 ChanSearchGUI::ChanSearchGUI(ChanSearch *cswindow)


@@ -1283,6 +1285,7 @@ int ChannelInfoGUIBatches::handle_event()
 
 void ChannelInfoGUI::create_objects()
 {
 
 void ChannelInfoGUI::create_objects()
 {

+       lock_window("ChannelInfoGUI::create_objects");

        panel = new ChannelPanel(this,0,0,panel_w,panel_h);
        add_subwindow(panel);
        panel->create_objects();
        panel = new ChannelPanel(this,0,0,panel_w,panel_h);
        add_subwindow(panel);
        panel->create_objects();


@@ -1373,6 +1376,7 @@ void ChannelInfoGUI::create_objects()
 
        channel_search = new ChanSearch(iwindow);
        show_window();
 
        channel_search = new ChanSearch(iwindow);
        show_window();

+       unlock_window();

 }
 
 ChannelInfoGUI::ChannelInfoGUI(ChannelInfo *iwindow,
 }
 
 ChannelInfoGUI::ChannelInfoGUI(ChannelInfo *iwindow,

diff --git a/cinelerra-5.1/cinelerra/cropvideo.C b/cinelerra-5.1/cinelerra/cropvideo.C
index a1df4ff98fc25249df65c6df00fc83caebf8ba63..f1c2abf57d83321287bd8be42f19c45b7a3abb77 100644 (file)
--- a/cinelerra-5.1/cinelerra/cropvideo.C
+++ b/cinelerra-5.1/cinelerra/cropvideo.C
@@ -106,13 +106,13 @@ CropVideoWindow::~CropVideoWindow()
 
 void CropVideoWindow::create_objects()
 {
 
 void CropVideoWindow::create_objects()
 {

+       lock_window("CropVideoWindow::create_objects");

        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, _("Select a region to crop in the video output window")));
        y += 30;
        add_subwindow(new BC_OKButton(x, y));
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));
        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, _("Select a region to crop in the video output window")));
        y += 30;
        add_subwindow(new BC_OKButton(x, y));
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));

+       unlock_window();

 }
 
 }
 

-
-

diff --git a/cinelerra-5.1/cinelerra/deleteallindexes.C b/cinelerra-5.1/cinelerra/deleteallindexes.C
index 15aa857e9e57a9f1a3dc8efad0101a3f5159c246..c600a4550b0813f7f4e402a024b645ae542b1145 100644 (file)
--- a/cinelerra-5.1/cinelerra/deleteallindexes.C
+++ b/cinelerra-5.1/cinelerra/deleteallindexes.C
@@ -89,6 +89,7 @@ ConfirmDeleteAllIndexes::~ConfirmDeleteAllIndexes()
 
 void ConfirmDeleteAllIndexes::create_objects()
 {
 
 void ConfirmDeleteAllIndexes::create_objects()
 {

+       lock_window("ConfirmDeleteAllIndexes::create_objects");

        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, string));
 
        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, string));
 


@@ -96,6 +97,7 @@ void ConfirmDeleteAllIndexes::create_objects()
        add_subwindow(new BC_OKButton(x, y));
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));
        add_subwindow(new BC_OKButton(x, y));
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));

+       unlock_window();

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 694c2d2a6101bfbbc148cf47514ddb52beefb9d2..e8d27b9609800942374ad2a56ae1f6138a72eebc 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -295,6 +295,7 @@ int EditPopupTitleWindow::close_event()
 
 void EditPopupTitleWindow::create_objects()
 {
 
 void EditPopupTitleWindow::create_objects()
 {

+       lock_window("EditPopupTitleWindow::create_objects");

        int x = 5;
        int y = 10;
 
        int x = 5;
        int y = 10;
 


@@ -307,6 +308,7 @@ void EditPopupTitleWindow::create_objects()
 
        show_window();
        flush();
 
        show_window();
        flush();

+       unlock_window();

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/effectlist.C b/cinelerra-5.1/cinelerra/effectlist.C
index 2f9a5dbadc39c29c322264d437b5b3010c81cfc6..25e7c8c309a3c7c6d53a494c120178ffbc5adcb1 100644 (file)
--- a/cinelerra-5.1/cinelerra/effectlist.C
+++ b/cinelerra-5.1/cinelerra/effectlist.C
@@ -86,6 +86,7 @@ EffectTipWindow::~EffectTipWindow()
 
 void EffectTipWindow::create_objects()
 {
 
 void EffectTipWindow::create_objects()
 {

+       lock_window("EffectTipWindow::create_objects");

        int x = 10, y = 10;
        BC_Title *title;
        add_subwindow(title = new BC_Title(x, y, thread->effect));
        int x = 10, y = 10;
        BC_Title *title;
        add_subwindow(title = new BC_Title(x, y, thread->effect));


@@ -93,7 +94,8 @@ void EffectTipWindow::create_objects()
        add_subwindow(tip_text = new BC_Title(x+5, y, thread->text));
        add_subwindow(new BC_OKButton(this));
        show_window(1);
        add_subwindow(tip_text = new BC_Title(x+5, y, thread->text));
        add_subwindow(new BC_OKButton(this));
        show_window(1);

-};
+       unlock_window();
+}

 
 EffectTipItem::EffectTipItem(AWindowGUI *gui)
  : BC_MenuItem(_("Info"))
 
 EffectTipItem::EffectTipItem(AWindowGUI *gui)
  : BC_MenuItem(_("Info"))

diff --git a/cinelerra-5.1/cinelerra/exportedl.C b/cinelerra-5.1/cinelerra/exportedl.C
index 8cbbbf3f238ae3950197d2cb57ff71e8f226bf22..73e51cf16167bc165afb9e6af5cca1df6dca459c 100644 (file)
--- a/cinelerra-5.1/cinelerra/exportedl.C
+++ b/cinelerra-5.1/cinelerra/exportedl.C
@@ -26,12 +26,12 @@
 #include "edits.h"
 #include "edl.h"
 #include "edlsession.h"
 #include "edits.h"
 #include "edl.h"
 #include "edlsession.h"

-#include "errorbox.h"

 #include "file.h"
 #include "filesystem.h"
 #include "filexml.h"
 #include "language.h"
 #include "localsession.h"
 #include "file.h"
 #include "filesystem.h"
 #include "filexml.h"
 #include "language.h"
 #include "localsession.h"

+#include "mainerror.h"

 #include "mainsession.h"
 #include "mutex.h"
 #include "mwindowgui.h"
 #include "mainsession.h"
 #include "mutex.h"
 #include "mwindowgui.h"


@@ -113,6 +113,10 @@ void ExportEDLAsset::export_it()
 {
        FILE *fh;
        fh = fopen(path, "w+");
 {
        FILE *fh;
        fh = fopen(path, "w+");

+       if( !fh ) {
+               eprintf("unable to open file: %s", path);
+               return;
+       }

 
 // We currently only support exporting one track at a time
 // Find the track...
 
 // We currently only support exporting one track at a time
 // Find the track...


@@ -362,6 +366,7 @@ ExportEDLWindow::~ExportEDLWindow()
 
 void ExportEDLWindow::create_objects()
 {
 
 void ExportEDLWindow::create_objects()
 {

+       lock_window("ExportEDLWindow::create_objects");

        int x = 5, y = 5;
        add_subwindow(new BC_Title(x, y,
                        _("Select a file to export to:")));
        int x = 5, y = 5;
        add_subwindow(new BC_Title(x, y,
                        _("Select a file to export to:")));


@@ -418,6 +423,7 @@ void ExportEDLWindow::create_objects()
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
        show_window();

+       unlock_window();

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/featheredits.C b/cinelerra-5.1/cinelerra/featheredits.C
index 553640078ffaaf78df3eb4879aa93f608409cd12..6c0c67dffdc9c4f7cd90e207813fd859d850205a 100644 (file)
--- a/cinelerra-5.1/cinelerra/featheredits.C
+++ b/cinelerra-5.1/cinelerra/featheredits.C
@@ -91,6 +91,7 @@ FeatherEditsWindow::~FeatherEditsWindow()
 
 int FeatherEditsWindow::create_objects(int audio, int video)
 {
 
 int FeatherEditsWindow::create_objects(int audio, int video)
 {

+       lock_window("FeatherEditsWindow::create_objects");

        int x = 10;
        int y = 10;
        this->audio = audio;
        int x = 10;
        int y = 10;
        this->audio = audio;


@@ -110,6 +111,7 @@ int FeatherEditsWindow::create_objects(int audio, int video)
        add_subwindow(new BC_OKButton(x, y));
        add_subwindow(new BC_CancelButton(x, y));
        return 0;
        add_subwindow(new BC_OKButton(x, y));
        add_subwindow(new BC_CancelButton(x, y));
        return 0;

+       unlock_window();

 }
 
 FeatherEditsTextBox::FeatherEditsTextBox(FeatherEditsWindow *window, char *text, int x, int y)
 }
 
 FeatherEditsTextBox::FeatherEditsTextBox(FeatherEditsWindow *window, char *text, int x, int y)

diff --git a/cinelerra-5.1/cinelerra/filedv.C b/cinelerra-5.1/cinelerra/filedv.C
index 1a543744898764cafc96c57b365e8420b60f27ba..bcce24b21201bd11c7d09310e9d2cf1632a653f5 100644 (file)
--- a/cinelerra-5.1/cinelerra/filedv.C
+++ b/cinelerra-5.1/cinelerra/filedv.C
@@ -982,8 +982,7 @@ DVConfigAudio::DVConfigAudio(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),
  : 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;
 {
        this->parent_window = parent_window;
        this->asset = asset;


@@ -996,8 +995,10 @@ DVConfigAudio::~DVConfigAudio()
 
 void DVConfigAudio::create_objects()
 {
 
 void DVConfigAudio::create_objects()
 {

+       lock_window("DVConfigAudio::create_objects");

        add_tool(new BC_Title(10, 10, _("There are no audio options for this format")));
        add_subwindow(new BC_OKButton(this));
        add_tool(new BC_Title(10, 10, _("There are no audio options for this format")));
        add_subwindow(new BC_OKButton(this));

+       unlock_window();

 }
 
 int DVConfigAudio::close_event()
 }
 
 int DVConfigAudio::close_event()


@@ -1007,16 +1008,11 @@ int DVConfigAudio::close_event()
 }
 
 
 }
 
 

-
-
-
-

 DVConfigVideo::DVConfigVideo(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),
 DVConfigVideo::DVConfigVideo(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),

-       350,
-       250)
+       350, 250)

 {
        this->parent_window = parent_window;
        this->asset = asset;
 {
        this->parent_window = parent_window;
        this->asset = asset;


@@ -1029,8 +1025,10 @@ DVConfigVideo::~DVConfigVideo()
 
 void DVConfigVideo::create_objects()
 {
 
 void DVConfigVideo::create_objects()
 {

+       lock_window("DVConfigVideo::create_objects");

        add_tool(new BC_Title(10, 10, _("There are no video options for this format")));
        add_subwindow(new BC_OKButton(this));
        add_tool(new BC_Title(10, 10, _("There are no video options for this format")));
        add_subwindow(new BC_OKButton(this));

+       unlock_window();

 }
 
 int DVConfigVideo::close_event()
 }
 
 int DVConfigVideo::close_event()

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 7edc387d6b5350e5eb6870b491a07ac86ddd09f4..5910dd202474e59856cfbd9b22b598dff3aa2632 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -1467,6 +1467,7 @@ FFOptionsWindow::~FFOptionsWindow()
 
 void FFOptionsWindow::create_objects()
 {
 
 void FFOptionsWindow::create_objects()
 {

+       lock_window("FFOptionsWindow::create_objects");

        BC_Title *title;
        int x0 = 10, y0 = 10;
        int x = x0, y = y0;
        BC_Title *title;
        int x0 = 10, y0 = 10;
        int x = x0, y = y0;


@@ -1512,6 +1513,7 @@ void FFOptionsWindow::create_objects()
        options.initialize(this, FF_KIND_CODEC);
        draw();
        show_window(1);
        options.initialize(this, FF_KIND_CODEC);
        draw();
        show_window(1);

+       unlock_window();

 }
 
 void FFOptionsWindow::draw()
 }
 
 void FFOptionsWindow::draw()

diff --git a/cinelerra-5.1/cinelerra/fileformat.C b/cinelerra-5.1/cinelerra/fileformat.C
index 11c6a3100d249cd08b94a4a109d4c8e343fa4e03..a8ff043cd7c309778a0e4e2cafdfbbbd382d8914 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileformat.C
+++ b/cinelerra-5.1/cinelerra/fileformat.C
@@ -87,15 +87,8 @@ void FileFormat::create_objects_(char *string2)
 
        y += 30;
        add_subwindow(new BC_Title(x, y, _("Bits:")));
 
        y += 30;
        add_subwindow(new BC_Title(x, y, _("Bits:")));

-       bitspopup = new BitsPopup(this,
-               x2,
-               y,
-               &asset->bits,
-               0,
-               1,
-               1,
-               0,
-               1);
+       bitspopup = new BitsPopup(this, x2, y,
+               &asset->bits, 0, 1, 1, 0, 1);

        bitspopup->create_objects();
 
        y += 30;
        bitspopup->create_objects();
 
        y += 30;


@@ -121,13 +114,7 @@ void FileFormat::create_objects_(char *string2)
 }
 
 FileFormatChannels::FileFormatChannels(int x, int y, FileFormat *fwindow, char *text)
 }
 
 FileFormatChannels::FileFormatChannels(int x, int y, FileFormat *fwindow, char *text)

- : BC_TumbleTextBox(fwindow,
-       (int)atol(text),
-       (int)1,
-       (int)MAXCHANNELS,
-       x,
-       y,
-       50)
+ : BC_TumbleTextBox(fwindow, (int)atol(text), (int)1, (int)MAXCHANNELS, x, y, 50)

 {
        this->fwindow = fwindow;
 }
 {
        this->fwindow = fwindow;
 }

diff --git a/cinelerra-5.1/cinelerra/filejpeg.C b/cinelerra-5.1/cinelerra/filejpeg.C
index 8c5687cc4f5badc79b6f25bc47e4c815d38c37ab..d35e9bd49ba30512511f7a1d26f8028f8e6f5abd 100644 (file)
--- a/cinelerra-5.1/cinelerra/filejpeg.C
+++ b/cinelerra-5.1/cinelerra/filejpeg.C
@@ -345,8 +345,7 @@ JPEGConfigVideo::JPEGConfigVideo(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),
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
        parent_window->get_abs_cursor_x(1),
        parent_window->get_abs_cursor_y(1),

-       400,
-       200)
+       400, 200)

 {
        this->parent_window = parent_window;
        this->asset = asset;
 {
        this->parent_window = parent_window;
        this->asset = asset;

diff --git a/cinelerra-5.1/cinelerra/filejpeglist.C b/cinelerra-5.1/cinelerra/filejpeglist.C
index b7755996a768f105abad469c84cd7345a19cf18e..d1c7ba9f8ae974408d974fd13643054e33ded353 100644 (file)
--- a/cinelerra-5.1/cinelerra/filejpeglist.C
+++ b/cinelerra-5.1/cinelerra/filejpeglist.C
@@ -100,19 +100,11 @@ int FileJPEGList::read_frame(VFrame *frame, VFrame *data)
 {
        PRINT_TRACE
 
 {
        PRINT_TRACE
 

-       mjpeg_t *mjpeg = mjpeg_new(asset->width,
-               asset->height,
-               1);
-       mjpeg_decompress(mjpeg,
-               data->get_data(),
-               data->get_compressed_size(),
-               0,
-               frame->get_rows(),
-               frame->get_y(),
-               frame->get_u(),
-               frame->get_v(),
-               frame->get_color_model(),
-               file->cpus);
+       mjpeg_t *mjpeg = mjpeg_new(asset->width, asset->height, 1);
+       mjpeg_decompress(mjpeg, data->get_data(), data->get_compressed_size(),
+               0, frame->get_rows(),
+               frame->get_y(), frame->get_u(), frame->get_v(),
+               frame->get_color_model(), file->cpus);

        mjpeg_delete(mjpeg);
        PRINT_TRACE
        return 0;
        mjpeg_delete(mjpeg);
        PRINT_TRACE
        return 0;


@@ -120,16 +112,10 @@ int FileJPEGList::read_frame(VFrame *frame, VFrame *data)
 
 int FileJPEGList::write_frame(VFrame *frame, VFrame *data)
 {
 
 int FileJPEGList::write_frame(VFrame *frame, VFrame *data)
 {

-       mjpeg_t *mjpeg = mjpeg_new(asset->width,
-               asset->height,
-               1);
-       mjpeg_compress(mjpeg,
-               frame->get_rows(),
-               frame->get_y(),
-               frame->get_u(),
-               frame->get_v(),
-               frame->get_color_model(),
-               file->cpus);
+       mjpeg_t *mjpeg = mjpeg_new(asset->width, asset->height, 1);
+       mjpeg_compress(mjpeg, frame->get_rows(),
+               frame->get_y(), frame->get_u(), frame->get_v(),
+               frame->get_color_model(), file->cpus);

        data->allocate_compressed_data(mjpeg_output_size(mjpeg));
        bcopy(mjpeg_output_buffer(mjpeg), frame->get_data(), mjpeg_output_size(mjpeg));
        mjpeg_delete(mjpeg);
        data->allocate_compressed_data(mjpeg_output_size(mjpeg));
        bcopy(mjpeg_output_buffer(mjpeg), frame->get_data(), mjpeg_output_size(mjpeg));
        mjpeg_delete(mjpeg);


@@ -137,21 +123,11 @@ int FileJPEGList::write_frame(VFrame *frame, VFrame *data)
 }
 
 
 }
 
 

-
-
-
-
-
-
-
-
-

 JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
        parent_window->get_abs_cursor_x(),
        parent_window->get_abs_cursor_y(),
 JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
        parent_window->get_abs_cursor_x(),
        parent_window->get_abs_cursor_y(),

-       400,
-       100)
+       400, 100)

 {
        this->parent_window = parent_window;
        this->asset = asset;
 {
        this->parent_window = parent_window;
        this->asset = asset;


@@ -166,17 +142,9 @@ void JPEGConfigVideo::create_objects()
        int x = 10, y = 10;
        lock_window("JPEGConfigVideo::create_objects");
        add_subwindow(new BC_Title(x, y, _("Quality:")));
        int x = 10, y = 10;
        lock_window("JPEGConfigVideo::create_objects");
        add_subwindow(new BC_Title(x, y, _("Quality:")));

-       add_subwindow(new BC_ISlider(x + 80,
-               y,
-               0,
-               200,
-               200,
-               0,
-               100,
-               asset->quality,
-               0,
-               0,
-               &asset->quality));
+       add_subwindow(new BC_ISlider(x + 80, y, 0,
+               200, 200, 0, 100, asset->quality,
+               0, 0, &asset->quality));

 
        add_subwindow(new BC_OKButton(this));
        unlock_window();
 
        add_subwindow(new BC_OKButton(this));
        unlock_window();


@@ -188,9 +156,3 @@ int JPEGConfigVideo::close_event()
        return 1;
 }
 
        return 1;
 }
 

-
-
-
-
-
-

diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C
index da71349eda56ffce786fb46fde187324e15d54fd..6c889b92c6cb7a169d3fcde23571454939682c87 100644 (file)
--- a/cinelerra-5.1/cinelerra/filempeg.C
+++ b/cinelerra-5.1/cinelerra/filempeg.C
@@ -1726,13 +1726,7 @@ MPEGConfigAudio::MPEGConfigAudio(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),
  : BC_Window(_(PROGRAM_NAME ": Audio Compression"),
        parent_window->get_abs_cursor_x(1),
        parent_window->get_abs_cursor_y(1),

-       310,
-       120,
-       -1,
-       -1,
-       0,
-       0,
-       1)
+       310, 120, -1, -1, 0, 0, 1)

 {
        this->parent_window = parent_window;
        this->asset = asset;
 {
        this->parent_window = parent_window;
        this->asset = asset;


@@ -1779,11 +1773,6 @@ int MPEGConfigAudio::close_event()
 }
 
 
 }
 
 

-
-
-
-
-

 MPEGLayer::MPEGLayer(int x, int y, MPEGConfigAudio *gui)
  : BC_PopupMenu(x, y, 100, layer_to_string(gui->asset->ampeg_derivative))
 {
 MPEGLayer::MPEGLayer(int x, int y, MPEGConfigAudio *gui)
  : BC_PopupMenu(x, y, 100, layer_to_string(gui->asset->ampeg_derivative))
 {


@@ -1838,9 +1827,7 @@ char* MPEGLayer::layer_to_string(int layer)
 
 
 MPEGABitrate::MPEGABitrate(int x, int y, MPEGConfigAudio *gui)
 
 
 MPEGABitrate::MPEGABitrate(int x, int y, MPEGConfigAudio *gui)

- : BC_PopupMenu(x,
-       y,
-       100,
+ : BC_PopupMenu(x, y, 100,

        bitrate_to_string(gui->string, gui->asset->ampeg_bitrate))
 {
        this->gui = gui;
        bitrate_to_string(gui->string, gui->asset->ampeg_bitrate))
 {
        this->gui = gui;


@@ -1918,13 +1905,7 @@ MPEGConfigVideo::MPEGConfigVideo(BC_WindowBase *parent_window,
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
        parent_window->get_abs_cursor_x(1),
        parent_window->get_abs_cursor_y(1),
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
        parent_window->get_abs_cursor_x(1),
        parent_window->get_abs_cursor_y(1),

-       500,
-       400,
-       -1,
-       -1,
-       0,
-       0,
-       1)
+       500, 400, -1, -1, 0, 0, 1)

 {
        this->parent_window = parent_window;
        this->asset = asset;
 {
        this->parent_window = parent_window;
        this->asset = asset;

diff --git a/cinelerra-5.1/cinelerra/fileogg.C b/cinelerra-5.1/cinelerra/fileogg.C
index b413066d200db285eca71ff11b3d6205e967e779..99995fe975711988a77aec82167f866e9b3851c2 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileogg.C
+++ b/cinelerra-5.1/cinelerra/fileogg.C
@@ -2003,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),
  : 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;
 {
        this->parent_window = parent_window;
        this->asset = asset;


@@ -2130,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),
  : 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;
 {
        this->parent_window = parent_window;
        this->asset = asset;


@@ -2156,18 +2154,10 @@ void OGGConfigVideo::create_objects()
        y += 30;
 
        add_subwindow(new BC_Title(x, y, _("Quality:")));
        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;
 
        add_subwindow(fixed_quality = new OGGTheoraFixedQuality(x2, y, this));
        y += 30;


@@ -2197,8 +2187,6 @@ void OGGConfigVideo::create_objects()
 }
 
 
 }
 
 

-
-

 int OGGConfigVideo::close_event()
 {
        set_done(0);
 int OGGConfigVideo::close_event()
 {
        set_done(0);

diff --git a/cinelerra-5.1/cinelerra/filepng.C b/cinelerra-5.1/cinelerra/filepng.C
index 68ce488cc128f57dc40174dd94232417806fe364..d4b581d7f0f9f40bda46305f6728a806976963c9 100644 (file)
--- a/cinelerra-5.1/cinelerra/filepng.C
+++ b/cinelerra-5.1/cinelerra/filepng.C
@@ -382,7 +382,7 @@ PNGConfigVideo::~PNGConfigVideo()
 
 void PNGConfigVideo::create_objects()
 {
 
 void PNGConfigVideo::create_objects()
 {

-       lock_window("PNGConfigVideo::create_objects()");
+       lock_window("PNGConfigVideo::create_objects");

        int x = 10, y = 10;
        add_subwindow(new PNGUseAlpha(this, x, y));
        add_subwindow(new BC_OKButton(this));
        int x = 10, y = 10;
        add_subwindow(new PNGUseAlpha(this, x, y));
        add_subwindow(new BC_OKButton(this));

diff --git a/cinelerra-5.1/cinelerra/fileppm.C b/cinelerra-5.1/cinelerra/fileppm.C
index f8dc04153f40dcdd5c7fd8183b0108e9729abf29..7df92707a11e56d567b9e68424bbff2ec28a1f60 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileppm.C
+++ b/cinelerra-5.1/cinelerra/fileppm.C
@@ -199,7 +199,11 @@ PPMConfigVideo::PPMConfigVideo(BC_WindowBase *gui, Asset *asset)
 {
        this->gui = gui;
        this->asset = asset;
 {
        this->gui = gui;
        this->asset = asset;

-       lock_window("PPMConfigVideo::create_objects()");
+}
+
+void PPMConfigVideo::create_objects()
+{
+       lock_window("PPMConfigVideo::create_objects");

        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, _("PPM, RGB raw only")));
        add_subwindow(new BC_OKButton(this));
        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, _("PPM, RGB raw only")));
        add_subwindow(new BC_OKButton(this));


@@ -213,6 +217,7 @@ void FilePPM::get_parameters(BC_WindowBase *parent_window,
 {
        if(video_options) {
                PPMConfigVideo *window = new PPMConfigVideo(parent_window, asset);
 {
        if(video_options) {
                PPMConfigVideo *window = new PPMConfigVideo(parent_window, asset);

+               window->create_objects();

                format_window = window;
                window->run_window();
                delete window;
                format_window = window;
                window->run_window();
                delete window;

diff --git a/cinelerra-5.1/cinelerra/fileppm.h b/cinelerra-5.1/cinelerra/fileppm.h
index db476971b3a6316ad1abdca0d81cdae4abf4508b..ec6a094a4b9de5e78f9a028212623b1f9cd6b964 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileppm.h
+++ b/cinelerra-5.1/cinelerra/fileppm.h
@@ -53,6 +53,7 @@ class PPMConfigVideo : public BC_Window
 {
 public:
        PPMConfigVideo(BC_WindowBase *gui, Asset *asset);
 {
 public:
        PPMConfigVideo(BC_WindowBase *gui, Asset *asset);

+       void create_objects();

 
        BC_WindowBase *gui;
        Asset *asset;
 
        BC_WindowBase *gui;
        Asset *asset;

diff --git a/cinelerra-5.1/cinelerra/filesndfile.C b/cinelerra-5.1/cinelerra/filesndfile.C
index f3370e16e091ee095872e90d5e767ef0df7a7fdb..9351378b97e4a7f1a2d09f75c04155f3532c733f 100644 (file)
--- a/cinelerra-5.1/cinelerra/filesndfile.C
+++ b/cinelerra-5.1/cinelerra/filesndfile.C
@@ -392,7 +392,7 @@ SndFileConfig::~SndFileConfig()
 
 void SndFileConfig::create_objects()
 {
 
 void SndFileConfig::create_objects()
 {

-       lock_window("SndFileConfig::create_objects()");
+       lock_window("SndFileConfig::create_objects");

        int x = 10, y = 10;
 
        bits_popup = 0;
        int x = 10, y = 10;
 
        bits_popup = 0;

diff --git a/cinelerra-5.1/cinelerra/filetga.C b/cinelerra-5.1/cinelerra/filetga.C
index 21c53d1d9a49b402a1910465cd2ba1280384dcaf..800661e4942858754dc709175690a5bfdb8c65a5 100644 (file)
--- a/cinelerra-5.1/cinelerra/filetga.C
+++ b/cinelerra-5.1/cinelerra/filetga.C
@@ -919,7 +919,7 @@ TGAConfigVideo::~TGAConfigVideo()
 
 void TGAConfigVideo::create_objects()
 {
 
 void TGAConfigVideo::create_objects()
 {

-       lock_window("TGAConfigVideo::create_objects()");
+       lock_window("TGAConfigVideo::create_objects");

        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(x, y, _("Compression:")));
        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(x, y, _("Compression:")));

diff --git a/cinelerra-5.1/cinelerra/filetiff.C b/cinelerra-5.1/cinelerra/filetiff.C
index 5621f0e3513d6fbd2c341345bde2220432c8b8cd..fb1449f1c7b4d7b9e5eeeca73f535af86321e1b4 100644 (file)
--- a/cinelerra-5.1/cinelerra/filetiff.C
+++ b/cinelerra-5.1/cinelerra/filetiff.C
@@ -599,7 +599,7 @@ TIFFConfigVideo::~TIFFConfigVideo()
 
 void TIFFConfigVideo::create_objects()
 {
 
 void TIFFConfigVideo::create_objects()
 {

-       lock_window("TIFFConfigVideo::create_objects()");
+       lock_window("TIFFConfigVideo::create_objects");

        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(x, y, _("Colorspace:")));
        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(x, y, _("Colorspace:")));

diff --git a/cinelerra-5.1/cinelerra/formatwindow.C b/cinelerra-5.1/cinelerra/formatwindow.C
index 73694876c207885d6ddcb0c42c2dd8ee92252ac1..a2c1ba36842b4a866a414a3c3d52d2436d3087eb 100644 (file)
--- a/cinelerra-5.1/cinelerra/formatwindow.C
+++ b/cinelerra-5.1/cinelerra/formatwindow.C
@@ -37,6 +37,7 @@ FormatAWindow::~FormatAWindow()
 
 void FormatAWindow::create_objects()
 {
 
 void FormatAWindow::create_objects()
 {

+       lock_window("FormatAWindow::create_objects");

        int x;
        int init_x;
        int y = 10;
        int x;
        int init_x;
        int y = 10;


@@ -75,6 +76,7 @@ void FormatAWindow::create_objects()
        x = init_x;
 
        add_subwindow(new BC_OKButton(x + 170, y));
        x = init_x;
 
        add_subwindow(new BC_OKButton(x + 170, y));

+       unlock_window();

 }
 
 
 }
 
 


@@ -85,7 +87,6 @@ int FormatAWindow::close_event()
 
 
 
 
 
 

-

 FormatVWindow::FormatVWindow(Asset *asset, int recording)
  : BC_Window(_(PROGRAM_NAME ": File format"), 410, 115, 0, 0)
 { this->asset = asset; this->recording = recording; }
 FormatVWindow::FormatVWindow(Asset *asset, int recording)
  : BC_Window(_(PROGRAM_NAME ": File format"), 410, 115, 0, 0)
 { this->asset = asset; this->recording = recording; }


@@ -96,6 +97,7 @@ FormatVWindow::~FormatVWindow()
 
 void FormatVWindow::create_objects()
 {
 
 void FormatVWindow::create_objects()
 {

+       lock_window("FormatVWindow::create_objects");

        int x, y = 10;
        int init_x;
 
        int x, y = 10;
        int init_x;
 


@@ -118,6 +120,7 @@ void FormatVWindow::create_objects()
        }
 
        add_subwindow(new BC_OKButton(x + 170, y));
        }
 
        add_subwindow(new BC_OKButton(x + 170, y));

+       unlock_window();

 }
 
 int FormatVWindow::close_event()
 }
 
 int FormatVWindow::close_event()


@@ -126,21 +129,8 @@ int FormatVWindow::close_event()
 }
 
 
 }
 
 

-
-
-
-
-

 FormatQuality::FormatQuality(int x, int y, Asset *asset, int default_)
 FormatQuality::FormatQuality(int x, int y, Asset *asset, int default_)

- : BC_ISlider(x,
-       y,
-       0,
-       100,
-       100,
-       0,
-       100,
-       default_,
-       1)
+ : BC_ISlider(x, y, 0, 100, 100, 0, 100, default_, 1)

 {
        this->asset = asset;
 }
 {
        this->asset = asset;
 }


@@ -153,7 +143,6 @@ int FormatQuality::handle_event()
 }
 
 
 }
 
 

-

 FormatBits::FormatBits(int x, int y, Asset *asset)
  : BitsPopup(x, y, asset)
 { this->asset = asset; }
 FormatBits::FormatBits(int x, int y, Asset *asset)
  : BitsPopup(x, y, asset)
 { this->asset = asset; }


@@ -164,7 +153,6 @@ int FormatBits::handle_event()
 }
 
 
 }
 
 

-

 FormatDither::FormatDither(int x, int y, int *dither)
  : BC_CheckBox(x, y, *dither, _("Dither"))
 { this->dither = dither; }
 FormatDither::FormatDither(int x, int y, int *dither)
  : BC_CheckBox(x, y, *dither, _("Dither"))
 { this->dither = dither; }


@@ -187,10 +175,6 @@ int FormatSigned::handle_event()
 }
 
 
 }
 
 

-
-
-
-

 FormatHILO::FormatHILO(int x, int y, Asset *asset)
  : BC_Radial(x, y, asset->byte_order ^ 1)
 {
 FormatHILO::FormatHILO(int x, int y, Asset *asset)
  : BC_Radial(x, y, asset->byte_order ^ 1)
 {

diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C
index d7f639ed35634282db8e33dddaf203437ceed653..97a9adc2da970616ef6d263430214ae992df6879 100644 (file)
--- a/cinelerra-5.1/cinelerra/gwindowgui.C
+++ b/cinelerra-5.1/cinelerra/gwindowgui.C
@@ -353,7 +353,7 @@ int GWindowColorButton::handle_event()
 void GWindowGUI::create_objects()
 {
        int x = 10, y = 10;
 void GWindowGUI::create_objects()
 {
        int x = 10, y = 10;

-       lock_window("GWindowGUI::create_objects 1");
+       lock_window("GWindowGUI::create_objects");

 
        for( int i=0; i<(int)(sizeof(toggle_order)/sizeof(toggle_order[0])); ++i ) {
                toggleinfo *tp = &toggle_order[i];
 
        for( int i=0; i<(int)(sizeof(toggle_order)/sizeof(toggle_order[0])); ++i ) {
                toggleinfo *tp = &toggle_order[i];

diff --git a/cinelerra-5.1/cinelerra/labeledit.C b/cinelerra-5.1/cinelerra/labeledit.C
index a2bd71f404cdf27eb00703ce724aa9182ff5be86..22c5252a802dac626ce676ad56e20ef01c7bd4ad 100644 (file)
--- a/cinelerra-5.1/cinelerra/labeledit.C
+++ b/cinelerra-5.1/cinelerra/labeledit.C
@@ -86,6 +86,7 @@ LabelEditWindow::~LabelEditWindow()
 
 void LabelEditWindow::create_objects()
 {
 
 void LabelEditWindow::create_objects()
 {

+       lock_window("LabelEditWindow::create_objects");

        this->label = thread->label;
 
        int x = 10, y = 10;
        this->label = thread->label;
 
        int x = 10, y = 10;


@@ -102,6 +103,7 @@ void LabelEditWindow::create_objects()
        add_subwindow(new BC_CancelButton(this));
        show_window();
        textbox->activate();
        add_subwindow(new BC_CancelButton(this));
        show_window();
        textbox->activate();

+       unlock_window();

 }
 
 LabelEditComments::LabelEditComments(LabelEditWindow *window, int x, int y, int w, int rows)
 }
 
 LabelEditComments::LabelEditComments(LabelEditWindow *window, int x, int y, int w, int rows)

diff --git a/cinelerra-5.1/cinelerra/mainerror.C b/cinelerra-5.1/cinelerra/mainerror.C
index eec7f8a1b66f87c8161b2874c14637f1131c58d3..61ffa7c46b433c09611844598cd704b87cd70115 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainerror.C
+++ b/cinelerra-5.1/cinelerra/mainerror.C
@@ -64,27 +64,26 @@ MainErrorGUI::~MainErrorGUI()
 
 void MainErrorGUI::create_objects()
 {
 
 void MainErrorGUI::create_objects()
 {

-
+       lock_window("MainErrorGUI::create_objects");

        BC_Button *button;
        add_subwindow(button = new BC_OKButton(this));
        int x = 10, y = 10;
        add_subwindow(title = new BC_Title(x, y, _("The following errors occurred:")));
        y += title->get_h() + 5;
        BC_Button *button;
        add_subwindow(button = new BC_OKButton(this));
        int x = 10, y = 10;
        add_subwindow(title = new BC_Title(x, y, _("The following errors occurred:")));
        y += title->get_h() + 5;

-       add_subwindow(list = new BC_ListBox(x,
-                y,
-                get_w() - 20,
-                button->get_y() - y - 5,
-                LISTBOX_TEXT,                   // Display text list or icons
-                &thread->errors, // Each column has an ArrayList of BC_ListBoxItems.
-                0,             // Titles for columns.  Set to 0 for no titles
-                0,                // width of each column
-                1,                      // Total columns.  Only 1 in icon mode
-                0,                    // Pixel of top of window.
-                0,                     // If this listbox is a popup window with a button
-                LISTBOX_SINGLE,  // Select one item or multiple items
-                ICON_LEFT,        // Position of icon relative to text of each item
+       add_subwindow(list = new BC_ListBox(x, y,
+                get_w() - 20, button->get_y() - y - 5,
+                LISTBOX_TEXT,          // Display text list or icons
+                &thread->errors,       // Each column has an ArrayList of BC_ListBoxItems.
+                0,                     // Titles for columns.  Set to 0 for no titles
+                0,                     // width of each column
+                1,                     // Total columns.  Only 1 in icon mode
+                0,                     // Pixel of top of window.
+                0,                     // If this listbox is a popup window with a button
+                LISTBOX_SINGLE,                // Select one item or multiple items
+                ICON_LEFT,             // Position of icon relative to text of each item

                 0));
        show_window();
                 0));
        show_window();

+       unlock_window();

 }
 
 int MainErrorGUI::resize_event(int w, int h)
 }
 
 int MainErrorGUI::resize_event(int w, int h)

diff --git a/cinelerra-5.1/cinelerra/manualgoto.C b/cinelerra-5.1/cinelerra/manualgoto.C
index 6c1f715ec6019b8f2db225ae799207b11b49401b..966def18e5190cb06902e9d1e99f3b136afdc2eb 100644 (file)
--- a/cinelerra-5.1/cinelerra/manualgoto.C
+++ b/cinelerra-5.1/cinelerra/manualgoto.C
@@ -115,6 +115,7 @@ void ManualGotoWindow::update_position(double position)
 
 void ManualGotoWindow::create_objects()
 {
 
 void ManualGotoWindow::create_objects()
 {

+       lock_window("ManualGotoWindow::create_objects");

        int x = 76, y = 5;
 
        BC_Title *title = new BC_Title(x - 2, y, _("hour  min     sec     msec"), SMALLFONT);
        int x = 76, y = 5;
 
        BC_Title *title = new BC_Title(x - 2, y, _("hour  min     sec     msec"), SMALLFONT);


@@ -134,6 +135,7 @@ void ManualGotoWindow::create_objects()
 
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
 
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));

+       unlock_window();

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/menueffects.C b/cinelerra-5.1/cinelerra/menueffects.C
index 9b98c31f35bf606ff14e1877bccb52d6c52bf31d..92217a6b93dd9e9409a987b2846739c9ce333f34 100644 (file)
--- a/cinelerra-5.1/cinelerra/menueffects.C
+++ b/cinelerra-5.1/cinelerra/menueffects.C
@@ -746,9 +746,7 @@ MenuEffectPrompt::MenuEffectPrompt(MWindow *mwindow)
                MenuEffectPrompt::calculate_h(mwindow->gui),
                MenuEffectPrompt::calculate_w(mwindow->gui),
                MenuEffectPrompt::calculate_h(mwindow->gui),
                MenuEffectPrompt::calculate_h(mwindow->gui),
                MenuEffectPrompt::calculate_w(mwindow->gui),
                MenuEffectPrompt::calculate_h(mwindow->gui),

-               0,
-               0,
-               1)
+               0, 0, 1)

 {
 }
 
 {
 }
 


@@ -769,6 +767,7 @@ int MenuEffectPrompt::calculate_h(BC_WindowBase *gui)
 
 void MenuEffectPrompt::create_objects()
 {
 
 void MenuEffectPrompt::create_objects()
 {

+       lock_window("MenuEffectPrompt::create_objects");

        int x = 10, y = 10;
        BC_Title *title;
        add_subwindow(title = new BC_Title(x, y, PROMPT_TEXT));
        int x = 10, y = 10;
        BC_Title *title;
        add_subwindow(title = new BC_Title(x, y, PROMPT_TEXT));


@@ -776,5 +775,6 @@ void MenuEffectPrompt::create_objects()
        add_subwindow(new BC_CancelButton(this));
        show_window();
        raise_window();
        add_subwindow(new BC_CancelButton(this));
        show_window();
        raise_window();

+       unlock_window();

 }
 
 }
 

diff --git a/cinelerra-5.1/cinelerra/meterpanel.C b/cinelerra-5.1/cinelerra/meterpanel.C
index 76d1bb49d8dafe35e1df261c0e1dd7e2e1536000..10e01ca0a030b6eb5a57840a4a7340188861adb7 100644 (file)
--- a/cinelerra-5.1/cinelerra/meterpanel.C
+++ b/cinelerra-5.1/cinelerra/meterpanel.C
@@ -251,10 +251,12 @@ void MeterPanel::update(double *levels)
 
 void MeterPanel::init_meters(int dmix)
 {
 
 void MeterPanel::init_meters(int dmix)
 {

+       subwindow->lock_window("MeterPanel::init_meters");

        for(int i = 0; i < meter_count; i++)
        {
                meters.values[i]->reset(dmix);
        }
        for(int i = 0; i < meter_count; i++)
        {
                meters.values[i]->reset(dmix);
        }

+       subwindow->unlock_window();

 }
 
 void MeterPanel::update_peak(int number, float value)
 }
 
 void MeterPanel::update_peak(int number, float value)

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index e81b4574387016109e21385ac5fd73b8b2a9b796..b0f829bbd7adaeac2f738600d7bb63c74126930c 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1307,6 +1307,7 @@ void MWindow::stop_mixers()
 
 void MWindow::close_mixers(int destroy)
 {
 
 void MWindow::close_mixers(int destroy)
 {

+       ArrayList<ZWindow*> closed;

        zwindows_lock->lock("MWindow::close_mixers");
        for( int i=zwindows.size(); --i>=0; ) {
                ZWindow *zwindow = zwindows[i];
        zwindows_lock->lock("MWindow::close_mixers");
        for( int i=zwindows.size(); --i>=0; ) {
                ZWindow *zwindow = zwindows[i];


@@ -1316,12 +1317,12 @@ void MWindow::close_mixers(int destroy)
                zgui->lock_window("MWindow::select_zwindow 0");
                zgui->set_done(0);
                zgui->unlock_window();
                zgui->lock_window("MWindow::select_zwindow 0");
                zgui->set_done(0);
                zgui->unlock_window();

+               closed.append(zwindow);

        }
        zwindows_lock->unlock();
        }
        zwindows_lock->unlock();

-       for( int i=0; i<zwindows.size(); ++i ) {
-               ZWindow *zwindow = zwindows[i];
-               if( zwindow->idx < 0 ) continue;
-               zwindow->close_window();
+       for( int i=0; i<closed.size(); ++i ) {
+               ZWindow *zwindow = closed[i];
+               zwindow->join();

        }
 }
 
        }
 }
 


@@ -1554,9 +1555,7 @@ void MWindow::init_indexes()
 void MWindow::init_gui()
 {
        gui = new MWindowGUI(this);
 void MWindow::init_gui()
 {
        gui = new MWindowGUI(this);

-       gui->lock_window("MWindow::init_gui");

        gui->create_objects();
        gui->create_objects();

-       gui->unlock_window();

        gui->load_defaults(defaults);
 }
 
        gui->load_defaults(defaults);
 }
 


@@ -2295,11 +2294,12 @@ int MWindow::enable_proxy()
        if( edl->session->proxy_scale == 1 &&
            edl->session->proxy_disabled_scale != 1 ) {
                int new_scale = edl->session->proxy_disabled_scale;
        if( edl->session->proxy_scale == 1 &&
            edl->session->proxy_disabled_scale != 1 ) {
                int new_scale = edl->session->proxy_disabled_scale;

+               int new_use_scaler = edl->session->proxy_use_scaler;

                edl->session->proxy_disabled_scale = 1;
                Asset *asset = new Asset;
                asset->format = FILE_FFMPEG;
                asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);
                edl->session->proxy_disabled_scale = 1;
                Asset *asset = new Asset;
                asset->format = FILE_FFMPEG;
                asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);

-               ret = to_proxy(asset, new_scale);
+               ret = to_proxy(asset, new_scale, new_use_scaler);

                asset->remove_user();
                if( ret > 0 )
                        beep(2000., 1.5, 0.5);
                asset->remove_user();
                if( ret > 0 )
                        beep(2000., 1.5, 0.5);


@@ -2311,17 +2311,19 @@ int MWindow::disable_proxy()
 {
        if( edl->session->proxy_scale != 1 &&
            edl->session->proxy_disabled_scale == 1 ) {
 {
        if( edl->session->proxy_scale != 1 &&
            edl->session->proxy_disabled_scale == 1 ) {

+               int new_scale = 1;
+               int new_use_scaler = edl->session->proxy_use_scaler;

                edl->session->proxy_disabled_scale = edl->session->proxy_scale;
                Asset *asset = new Asset;
                asset->format = FILE_FFMPEG;
                asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);
                edl->session->proxy_disabled_scale = edl->session->proxy_scale;
                Asset *asset = new Asset;
                asset->format = FILE_FFMPEG;
                asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);

-               to_proxy(asset, 1);
+               to_proxy(asset, new_scale, new_use_scaler);

                asset->remove_user();
        }
        return 1;
 }
 
                asset->remove_user();
        }
        return 1;
 }
 

-int MWindow::to_proxy(Asset *asset, int new_scale)
+int MWindow::to_proxy(Asset *asset, int new_scale, int new_use_scaler)

 {
        ArrayList<Indexable*> orig_idxbls;
        ArrayList<Indexable*> proxy_assets;
 {
        ArrayList<Indexable*> orig_idxbls;
        ArrayList<Indexable*> proxy_assets;


@@ -2334,7 +2336,6 @@ int MWindow::to_proxy(Asset *asset, int new_scale)
 // revert project to original size from current size
 // remove all session proxy assets at the at the current proxy_scale
        int proxy_scale = edl->session->proxy_scale;
 // revert project to original size from current size
 // remove all session proxy assets at the at the current proxy_scale
        int proxy_scale = edl->session->proxy_scale;

-       int proxy_use_scaler = edl->session->proxy_use_scaler;

 
        if( proxy_scale > 1 ) {
                Asset *orig_asset = edl->assets->first;
 
        if( proxy_scale > 1 ) {
                Asset *orig_asset = edl->assets->first;


@@ -2439,7 +2440,7 @@ int MWindow::to_proxy(Asset *asset, int new_scale)
                result = proxy_render.create_needed_proxies(new_scale);
 
        if( !result ) // resize project
                result = proxy_render.create_needed_proxies(new_scale);
 
        if( !result ) // resize project

-               edl->set_proxy(new_scale, proxy_use_scaler,
+               edl->set_proxy(new_scale, new_use_scaler,

                        &proxy_render.orig_idxbls, &proxy_render.orig_proxies);
 
        undo->update_undo_after(_("proxy"), LOAD_ALL);
                        &proxy_render.orig_idxbls, &proxy_render.orig_proxies);
 
        undo->update_undo_after(_("proxy"), LOAD_ALL);


@@ -2550,14 +2551,14 @@ void MWindow::create_objects(int want_gui,
        check_language();
        init_preferences();
        if(splash_window)
        check_language();
        init_preferences();
        if(splash_window)

-               splash_window->operation->update(_("Initializing Plugins"));
+               splash_window->update_status(_("Initializing Plugins"));

        init_plugins(this, preferences);
        if(debug) PRINT_TRACE
        init_ladspa_plugins(this, preferences);
        if(debug) PRINT_TRACE
        init_plugin_tips(*plugindb, cin_lang);
        if(splash_window)
        init_plugins(this, preferences);
        if(debug) PRINT_TRACE
        init_ladspa_plugins(this, preferences);
        if(debug) PRINT_TRACE
        init_plugin_tips(*plugindb, cin_lang);
        if(splash_window)

-               splash_window->operation->update(_("Initializing GUI"));
+               splash_window->update_status(_("Initializing GUI"));

        if(debug) PRINT_TRACE
        init_theme();
 
        if(debug) PRINT_TRACE
        init_theme();
 


@@ -2565,7 +2566,7 @@ void MWindow::create_objects(int want_gui,
        init_error();
 
        if(splash_window)
        init_error();
 
        if(splash_window)

-               splash_window->operation->update(_("Initializing Fonts"));
+               splash_window->update_status(_("Initializing Fonts"));

        char string[BCTEXTLEN];
        strcpy(string, preferences->plugin_dir);
        strcat(string, "/" FONT_SEARCHPATH);
        char string[BCTEXTLEN];
        strcpy(string, preferences->plugin_dir);
        strcat(string, "/" FONT_SEARCHPATH);

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 2ec3068359830bff038cce0efe932f07e647bc25..8053f0ee61a1573dc6731dbdcc4c3c47b8bfa7d1 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -516,7 +516,7 @@ public:
        void beep(double freq, double secs, double gain);
        int enable_proxy();
        int disable_proxy();
        void beep(double freq, double secs, double gain);
        int enable_proxy();
        int disable_proxy();

-       int to_proxy(Asset *asset, int new_scale);
+       int to_proxy(Asset *asset, int new_scale, int new_use_scaler);

        ProxyBeep *proxy_beep;
 
        void dump_plugins(FILE *fp=stdout);
        ProxyBeep *proxy_beep;
 
        void dump_plugins(FILE *fp=stdout);

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 306975c202090a344f787ecc1ff5e8b17a9fd64f..78b35f42acaa56c17830f78a387ed66f507297ca 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -1894,9 +1894,6 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
                }
        }
 
                }
        }
 

-       if( calling_window_gui != gui )
-               gui->unlock_window();
-

        awindow->gui->async_update_assets();
 
        cwindow->refresh_frame(CHANGE_ALL);
        awindow->gui->async_update_assets();
 
        cwindow->refresh_frame(CHANGE_ALL);


@@ -2223,9 +2220,6 @@ void MWindow::undo_entry(BC_WindowBase *calling_window_gui)
                }
        }
 
                }
        }
 

-       if( calling_window_gui != gui )
-               gui->unlock_window();
-

        awindow->gui->async_update_assets();
 
        cwindow->refresh_frame(CHANGE_ALL);
        awindow->gui->async_update_assets();
 
        cwindow->refresh_frame(CHANGE_ALL);

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 679a56e33fe429f1ca001435054ed0059ce78ccf..baea64a815d2e07d1163cb30bf03284ee3440303 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -251,6 +251,7 @@ void MWindowGUI::get_scrollbars(int flush)
 
 void MWindowGUI::create_objects()
 {
 
 void MWindowGUI::create_objects()
 {

+       lock_window("MWindowGUI::create_objects");

        const int debug = 0;
 
        resource_thread = new ResourceThread(mwindow, this);
        const int debug = 0;
 
        resource_thread = new ResourceThread(mwindow, this);


@@ -373,6 +374,7 @@ void MWindowGUI::create_objects()
        pane[TOP_LEFT_PANE]->canvas->activate();
 
        if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
        pane[TOP_LEFT_PANE]->canvas->activate();
 
        if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);

+       unlock_window();

 }
 
 void MWindowGUI::redraw_time_dependancies()
 }
 
 void MWindowGUI::redraw_time_dependancies()


@@ -666,9 +668,9 @@ void MWindowGUI::update_proxy_toggle()
 {
        if( mwindow->edl->session->proxy_scale == 1 &&
            mwindow->edl->session->proxy_disabled_scale == 1 )
 {
        if( mwindow->edl->session->proxy_scale == 1 &&
            mwindow->edl->session->proxy_disabled_scale == 1 )

-               proxy_toggle->hide_window();
+               proxy_toggle->hide();

        else
        else

-               proxy_toggle->show_window();
+               proxy_toggle->show();

 }
 
 void MWindowGUI::update_plugintoggles()
 }
 
 void MWindowGUI::update_plugintoggles()


@@ -2388,15 +2390,36 @@ int FFMpegToggle::handle_event()
 
 
 ProxyToggle::ProxyToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
 
 
 ProxyToggle::ProxyToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)

- : BC_Toggle(x, y, mwindow->theme->proxy_toggle,
+ : BC_Toggle(x, y, ( !mwindow->edl->session->proxy_use_scaler ?
+                       mwindow->theme->proxy_p_toggle :
+                       mwindow->theme->proxy_s_toggle ),

                mwindow->edl->session->proxy_disabled_scale != 1)
 {
        this->mwindow = mwindow;
        this->mbuttons = mbuttons;
                mwindow->edl->session->proxy_disabled_scale != 1)
 {
        this->mwindow = mwindow;
        this->mbuttons = mbuttons;

+       scaler_images = mwindow->edl->session->proxy_use_scaler;

        set_tooltip(mwindow->edl->session->proxy_disabled_scale==1 ?
                _("Disable proxy") : _("Enable proxy"));
 }
 
        set_tooltip(mwindow->edl->session->proxy_disabled_scale==1 ?
                _("Disable proxy") : _("Enable proxy"));
 }
 

+void ProxyToggle::show()
+{
+       int use_scaler = mwindow->edl->session->proxy_use_scaler;
+       if( scaler_images != use_scaler )
+               set_images(!(scaler_images=use_scaler) ?
+                       mwindow->theme->proxy_p_toggle :
+                       mwindow->theme->proxy_s_toggle );
+       draw_face(1, 0);
+       if( is_hidden() )
+               show_window();
+}
+
+void ProxyToggle::hide()
+{
+       if( !is_hidden() )
+               hide_window();
+}
+

 ProxyToggle::~ProxyToggle()
 {
 }
 ProxyToggle::~ProxyToggle()
 {
 }

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h
index d4205162e380d6580b6d1219dc74e4f5a1fb014d..00aeb606f212ad5417b9465cb03931f65fdbe73f 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.h
+++ b/cinelerra-5.1/cinelerra/mwindowgui.h
@@ -85,9 +85,12 @@ public:
        ~ProxyToggle();
        int handle_event();
        int keypress_event();
        ~ProxyToggle();
        int handle_event();
        int keypress_event();

+       void show();
+       void hide();

 
        MWindow *mwindow;
        MButtons *mbuttons;
 
        MWindow *mwindow;
        MButtons *mbuttons;

+       int scaler_images;

 };
 
 
 };
 
 

diff --git a/cinelerra-5.1/cinelerra/newfolder.C b/cinelerra-5.1/cinelerra/newfolder.C
index dafa8f611efc90cabae816ae64c64aa4ca4e3411..26ab5a19036a06faa385fe5b0fd491a7dd7b2678 100644 (file)
--- a/cinelerra-5.1/cinelerra/newfolder.C
+++ b/cinelerra-5.1/cinelerra/newfolder.C
@@ -35,15 +35,7 @@
 
 NewFolder::NewFolder(MWindow *mwindow, AWindowGUI *awindow, int x, int y)
  : BC_Window(_(PROGRAM_NAME ": New folder"),
 
 NewFolder::NewFolder(MWindow *mwindow, AWindowGUI *awindow, int x, int y)
  : BC_Window(_(PROGRAM_NAME ": New folder"),

-       x,
-       y,
-       320,
-       120,
-       0,
-       0,
-       0,
-       0,
-       1)
+       x, y, 320, 120, 0, 0, 0, 0, 1)

 {
        this->mwindow = mwindow;
        this->awindow = awindow;
 {
        this->mwindow = mwindow;
        this->awindow = awindow;


@@ -56,6 +48,7 @@ NewFolder::~NewFolder()
 
 void NewFolder::create_objects()
 {
 
 void NewFolder::create_objects()
 {

+       lock_window("NewFolder::create_objects");

        int x = 10, y = 10;
        add_tool(new BC_Title(x, y, _("Enter the name of the folder:")));
        y += 20;
        int x = 10, y = 10;
        add_tool(new BC_Title(x, y, _("Enter the name of the folder:")));
        y += 20;


@@ -65,6 +58,7 @@ void NewFolder::create_objects()
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));
        show_window();
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));
        show_window();

+       unlock_window();

 }
 
 const char* NewFolder::get_text()
 }
 
 const char* NewFolder::get_text()

diff --git a/cinelerra-5.1/cinelerra/pluginclient.C b/cinelerra-5.1/cinelerra/pluginclient.C
index 417dd917e2c4f0e9bb8e7f76b74e28323871e701..4cab34b513f80b208a14d1a95d848fb430a9ab3a 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginclient.C
+++ b/cinelerra-5.1/cinelerra/pluginclient.C
@@ -141,11 +141,7 @@ PluginClientFrame::~PluginClientFrame()
 
 
 PluginClientWindow::PluginClientWindow(PluginClient *client,
 
 
 PluginClientWindow::PluginClientWindow(PluginClient *client,

-       int w,
-       int h,
-       int min_w,
-       int min_h,
-       int allow_resize)
+       int w, int h, int min_w, int min_h, int allow_resize)

  : BC_Window(client->gui_string,
        client->window_x /* - w / 2 */,
        client->window_y /* - h / 2 */,
  : BC_Window(client->gui_string,
        client->window_x /* - w / 2 */,
        client->window_y /* - h / 2 */,

diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C
index e4a2cce302126d27aab16c953c64cce7830c28c5..439a6efb5d5feffb6d83f6b48bae9b94fd412dc7 100644 (file)
--- a/cinelerra-5.1/cinelerra/plugindialog.C
+++ b/cinelerra-5.1/cinelerra/plugindialog.C
@@ -53,10 +53,7 @@ PluginDialogThread::~PluginDialogThread()
 }
 
 void PluginDialogThread::start_window(Track *track,
 }
 
 void PluginDialogThread::start_window(Track *track,

-       Plugin *plugin,
-       const char *title,
-       int is_mainmenu,
-       int data_type)
+       Plugin *plugin, const char *title, int is_mainmenu, int data_type)

 {
        if(!BC_DialogThread::is_running())
        {
 {
        if(!BC_DialogThread::is_running())
        {

diff --git a/cinelerra-5.1/cinelerra/probeprefs.C b/cinelerra-5.1/cinelerra/probeprefs.C
index dcce262e0687b336806f2835cf4abfaf07b1368e..57472372341bb816d9e04f543a5bb5cfd9bd85c9 100644 (file)
--- a/cinelerra-5.1/cinelerra/probeprefs.C
+++ b/cinelerra-5.1/cinelerra/probeprefs.C
@@ -69,6 +69,7 @@ ProbeEditWindow::~ProbeEditWindow()
 
 void ProbeEditWindow::create_objects()
 {
 
 void ProbeEditWindow::create_objects()
 {

+       lock_window("ProbeEditWindow::create_objects");

        pb_enabled = new BC_Pixmap(this,
                 BC_WindowBase::get_resources()->listbox_up,
                 PIXMAP_ALPHA);
        pb_enabled = new BC_Pixmap(this,
                 BC_WindowBase::get_resources()->listbox_up,
                 PIXMAP_ALPHA);


@@ -95,6 +96,7 @@ void ProbeEditWindow::create_objects()
 
        list_update();
        show_window();
 
        list_update();
        show_window();

+       unlock_window();

 }
 
 ProbeEditOK::ProbeEditOK(ProbeEditWindow *pb_window)
 }
 
 ProbeEditOK::ProbeEditOK(ProbeEditWindow *pb_window)

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index 45feb5951354a36d5e668f73080483ddc6ababba..420592ea7e7ec7268928f51a687ff9e8b7d70615 100644 (file)
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -165,12 +165,14 @@ void ProxyDialog::handle_close_event(int result)
                eprintf("Specified format does not render video");
                return;
        }
                eprintf("Specified format does not render video");
                return;
        }

-       mwindow->edl->session->proxy_use_scaler = use_scaler;

        mwindow->edl->session->proxy_auto_scale = auto_scale;
        mwindow->edl->session->proxy_beep = beep;
        mwindow->edl->session->proxy_disabled_scale = 1;
        mwindow->edl->session->proxy_auto_scale = auto_scale;
        mwindow->edl->session->proxy_beep = beep;
        mwindow->edl->session->proxy_disabled_scale = 1;

+       mwindow->gui->lock_window("ProxyDialog::handle_close_event");
+       mwindow->gui->update_proxy_toggle();
+       mwindow->gui->unlock_window();

        asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0); 
        asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0); 

-       result = mwindow->to_proxy(asset, new_scale);
+       result = mwindow->to_proxy(asset, new_scale, use_scaler);

        if( result >= 0 && beep && new_scale != 1 ) {
                static struct { double freq, secs, gain; }
                    tone[2] = { { 2000., 1.5, 0.5 }, { 4000., 0.25, 0.5 } };
        if( result >= 0 && beep && new_scale != 1 ) {
                static struct { double freq, secs, gain; }
                    tone[2] = { { 2000., 1.5, 0.5 }, { 4000., 0.25, 0.5 } };

diff --git a/cinelerra-5.1/cinelerra/recconfirmdelete.C b/cinelerra-5.1/cinelerra/recconfirmdelete.C
index f8328a6e787817a0f48429114fa0d8d9a990b6c0..987b771755f235196f2182bf165101c0f447036f 100644 (file)
--- a/cinelerra-5.1/cinelerra/recconfirmdelete.C
+++ b/cinelerra-5.1/cinelerra/recconfirmdelete.C
@@ -44,6 +44,7 @@ RecConfirmDelete::~RecConfirmDelete()
 
 void RecConfirmDelete::create_objects(char *string)
 {
 
 void RecConfirmDelete::create_objects(char *string)
 {

+       lock_window("RecConfirmDelete::create_objects");

        char string2[256];
        int x = 10, y = 10;
        sprintf(string2, _("Delete this file and %s?"), string);
        char string2[256];
        int x = 10, y = 10;
        sprintf(string2, _("Delete this file and %s?"), string);


@@ -52,6 +53,7 @@ void RecConfirmDelete::create_objects(char *string)
        add_subwindow(new BC_OKButton(x, y));
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));
        add_subwindow(new BC_OKButton(x, y));
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(x, y));

+       unlock_window();

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/recordwindow.C b/cinelerra-5.1/cinelerra/recordwindow.C
index 750462a6cf4423b59f286308fef8cd9ff97a4374..87ad8cc60cc278fcb3fcc4aaa9929444b0b674a3 100644 (file)
--- a/cinelerra-5.1/cinelerra/recordwindow.C
+++ b/cinelerra-5.1/cinelerra/recordwindow.C
@@ -28,16 +28,9 @@
 #include "videodevice.inc"
 
 RecordWindow::RecordWindow(MWindow *mwindow, Record *record, int x, int y)
 #include "videodevice.inc"
 
 RecordWindow::RecordWindow(MWindow *mwindow, Record *record, int x, int y)

- : BC_Window(_(PROGRAM_NAME ": Record"),
-       x,
-       y,
-       RECORD_WINDOW_WIDTH,
-       RECORD_WINDOW_HEIGHT,
-       (int)BC_INFINITY,
-       (int)BC_INFINITY,
-       0,
-       0,
-       1)
+ : BC_Window(_(PROGRAM_NAME ": Record"), x, y,
+       RECORD_WINDOW_WIDTH, RECORD_WINDOW_HEIGHT,
+       (int)BC_INFINITY, (int)BC_INFINITY, 0, 0, 1)

 {
        this->mwindow = mwindow;
        this->record = record;
 {
        this->mwindow = mwindow;
        this->record = record;


@@ -49,32 +42,16 @@ RecordWindow::~RecordWindow()
 //     delete loadmode;
 }
 
 //     delete loadmode;
 }
 

-
-

 void RecordWindow::create_objects()
 {
 void RecordWindow::create_objects()
 {

-//printf("RecordWindow::create_objects 1\n");
+       lock_window("RecordWindow::create_objects");

        add_subwindow(new BC_Title(5, 5, _("Select a file to record to:")));
 
        add_subwindow(new BC_Title(5, 5, _("Select a file to record to:")));
 

-//printf("RecordWindow::create_objects 1\n");

        int x = 5, y = 25;
        int x = 5, y = 25;

-       format_tools = new FormatTools(mwindow,
-                                       this,
-                                       record->default_asset);
-//printf("RecordWindow::create_objects 1\n");
-       format_tools->create_objects(x,
-                                       y,
-                                       1,
-                                       1,
-                                       1,
-                                       1,
-                                       1,
-                                       1,
+       format_tools = new FormatTools(mwindow, this, record->default_asset);
+       format_tools->create_objects(x, y, 1, 1, 1, 1, 1, 1,

                                        /* record->fixed_compression */ 0,
                                        /* record->fixed_compression */ 0,

-                                       1,
-                                       0,
-                                       0);
-//printf("RecordWindow::create_objects 1\n");
+                                       1, 0, 0);

 
 // Not the same as creating a new file at each label.
 // Load mode is now located in the RecordGUI
 
 // Not the same as creating a new file at each label.
 // Load mode is now located in the RecordGUI


@@ -83,18 +60,12 @@ void RecordWindow::create_objects()
 //     loadmode->create_objects();
 
        add_subwindow(new BC_OKButton(this));
 //     loadmode->create_objects();
 
        add_subwindow(new BC_OKButton(this));

-//printf("RecordWindow::create_objects 1\n");

        add_subwindow(new BC_CancelButton(this));
        add_subwindow(new BC_CancelButton(this));

-//printf("RecordWindow::create_objects 1\n");

        show_window();
        show_window();

+       unlock_window();

 }
 
 
 }
 
 

-
-
-
-
-

 RecordToTracks::RecordToTracks(Record *record, int default_)
  : BC_CheckBox(200, 270, default_) { this->record = record; }
 RecordToTracks::~RecordToTracks()
 RecordToTracks::RecordToTracks(Record *record, int default_)
  : BC_CheckBox(200, 270, default_) { this->record = record; }
 RecordToTracks::~RecordToTracks()

diff --git a/cinelerra-5.1/cinelerra/reindex.C b/cinelerra-5.1/cinelerra/reindex.C
index 5112b12bc8f2d3a938ed9dec0ec7cd2254de6ab1..27864c1299c35ab4ef0328cd00e814877e500844 100644 (file)
--- a/cinelerra-5.1/cinelerra/reindex.C
+++ b/cinelerra-5.1/cinelerra/reindex.C
@@ -80,12 +80,14 @@ ReIndexWindow::~ReIndexWindow()
 
 ReIndexWindow::create_objects()
 {
 
 ReIndexWindow::create_objects()
 {

+       lock_window("ReIndexWindow::create_objects");

        BC_SubWindow *subwindow;
 
        add_subwindow(subwindow = new BC_SubWindow(0, 0, w, h, MEGREY));
        subwindow->add_subwindow(new BC_Title(5, 5, _("Redraw all indexes for the current project?")));
        subwindow->add_subwindow(ok = new ReIndexOkButton(this));
        subwindow->add_subwindow(cancel = new ReIndexCancelButton(this));
        BC_SubWindow *subwindow;
 
        add_subwindow(subwindow = new BC_SubWindow(0, 0, w, h, MEGREY));
        subwindow->add_subwindow(new BC_Title(5, 5, _("Redraw all indexes for the current project?")));
        subwindow->add_subwindow(ok = new ReIndexOkButton(this));
        subwindow->add_subwindow(cancel = new ReIndexCancelButton(this));

+       unlock_window();

 }
 
 ReIndexOkButton::ReIndexOkButton(ReIndexWindow *window)
 }
 
 ReIndexOkButton::ReIndexOkButton(ReIndexWindow *window)

diff --git a/cinelerra-5.1/cinelerra/resizetrackthread.C b/cinelerra-5.1/cinelerra/resizetrackthread.C
index a9548455b2c86b28297ebb546a41668db7bf5d70..e91d09b9763a96995560782e147c06ba49eb7293 100644 (file)
--- a/cinelerra-5.1/cinelerra/resizetrackthread.C
+++ b/cinelerra-5.1/cinelerra/resizetrackthread.C
@@ -118,9 +118,8 @@ ResizeVTrackWindow::~ResizeVTrackWindow()
 
 void ResizeVTrackWindow::create_objects()
 {
 
 void ResizeVTrackWindow::create_objects()
 {

-       int x = 10, y = 10;
-

        lock_window("ResizeVTrackWindow::create_objects");
        lock_window("ResizeVTrackWindow::create_objects");

+       int x = 10, y = 10;

        BC_Title *size_title = new BC_Title(x, y, _("Size:"));
        add_subwindow(size_title);
        int x1 = x + size_title->get_w();
        BC_Title *size_title = new BC_Title(x, y, _("Size:"));
        add_subwindow(size_title);
        int x1 = x + size_title->get_w();

diff --git a/cinelerra-5.1/cinelerra/scale.C b/cinelerra-5.1/cinelerra/scale.C
index 33cc0561254c39d07d42f303d40f135d56f0af35..b963bb9304faaa1c80f310c1ba27993c6f4ae48b 100644 (file)
--- a/cinelerra-5.1/cinelerra/scale.C
+++ b/cinelerra-5.1/cinelerra/scale.C
@@ -203,6 +203,7 @@ ScaleWindow::~ScaleWindow()
 
 void ScaleWindow::create_objects()
 {
 
 void ScaleWindow::create_objects()
 {

+       lock_window("ScaleWindow::create_objects");

        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, _("New camera size:")));
        add_subwindow(new BC_Title(x + 200, y, _("New projector size:")));
        int x = 10, y = 10;
        add_subwindow(new BC_Title(x, y, _("New camera size:")));
        add_subwindow(new BC_Title(x + 200, y, _("New projector size:")));


@@ -309,6 +310,7 @@ void ScaleWindow::create_objects()
        add_subwindow(new BC_OKButton(x, y));
        x += 200;
        add_subwindow(new BC_CancelButton(x, y));
        add_subwindow(new BC_OKButton(x, y));
        x += 200;
        add_subwindow(new BC_CancelButton(x, y));

+       unlock_window();

 }
 
 ScaleSizeText::ScaleSizeText(int x, int y, ScaleThread *thread, int *output)
 }
 
 ScaleSizeText::ScaleSizeText(int x, int y, ScaleThread *thread, int *output)

diff --git a/cinelerra-5.1/cinelerra/setformat.C b/cinelerra-5.1/cinelerra/setformat.C
index bf22103f2c0e6e7889bc5e3b63b5552af991ea3e..cf8f1a2e4ffe869289b1ce95748b94e491c68e15 100644 (file)
--- a/cinelerra-5.1/cinelerra/setformat.C
+++ b/cinelerra-5.1/cinelerra/setformat.C
@@ -295,15 +295,12 @@ SetFormatWindow::~SetFormatWindow()
 
 void SetFormatWindow::create_objects()
 {
 
 void SetFormatWindow::create_objects()
 {

+       lock_window("SetFormatWindow::create_objects");

        int x = 10, y = mwindow->theme->setformat_y1;
        BC_TextBox *textbox;
        BC_Title *title;
        int x = 10, y = mwindow->theme->setformat_y1;
        BC_TextBox *textbox;
        BC_Title *title;

-
-       lock_window("SetFormatWindow::create_objects");

        mwindow->theme->draw_setformat_bg(this);
 
        mwindow->theme->draw_setformat_bg(this);
 

-
-

        presets = new SetFormatPresets(mwindow, this, x, y);
        presets->create_objects();
        x = presets->x; //  y = presets->y;
        presets = new SetFormatPresets(mwindow, this, x, y);
        presets->create_objects();
        x = presets->x; //  y = presets->y;

diff --git a/cinelerra-5.1/cinelerra/shbtnprefs.C b/cinelerra-5.1/cinelerra/shbtnprefs.C
index cad3a6a2e9012ebee927a38e21d11a15c1ce6ae0..b1de0be6c3310f3867bec76418069654fe3d80be 100644 (file)
--- a/cinelerra-5.1/cinelerra/shbtnprefs.C
+++ b/cinelerra-5.1/cinelerra/shbtnprefs.C
@@ -200,6 +200,7 @@ ShBtnErrWarn::~ShBtnErrWarn()
 
 void ShBtnTextWindow::create_objects()
 {
 
 void ShBtnTextWindow::create_objects()
 {

+       lock_window("ShBtnTextWindow::create_objects");

         int x = 10, y = 10;
        int x1 = 160;
        BC_Title *title = new BC_Title(x, y, _("Label:"));
         int x = 10, y = 10;
        int x1 = 160;
        BC_Title *title = new BC_Title(x, y, _("Label:"));


@@ -217,6 +218,7 @@ void ShBtnTextWindow::create_objects()
         y = get_h() - ShBtnTextOK::calculate_h() - 10;
         add_subwindow(new ShBtnTextOK(this, x, y));
         show_window();
         y = get_h() - ShBtnTextOK::calculate_h() - 10;
         add_subwindow(new ShBtnTextOK(this, x, y));
         show_window();

+       unlock_window();

 }
 
 ShBtnTextOK::ShBtnTextOK(ShBtnTextWindow *st_window, int x, int y)
 }
 
 ShBtnTextOK::ShBtnTextOK(ShBtnTextWindow *st_window, int x, int y)


@@ -267,6 +269,7 @@ int ShBtnTextDialog::start_edit(ShBtnPref *pref)
 
 void ShBtnEditWindow::create_objects()
 {
 
 void ShBtnEditWindow::create_objects()
 {

+       lock_window("ShBtnEditWindow::create_objects");

        Preferences *preferences = shbtn_edit->pwindow->thread->preferences;
        for( int i=0; i<preferences->shbtn_prefs.size(); ++i ) {
                shbtn_items.append(new ShBtnPrefItem(preferences->shbtn_prefs[i]));
        Preferences *preferences = shbtn_edit->pwindow->thread->preferences;
        for( int i=0; i<preferences->shbtn_prefs.size(); ++i ) {
                shbtn_items.append(new ShBtnPrefItem(preferences->shbtn_prefs[i]));


@@ -281,6 +284,7 @@ void ShBtnEditWindow::create_objects()
        add_subwindow(edit_button = new ShBtnEditButton(this, x, y));
        add_subwindow(new BC_OKButton(this));
        show_window();
        add_subwindow(edit_button = new ShBtnEditButton(this, x, y));
        add_subwindow(new BC_OKButton(this));
        show_window();

+       unlock_window();

 }
 
 int ShBtnEditWindow::start_edit(ShBtnPref *pref)
 }
 
 int ShBtnEditWindow::start_edit(ShBtnPref *pref)

diff --git a/cinelerra-5.1/cinelerra/splashgui.C b/cinelerra-5.1/cinelerra/splashgui.C
index 3d9c451592ccfb6325ffe17d0411a3b5b5742cfc..e91d640d8d980e39c301ae3b69dc458e24e35960 100644 (file)
--- a/cinelerra-5.1/cinelerra/splashgui.C
+++ b/cinelerra-5.1/cinelerra/splashgui.C
@@ -30,19 +30,8 @@
 
 
 SplashGUI::SplashGUI(VFrame *bg, int x, int y)
 
 
 SplashGUI::SplashGUI(VFrame *bg, int x, int y)

- : BC_Window(_(PROGRAM_NAME ": Loading"),
-               x,
-               y,
-               bg->get_w(),
-               bg->get_h(),
-               -1,
-               -1,
-               0,
-               0,
-               1,
-               -1,
-               "",
-               0)
+ : BC_Window(_(PROGRAM_NAME ": Loading"), x, y, bg->get_w(), bg->get_h(),
+               -1, -1, 0, 0, 1, -1, "", 0)

 {
        this->bg = bg;
 }
 {
        this->bg = bg;
 }


@@ -54,13 +43,21 @@ SplashGUI::~SplashGUI()
 
 void SplashGUI::create_objects()
 {
 
 void SplashGUI::create_objects()
 {

+       lock_window("SplashGUI::create_objects");

        draw_vframe(bg, 0, 0);
        flash();
        show_window();
        draw_vframe(bg, 0, 0);
        flash();
        show_window();

-       add_subwindow(operation =
-               new BC_Title(5,
+       operation = new BC_Title(5,

                        get_h() - get_text_height(MEDIUMFONT) - 5,
                        get_h() - get_text_height(MEDIUMFONT) - 5,

-                       _("Loading...")));
+                       _("Loading..."));
+       add_subwindow(operation);
+       unlock_window();

 }
 
 }
 

+void SplashGUI::update_status(const char *text)
+{
+       lock_window("SplashGUI::update_status");
+       operation->update(text);
+       unlock_window();
+}

 
 

diff --git a/cinelerra-5.1/cinelerra/splashgui.h b/cinelerra-5.1/cinelerra/splashgui.h
index afeebc60f7ad2f48543238da352023fc9d73203a..5383b9f8d45c5ef2d384db6331c1845afb46e45e 100644 (file)
--- a/cinelerra-5.1/cinelerra/splashgui.h
+++ b/cinelerra-5.1/cinelerra/splashgui.h
@@ -31,6 +31,7 @@ public:
        SplashGUI(VFrame *bg, int x, int y);
        ~SplashGUI();
        void create_objects();
        SplashGUI(VFrame *bg, int x, int y);
        ~SplashGUI();
        void create_objects();

+       void update_status(const char *text);

        BC_Title *operation;
        VFrame *bg;
 };
        BC_Title *operation;
        VFrame *bg;
 };

diff --git a/cinelerra-5.1/cinelerra/swindow.C b/cinelerra-5.1/cinelerra/swindow.C
index 5764aeae49875e09f8ad924cb86a2fbc951cd72a..1604d8dbf371804fb36e6d1f938a256abc940e49 100644 (file)
--- a/cinelerra-5.1/cinelerra/swindow.C
+++ b/cinelerra-5.1/cinelerra/swindow.C
@@ -139,6 +139,7 @@ int SWindowSaveFile::handle_event()
 
 void SWindowGUI::create_objects()
 {
 
 void SWindowGUI::create_objects()
 {

+       lock_window("SWindowGUI::create_objects");

        int x = 10, y = 10;
        BC_Title *title = new BC_Title(x, y, _("Path:"));
        add_subwindow(title);
        int x = 10, y = 10;
        BC_Title *title = new BC_Title(x, y, _("Path:"));
        add_subwindow(title);


@@ -197,6 +198,7 @@ void SWindowGUI::create_objects()
        add_subwindow(ok);
        cancel = new SWindowCancel(this, cancel_x, cancel_y);
        add_subwindow(cancel);
        add_subwindow(ok);
        cancel = new SWindowCancel(this, cancel_x, cancel_y);
        add_subwindow(cancel);

+       unlock_window();

 }
 
 void SWindowGUI::load()
 }
 
 void SWindowGUI::load()

diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C
index 7bbcceb65eeef15e17f237c8cfc9bae1cae06acc..65865a24bb2f3ce5cee7a1672a68e9cee2a3fe89 100644 (file)
--- a/cinelerra-5.1/cinelerra/theme.C
+++ b/cinelerra-5.1/cinelerra/theme.C
@@ -128,7 +128,8 @@ Theme::Theme()
        edithandleout_data = 0;
        extract_data = 0;
        ffmpeg_toggle = 0;
        edithandleout_data = 0;
        extract_data = 0;
        ffmpeg_toggle = 0;

-       proxy_toggle = 0;
+       proxy_s_toggle = 0;
+       proxy_p_toggle = 0;

        infoasset_data = 0;
        in_point = 0;
        insert_data = 0;
        infoasset_data = 0;
        in_point = 0;
        insert_data = 0;


@@ -597,7 +598,7 @@ void Theme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 {
        mbuttons_x = 0;
        mbuttons_y = gui->menu_h() + 1;
 {
        mbuttons_x = 0;
        mbuttons_y = gui->menu_h() + 1;

-       mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2);
+       mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2);

        mbuttons_h = get_image("mbutton_bg")->get_h();
        mclock_x = window_border - 5;
        mclock_y = mbuttons_y - 1 + mbuttons_h;
        mbuttons_h = get_image("mbutton_bg")->get_h();
        mclock_x = window_border - 5;
        mclock_y = mbuttons_y - 1 + mbuttons_h;

diff --git a/cinelerra-5.1/cinelerra/theme.h b/cinelerra-5.1/cinelerra/theme.h
index 35dad586dd097fc51730d89c49a79486fdeb30af..47e54584a4ea221f3f5ee2c3117959ff6dd3da96 100644 (file)
--- a/cinelerra-5.1/cinelerra/theme.h
+++ b/cinelerra-5.1/cinelerra/theme.h
@@ -325,7 +325,8 @@ public:
        VFrame **edithandleout_data;
        VFrame **extract_data;
        VFrame **ffmpeg_toggle;
        VFrame **edithandleout_data;
        VFrame **extract_data;
        VFrame **ffmpeg_toggle;

-       VFrame **proxy_toggle;
+       VFrame **proxy_p_toggle;
+       VFrame **proxy_s_toggle;

        VFrame **infoasset_data;
        VFrame **in_point;
        VFrame **insert_data;
        VFrame **infoasset_data;
        VFrame **in_point;
        VFrame **insert_data;

diff --git a/cinelerra-5.1/cinelerra/tipwindow.C b/cinelerra-5.1/cinelerra/tipwindow.C
index 3474f49493acd7edfe2bdbd9b58768e275152eea..5ad9092726f1a8be181e84eb5faa1d3ac05c2f3d 100644 (file)
--- a/cinelerra-5.1/cinelerra/tipwindow.C
+++ b/cinelerra-5.1/cinelerra/tipwindow.C
@@ -125,6 +125,7 @@ TipWindowGUI::TipWindowGUI(MWindow *mwindow, TipWindow *thread, int x, int y)
 
 void TipWindowGUI::create_objects()
 {
 
 void TipWindowGUI::create_objects()
 {

+       lock_window("TipWindowGUI::create_objects");

        int x = 10, y = 10;
        add_subwindow(tip_text = new BC_Title(x, y, thread->get_current_tip(0)));
        y = get_h() - 30;
        int x = 10, y = 10;
        add_subwindow(tip_text = new BC_Title(x, y, thread->get_current_tip(0)));
        y = get_h() - 30;


@@ -142,6 +143,7 @@ void TipWindowGUI::create_objects()
 
        show_window();
        raise_window();
 
        show_window();
        raise_window();

+       unlock_window();

 }
 
 int TipWindowGUI::keypress_event()
 }
 
 int TipWindowGUI::keypress_event()

diff --git a/cinelerra-5.1/cinelerra/videowindowgui.C b/cinelerra-5.1/cinelerra/videowindowgui.C
index 0afff0bcfe7a7a83fa441e58af54ab4b0d5c1755..252e57104644c7c08e3d3374080e8d21239ccb6d 100644 (file)
--- a/cinelerra-5.1/cinelerra/videowindowgui.C
+++ b/cinelerra-5.1/cinelerra/videowindowgui.C
@@ -33,15 +33,8 @@
 
 VideoWindowGUI::VideoWindowGUI(VideoWindow *thread, int w, int h)
  : BC_Window(_(PROGRAM_NAME ": Video out"),
 
 VideoWindowGUI::VideoWindowGUI(VideoWindow *thread, int w, int h)
  : BC_Window(_(PROGRAM_NAME ": Video out"),

-       (int)BC_INFINITY,
-       (int)BC_INFINITY,
-       w,
-       h,
-       10,
-       10,
-       1,
-       1,
-       1)
+       (int)BC_INFINITY, (int)BC_INFINITY,
+       w, h, 10, 10, 1, 1, 1)

 {
        this->thread = thread;
 }
 {
        this->thread = thread;
 }


@@ -52,11 +45,12 @@ VideoWindowGUI::~VideoWindowGUI()
 
 void VideoWindowGUI::create_objects()
 {
 
 void VideoWindowGUI::create_objects()
 {

+       lock_window("VideoWindowGUI::create_objects");

        add_subwindow(canvas = new VideoWindowCanvas(this, get_w(), get_h()));
        update_title();
        add_subwindow(canvas = new VideoWindowCanvas(this, get_w(), get_h()));
        update_title();

+       unlock_window();

 }
 
 }
 

-

 int VideoWindowGUI::keypress_event()
 {
 }
 int VideoWindowGUI::keypress_event()
 {
 }

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 87909d2a604aab85a5d009e69cc586de5455c19d..e3f323c526e08acd98c56b05b5e682376a317e89 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -201,9 +201,9 @@ void VWindowGUI::update_sources(const char *title)
 
 void VWindowGUI::create_objects()
 {
 
 void VWindowGUI::create_objects()
 {

+       lock_window("VWindowGUI::create_objects");

        in_point = 0;
        out_point = 0;
        in_point = 0;
        out_point = 0;

-       lock_window("VWindowGUI::create_objects");

        set_icon(mwindow->theme->get_image("vwindow_icon"));
 
 //printf("VWindowGUI::create_objects 1\n");
        set_icon(mwindow->theme->get_image("vwindow_icon"));
 
 //printf("VWindowGUI::create_objects 1\n");

diff --git a/cinelerra-5.1/cinelerra/wwindow.C b/cinelerra-5.1/cinelerra/wwindow.C
index b7ffb644b7541d2cdc976ea6c567466541eb65c6..4f522f3179f099de3ee2622836771b6a3534a6eb 100644 (file)
--- a/cinelerra-5.1/cinelerra/wwindow.C
+++ b/cinelerra-5.1/cinelerra/wwindow.C
@@ -79,6 +79,7 @@ WWindowGUI::WWindowGUI(WWindow *thread, int x, int y)
 
 void WWindowGUI::create_objects()
 {
 
 void WWindowGUI::create_objects()
 {

+       lock_window("WWindowGUI::create_objects");

        int x = 10, y = 10;
        add_subwindow(new BC_TextBox(x, y, get_w()-50, 3, thread->warn_text));
        y = get_h() - 30;
        int x = 10, y = 10;
        add_subwindow(new BC_TextBox(x, y, get_w()-50, 3, thread->warn_text));
        y = get_h() - 30;


@@ -87,6 +88,7 @@ void WWindowGUI::create_objects()
        x = get_w() - BC_CancelButton::calculate_w() - 10;
        add_subwindow(new BC_CancelButton(x, y));
        show_window();
        x = get_w() - BC_CancelButton::calculate_w() - 10;
        add_subwindow(new BC_CancelButton(x, y));
        show_window();

+       unlock_window();

 }
 
 WDisable::WDisable(WWindowGUI *gui, int x, int y)
 }
 
 WDisable::WDisable(WWindowGUI *gui, int x, int y)

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 1157b0a301fda457d2e31f2c67b898096d4c7881..f521b1670be23f3ce9be099d0d4533c23e3593bd 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -47,6 +47,7 @@ CHECK_WITH([config-dir],[.bcast config dir],[CONFIG_DIR],[$$HOME/.bcast5])
 CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox])
 CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no])
 CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto])
 CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox])
 CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no])
 CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto])

+CHECK_WITH([booby],[window lock trace booby trap],[BOOBY],[no])

 CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes])
 CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes])
 CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes])
 CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes])
 CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes])
 CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes])


@@ -835,6 +836,7 @@ echo "  using: with-ladspa-dir = $WANT_LADSPA_DIR"
 echo "  using: with-opencv = $WANT_OPENCV"
 echo "  using: with-git-ffmpeg = $WANT_GIT_FFMPEG"
 echo "  using: with-noelision = $WANT_NOELISION"
 echo "  using: with-opencv = $WANT_OPENCV"
 echo "  using: with-git-ffmpeg = $WANT_GIT_FFMPEG"
 echo "  using: with-noelision = $WANT_NOELISION"

+echo "  using: with-booby = $WANT_BOOBY"

 echo "  using: with-libzmpeg = $WANT_LIBZMPEG"
 echo "  using: with-commerical = $WANT_COMMERCIAL"
 echo ""
 echo "  using: with-libzmpeg = $WANT_LIBZMPEG"
 echo "  using: with-commerical = $WANT_COMMERCIAL"
 echo ""


@@ -864,6 +866,9 @@ if test "x$WANT_OPUS" = "xyes"; then
     CFG_CFLAGS+=' -I/usr/include/opus -I/usr/local/include/opus'
   fi
 fi
     CFG_CFLAGS+=' -I/usr/include/opus -I/usr/local/include/opus'
   fi
 fi

+if test "x$WANT_BOOBY" != "xno"; then
+  CFG_CFLAGS+=" -DBOOBY"
+fi

 
 # intel lock elision bugs
 if test "x$WANT_NOELISION" != "xno"; then
 
 # intel lock elision bugs
 if test "x$WANT_NOELISION" != "xno"; then

diff --git a/cinelerra-5.1/guicast/bcfilebox.C b/cinelerra-5.1/guicast/bcfilebox.C
index ea9c58f5bf04e40177247b91e604196aca8b832a..6e194ebada7064bc5f8ca83686e17a8aad8be7e1 100644 (file)
--- a/cinelerra-5.1/guicast/bcfilebox.C
+++ b/cinelerra-5.1/guicast/bcfilebox.C
@@ -553,6 +553,7 @@ BC_FileBox::~BC_FileBox()
 
 void BC_FileBox::create_objects()
 {
 
 void BC_FileBox::create_objects()
 {

+       lock_window("BC_FileBox::create_objects");

        int x = 10, y = 10;
        BC_Resources *resources = BC_WindowBase::get_resources();
        int directory_title_margin = MAX(20,
        int x = 10, y = 10;
        BC_Resources *resources = BC_WindowBase::get_resources();
        int directory_title_margin = MAX(20,


@@ -662,6 +663,7 @@ void BC_FileBox::create_objects()
 
        refresh();
        show_window();
 
        refresh();
        show_window();

+       unlock_window();

 }
 
 int BC_FileBox::get_listbox_w()
 }
 
 int BC_FileBox::get_listbox_w()

diff --git a/cinelerra-5.1/guicast/bcnewfolder.C b/cinelerra-5.1/guicast/bcnewfolder.C
index 850a020d5d4f5cfd84794b5a0120fd8c4ed8dd3d..cc9d4b1b91831ab37a3f5b60b81a315da3938ef4 100644 (file)
--- a/cinelerra-5.1/guicast/bcnewfolder.C
+++ b/cinelerra-5.1/guicast/bcnewfolder.C
@@ -56,6 +56,7 @@ BC_NewFolder::~BC_NewFolder()
 
 void BC_NewFolder::create_objects()
 {
 
 void BC_NewFolder::create_objects()
 {

+       lock_window("BC_NewFolder::create_objects");

        int x = 10, y = 10;
        add_tool(new BC_Title(x, y, _("Enter the name of the folder:")));
        y += 20;
        int x = 10, y = 10;
        add_tool(new BC_Title(x, y, _("Enter the name of the folder:")));
        y += 20;


@@ -65,6 +66,7 @@ void BC_NewFolder::create_objects()
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(this));
        show_window();
        x = get_w() - 100;
        add_subwindow(new BC_CancelButton(this));
        show_window();

+       unlock_window();

 }
 
 const char* BC_NewFolder::get_text()
 }
 
 const char* BC_NewFolder::get_text()

diff --git a/cinelerra-5.1/guicast/bcprogressbox.C b/cinelerra-5.1/guicast/bcprogressbox.C
index ac49c98ac218a4eb027ba602850a9b25450580f6..fde9580411c60e4e7b1266a16d51e9e7bfedfe5f 100644 (file)
--- a/cinelerra-5.1/guicast/bcprogressbox.C
+++ b/cinelerra-5.1/guicast/bcprogressbox.C
@@ -133,7 +133,7 @@ BC_ProgressWindow::~BC_ProgressWindow()
 int BC_ProgressWindow::create_objects(const char *text, int64_t length)
 {
        int x = 10, y = 10;
 int BC_ProgressWindow::create_objects(const char *text, int64_t length)
 {
        int x = 10, y = 10;

-
+       lock_window("BC_ProgressWindow::create_objects");

 // Recalculate width based on text
        if(text)
        {
 // Recalculate width based on text
        if(text)
        {


@@ -151,7 +151,7 @@ int BC_ProgressWindow::create_objects(const char *text, int64_t length)
        add_tool(bar = new BC_ProgressBar(x, y, get_w() - 20, length));
        add_tool(new BC_CancelButton(this));
        show_window(1);
        add_tool(bar = new BC_ProgressBar(x, y, get_w() - 20, length));
        add_tool(new BC_CancelButton(this));
        show_window(1);

-
+       unlock_window();

        return 0;
 }
 
        return 0;
 }
 

diff --git a/cinelerra-5.1/guicast/bctrace.C b/cinelerra-5.1/guicast/bctrace.C
index 027379bcad5faf867cb2d0e0d6acc32da51ba5d3..930eabfc50f6bf562969812b3810c664e6782c75 100644 (file)
--- a/cinelerra-5.1/guicast/bctrace.C
+++ b/cinelerra-5.1/guicast/bctrace.C
@@ -5,6 +5,21 @@
 
 #include "bctrace.h"
 
 
 #include "bctrace.h"
 

+#ifdef BOOBY
+#include <execinfo.h>
+#define BT_BUF_SIZE 100
+// booby trap (backtrace)
+void booby() {
+       printf("BOOBY!\n"); 
+       void *buffer[BT_BUF_SIZE];
+       int nptrs = backtrace(buffer, BT_BUF_SIZE);
+       char **trace = backtrace_symbols(buffer, nptrs);
+       if( !trace ) return;
+       for( int i=0; i<nptrs; ) printf("%s\n", trace[i++]);
+       free(trace);
+}
+#endif
+

 BC_Trace *BC_Trace::global_trace = 0;
 int trace_memory = 0;
 int trace_locks = 1;
 BC_Trace *BC_Trace::global_trace = 0;
 int trace_memory = 0;
 int trace_locks = 1;

diff --git a/cinelerra-5.1/guicast/bctrace.h b/cinelerra-5.1/guicast/bctrace.h
index 8cf58285553d9ef8887d458e7e1e475c1faed4b6..51dafd7466bf4ca6174636a9340a1a948b68c791 100644 (file)
--- a/cinelerra-5.1/guicast/bctrace.h
+++ b/cinelerra-5.1/guicast/bctrace.h
@@ -8,6 +8,12 @@
 #include "cstrdup.h"
 #include <pthread.h>
 
 #include "cstrdup.h"
 #include <pthread.h>
 

+#ifdef BOOBY
+#define BT if( top_level->display_lock_owner != pthread_self() ) booby();
+void booby();
+#else
+#define BT
+#endif

 
 class BC_Trace
 {
 
 class BC_Trace
 {

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 24dc5872e0e3ee426b504bffd009a9c305ede949..db085e863655fc86bc011af6c875b825a7d9d43a 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -390,12 +390,8 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title
 #endif
 
        id = get_resources()->get_id();
 #endif
 
        id = get_resources()->get_id();

-       int need_lock = 0;

        if(parent_window) top_level = parent_window->top_level;
        if(parent_window) top_level = parent_window->top_level;

-       if( top_level ) { // need this to avoid deadlock with Xlib's locks
-               need_lock = 1;
-               lock_window("BC_WindowBase::create_window");
-       }
+       if( top_level ) lock_window("BC_WindowBase::create_window");

        get_resources()->create_window_lock->lock("BC_WindowBase::create_window");
 
 #ifdef HAVE_LIBXXF86VM
        get_resources()->create_window_lock->lock("BC_WindowBase::create_window");
 
 #ifdef HAVE_LIBXXF86VM


@@ -445,6 +441,7 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title
                if( shm_completion_event < 0 ) shm_completion_event =
                        ShmCompletion + XShmGetEventBase(display);
 #endif
                if( shm_completion_event < 0 ) shm_completion_event =
                        ShmCompletion + XShmGetEventBase(display);
 #endif

+               lock_window("BC_WindowBase::create_window 1");

 
                screen = DefaultScreen(display);
                rootwin = RootWindow(display, screen);
 
                screen = DefaultScreen(display);
                rootwin = RootWindow(display, screen);


@@ -638,7 +635,7 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title
                if(!hidden) show_window();
        }
        get_resources()->create_window_lock->unlock();
                if(!hidden) show_window();
        }
        get_resources()->create_window_lock->unlock();

-       if(need_lock) unlock_window();
+       unlock_window();

 
        return 0;
 }
 
        return 0;
 }

diff --git a/cinelerra-5.1/guicast/bcwindowdraw.C b/cinelerra-5.1/guicast/bcwindowdraw.C
index 5f0bb48cb1a5e2b45ff1da0a40712dd861a05551..c81c36963223fa2b91e6ef3faeaaeff3ba71386e 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowdraw.C
+++ b/cinelerra-5.1/guicast/bcwindowdraw.C
@@ -29,6 +29,7 @@
 #include "bcwindowbase.h"
 #include "clip.h"
 #include "bccolors.h"
 #include "bcwindowbase.h"
 #include "clip.h"
 #include "bccolors.h"

+#include "bctrace.h"

 #include "cursors.h"
 #include "fonts.h"
 #include "vframe.h"
 #include "cursors.h"
 #include "fonts.h"
 #include "vframe.h"


@@ -38,7 +39,7 @@
 #include "workarounds.h"
 
 void BC_WindowBase::copy_area(int x1, int y1, int x2, int y2, int w, int h, BC_Pixmap *pixmap)
 #include "workarounds.h"
 
 void BC_WindowBase::copy_area(int x1, int y1, int x2, int y2, int w, int h, BC_Pixmap *pixmap)

-{
+{ BT

        XCopyArea(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
        XCopyArea(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,


@@ -47,7 +48,7 @@ void BC_WindowBase::copy_area(int x1, int y1, int x2, int y2, int w, int h, BC_P
 
 
 void BC_WindowBase::draw_box(int x, int y, int w, int h, BC_Pixmap *pixmap)
 
 
 void BC_WindowBase::draw_box(int x, int y, int w, int h, BC_Pixmap *pixmap)

-{
+{ BT

 //if(x == 0) printf("BC_WindowBase::draw_box %d %d %d %d\n", x, y, w, h);
        XFillRectangle(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
 //if(x == 0) printf("BC_WindowBase::draw_box %d %d %d %d\n", x, y, w, h);
        XFillRectangle(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,


@@ -56,7 +57,7 @@ void BC_WindowBase::draw_box(int x, int y, int w, int h, BC_Pixmap *pixmap)
 
 
 void BC_WindowBase::draw_circle(int x, int y, int w, int h, BC_Pixmap *pixmap)
 
 
 void BC_WindowBase::draw_circle(int x, int y, int w, int h, BC_Pixmap *pixmap)

-{
+{ BT

        XDrawArc(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc, x, y, (w - 1), (h - 2), 0 * 64, 360 * 64);
        XDrawArc(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc, x, y, (w - 1), (h - 2), 0 * 64, 360 * 64);


@@ -64,7 +65,7 @@ void BC_WindowBase::draw_circle(int x, int y, int w, int h, BC_Pixmap *pixmap)
 
 void BC_WindowBase::draw_arc(int x, int y, int w, int h,
        int start_angle, int angle_length, BC_Pixmap *pixmap)
 
 void BC_WindowBase::draw_arc(int x, int y, int w, int h,
        int start_angle, int angle_length, BC_Pixmap *pixmap)

-{
+{ BT

        XDrawArc(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc, x, y, (w - 1), (h - 2), start_angle * 64,
        XDrawArc(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc, x, y, (w - 1), (h - 2), start_angle * 64,


@@ -72,14 +73,14 @@ void BC_WindowBase::draw_arc(int x, int y, int w, int h,
 }
 
 void BC_WindowBase::draw_disc(int x, int y, int w, int h, BC_Pixmap *pixmap)
 }
 
 void BC_WindowBase::draw_disc(int x, int y, int w, int h, BC_Pixmap *pixmap)

-{
+{ BT

        XFillArc(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc, x, y, (w - 1), (h - 2), 0 * 64, 360 * 64);
 }
 
 void BC_WindowBase::clear_box(int x, int y, int w, int h, BC_Pixmap *pixmap)
        XFillArc(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc, x, y, (w - 1), (h - 2), 0 * 64, 360 * 64);
 }
 
 void BC_WindowBase::clear_box(int x, int y, int w, int h, BC_Pixmap *pixmap)

-{
+{ BT

        set_color(bg_color);
        Pixmap xpixmap = pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap;
        XFillRectangle(top_level->display, xpixmap, top_level->gc, x, y, w, h);
        set_color(bg_color);
        Pixmap xpixmap = pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap;
        XFillRectangle(top_level->display, xpixmap, top_level->gc, x, y, w, h);


@@ -94,6 +95,7 @@ void BC_WindowBase::draw_text_line(int x, int y, const char *text, int len,
                return;
        }
 #endif
                return;
        }
 #endif

+ BT

        Pixmap xpixmap = pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap;
        if( get_resources()->use_fontset ) {
                XFontSet fontset = top_level->get_curr_fontset();
        Pixmap xpixmap = pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap;
        if( get_resources()->use_fontset ) {
                XFontSet fontset = top_level->get_curr_fontset();


@@ -147,7 +149,7 @@ void BC_WindowBase::draw_text(int x, int y, const char *text, int length,
                        draw_xft_text(x, y, text, length, pixmap);
                        return;
                }
                        draw_xft_text(x, y, text, length, pixmap);
                        return;
                }

-
+ BT

                for(int i = 0, j = 0; i <= length; i++) {
                        if(text[i] == '\n' || text[i] == 0) {
                                if(get_resources()->use_fontset && top_level->get_curr_fontset()) {
                for(int i = 0, j = 0; i <= length; i++) {
                        if(text[i] == '\n' || text[i] == 0) {
                                if(get_resources()->use_fontset && top_level->get_curr_fontset()) {


@@ -184,7 +186,7 @@ void BC_WindowBase::draw_utf8_text(int x, int y,
                        1);
                return;
        }
                        1);
                return;
        }

-
+ BT

        for(int i = 0, j = 0; i <= length; i++)
        {
                if(text[i] == '\n' || text[i] == 0)
        for(int i = 0, j = 0; i <= length; i++)
        {
                if(text[i] == '\n' || text[i] == 0)


@@ -250,7 +252,7 @@ void BC_WindowBase::draw_xft_text(int x, int y,
 
 void BC_WindowBase::xft_draw_string(XftColor *xft_color, XftFont *xft_font,
                int x, int y, const FcChar32 *fc, int len, BC_Pixmap *pixmap)
 
 void BC_WindowBase::xft_draw_string(XftColor *xft_color, XftFont *xft_font,
                int x, int y, const FcChar32 *fc, int len, BC_Pixmap *pixmap)

-{
+{ BT

        Pixmap draw_pixmap = 0;
        XftDraw *xft_draw = (XftDraw *)
                (pixmap ? pixmap->opaque_xft_draw : this->pixmap->opaque_xft_draw);
        Pixmap draw_pixmap = 0;
        XftDraw *xft_draw = (XftDraw *)
                (pixmap ? pixmap->opaque_xft_draw : this->pixmap->opaque_xft_draw);


@@ -295,6 +297,7 @@ int BC_WindowBase::draw_single_text(int draw, int font,
        if( !length ) return 0;
 
        if( !get_resources()->use_xft ) {
        if( !length ) return 0;
 
        if( !get_resources()->use_xft ) {

+ BT

                if( !get_font_struct(font) ) return 0;
                XChar2b xtext[length], *xp = xtext;
                for( int i=0; i<length; ++i,++xp ) {
                if( !get_font_struct(font) ) return 0;
                XChar2b xtext[length], *xp = xtext;
                for( int i=0; i<length; ++i,++xp ) {


@@ -437,7 +440,7 @@ void BC_WindowBase::draw_center_text(int x, int y, const char *text, int length)
 }
 
 void BC_WindowBase::draw_line(int x1, int y1, int x2, int y2, BC_Pixmap *pixmap)
 }
 
 void BC_WindowBase::draw_line(int x1, int y1, int x2, int y2, BC_Pixmap *pixmap)

-{
+{ BT

 // Some X drivers can't draw 0 length lines
        if(x1 == x2 && y1 == y2)
        {
 // Some X drivers can't draw 0 length lines
        if(x1 == x2 && y1 == y2)
        {


@@ -456,7 +459,7 @@ void BC_WindowBase::draw_line(int x1, int y1, int x2, int y2, BC_Pixmap *pixmap)
 }
 
 void BC_WindowBase::draw_polygon(ArrayList<int> *x, ArrayList<int> *y, BC_Pixmap *pixmap)
 }
 
 void BC_WindowBase::draw_polygon(ArrayList<int> *x, ArrayList<int> *y, BC_Pixmap *pixmap)

-{
+{ BT

        int npoints = MIN(x->total, y->total);
        XPoint *points = new XPoint[npoints];
 
        int npoints = MIN(x->total, y->total);
        XPoint *points = new XPoint[npoints];
 


@@ -477,7 +480,7 @@ void BC_WindowBase::draw_polygon(ArrayList<int> *x, ArrayList<int> *y, BC_Pixmap
 }
 
 void BC_WindowBase::fill_polygon(ArrayList<int> *x, ArrayList<int> *y, BC_Pixmap *pixmap)
 }
 
 void BC_WindowBase::fill_polygon(ArrayList<int> *x, ArrayList<int> *y, BC_Pixmap *pixmap)

-{
+{ BT

        int npoints = MIN(x->total, y->total);
        XPoint *points = new XPoint[npoints];
 
        int npoints = MIN(x->total, y->total);
        XPoint *points = new XPoint[npoints];
 


@@ -500,7 +503,7 @@ void BC_WindowBase::fill_polygon(ArrayList<int> *x, ArrayList<int> *y, BC_Pixmap
 
 
 void BC_WindowBase::draw_rectangle(int x, int y, int w, int h)
 
 
 void BC_WindowBase::draw_rectangle(int x, int y, int w, int h)

-{
+{ BT

        XDrawRectangle(top_level->display,
                pixmap->opaque_pixmap,
                top_level->gc,
        XDrawRectangle(top_level->display,
                pixmap->opaque_pixmap,
                top_level->gc,


@@ -668,7 +671,7 @@ void BC_WindowBase::draw_border(char *text, int x, int y, int w, int h)
 }
 
 void BC_WindowBase::draw_triangle_down_flat(int x, int y, int w, int h)
 }
 
 void BC_WindowBase::draw_triangle_down_flat(int x, int y, int w, int h)

-{
+{ BT

        int x1, y1, x2, y2, x3;
        XPoint point[3];
 
        int x1, y1, x2, y2, x3;
        XPoint point[3];
 


@@ -689,7 +692,7 @@ void BC_WindowBase::draw_triangle_down_flat(int x, int y, int w, int h)
 
 void BC_WindowBase::draw_triangle_up(int x, int y, int w, int h,
        int light1, int light2, int middle, int shadow1, int shadow2)
 
 void BC_WindowBase::draw_triangle_up(int x, int y, int w, int h,
        int light1, int light2, int middle, int shadow1, int shadow2)

-{
+{ BT

        int x1, y1, x2, y2, x3;
        XPoint point[3];
 
        int x1, y1, x2, y2, x3;
        XPoint point[3];
 


@@ -762,7 +765,7 @@ void BC_WindowBase::draw_triangle_down(int x, int y, int w, int h,
 
 void BC_WindowBase::draw_triangle_left(int x, int y, int w, int h,
        int light1, int light2, int middle, int shadow1, int shadow2)
 
 void BC_WindowBase::draw_triangle_left(int x, int y, int w, int h,
        int light1, int light2, int middle, int shadow1, int shadow2)

-{
+{ BT

        int x1, y1, x2, y2, y3;
        XPoint point[3];
 
        int x1, y1, x2, y2, y3;
        XPoint point[3];
 


@@ -799,7 +802,7 @@ void BC_WindowBase::draw_triangle_left(int x, int y, int w, int h,
 
 void BC_WindowBase::draw_triangle_right(int x, int y, int w, int h,
        int light1, int light2, int middle, int shadow1, int shadow2)
 
 void BC_WindowBase::draw_triangle_right(int x, int y, int w, int h,
        int light1, int light2, int middle, int shadow1, int shadow2)

-{
+{ BT

        int x1, y1, x2, y2, y3;
        XPoint point[3];
 
        int x1, y1, x2, y2, y3;
        XPoint point[3];
 


@@ -847,7 +850,7 @@ void BC_WindowBase::draw_check(int x, int y)
 }
 
 void BC_WindowBase::draw_tiles(BC_Pixmap *tile, int origin_x, int origin_y, int x, int y, int w, int h)
 }
 
 void BC_WindowBase::draw_tiles(BC_Pixmap *tile, int origin_x, int origin_y, int x, int y, int w, int h)

-{
+{ BT

        if(!tile)
        {
                set_color(bg_color);
        if(!tile)
        {
                set_color(bg_color);


@@ -865,7 +868,7 @@ void BC_WindowBase::draw_tiles(BC_Pixmap *tile, int origin_x, int origin_y, int
 }
 
 void BC_WindowBase::draw_top_tiles(BC_WindowBase *parent_window, int x, int y, int w, int h)
 }
 
 void BC_WindowBase::draw_top_tiles(BC_WindowBase *parent_window, int x, int y, int w, int h)

-{
+{ BT

        Window tempwin;
        int origin_x, origin_y;
        XTranslateCoordinates(top_level->display,
        Window tempwin;
        int origin_x, origin_y;
        XTranslateCoordinates(top_level->display,


@@ -892,7 +895,7 @@ void BC_WindowBase::draw_top_background(BC_WindowBase *parent_window,
        int w,
        int h,
        BC_Pixmap *pixmap)
        int w,
        int h,
        BC_Pixmap *pixmap)

-{
+{ BT

        Window tempwin;
        int top_x, top_y;
        XLockDisplay(top_level->display);
        Window tempwin;
        int top_x, top_y;
        XLockDisplay(top_level->display);


@@ -943,8 +946,7 @@ void BC_WindowBase::draw_bitmap(BC_Bitmap *bitmap,
        int src_w,
        int src_h,
        BC_Pixmap *pixmap)
        int src_w,
        int src_h,
        BC_Pixmap *pixmap)

-{
-
+{ BT

 // Hide cursor if video enabled
        update_video_cursor();
 
 // Hide cursor if video enabled
        update_video_cursor();
 


@@ -1002,7 +1004,7 @@ void BC_WindowBase::draw_bitmap(BC_Bitmap *bitmap,
 
 
 void BC_WindowBase::draw_pixel(int x, int y, BC_Pixmap *pixmap)
 
 
 void BC_WindowBase::draw_pixel(int x, int y, BC_Pixmap *pixmap)

-{
+{ BT

        XDrawPoint(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc,
        XDrawPoint(top_level->display,
                pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
                top_level->gc,


@@ -1019,7 +1021,7 @@ void BC_WindowBase::draw_pixmap(BC_Pixmap *pixmap,
        int src_x,
        int src_y,
        BC_Pixmap *dst)
        int src_x,
        int src_y,
        BC_Pixmap *dst)

-{
+{ BT

        pixmap->write_drawable(dst ? dst->opaque_pixmap : this->pixmap->opaque_pixmap,
                        dest_x,
                        dest_y,
        pixmap->write_drawable(dst ? dst->opaque_pixmap : this->pixmap->opaque_pixmap,
                        dest_x,
                        dest_y,


@@ -1102,7 +1104,7 @@ void BC_WindowBase::draw_tooltip(const char *text)
 }
 
 void BC_WindowBase::slide_left(int distance)
 }
 
 void BC_WindowBase::slide_left(int distance)

-{
+{ BT

        if(distance < w)
        {
                XCopyArea(top_level->display,
        if(distance < w)
        {
                XCopyArea(top_level->display,


@@ -1119,7 +1121,7 @@ void BC_WindowBase::slide_left(int distance)
 }
 
 void BC_WindowBase::slide_right(int distance)
 }
 
 void BC_WindowBase::slide_right(int distance)

-{
+{ BT

        if(distance < w)
        {
                XCopyArea(top_level->display,
        if(distance < w)
        {
                XCopyArea(top_level->display,


@@ -1136,7 +1138,7 @@ void BC_WindowBase::slide_right(int distance)
 }
 
 void BC_WindowBase::slide_up(int distance)
 }
 
 void BC_WindowBase::slide_up(int distance)

-{
+{ BT

        if(distance < h)
        {
                XCopyArea(top_level->display,
        if(distance < h)
        {
                XCopyArea(top_level->display,


@@ -1161,7 +1163,7 @@ void BC_WindowBase::slide_up(int distance)
 }
 
 void BC_WindowBase::slide_down(int distance)
 }
 
 void BC_WindowBase::slide_down(int distance)

-{
+{ BT

        if(distance < h)
        {
                XCopyArea(top_level->display,
        if(distance < h)
        {
                XCopyArea(top_level->display,

diff --git a/cinelerra-5.1/guicast/errorbox.C b/cinelerra-5.1/guicast/errorbox.C
index ed3749266a46d56d1695110d1fda91af327e969c..91504d2392c8c938196cbe6abd0636a9a47ee14b 100644 (file)
--- a/cinelerra-5.1/guicast/errorbox.C
+++ b/cinelerra-5.1/guicast/errorbox.C
@@ -30,8 +30,9 @@ ErrorBox::~ErrorBox()
 {
 }
 
 {
 }
 

-int ErrorBox::create_objects(const char *text)
+void ErrorBox::create_objects(const char *text)

 {
 {

+       lock_window("ErrorBox::create_objects");

        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(get_w() / 2,
        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(get_w() / 2,


@@ -44,5 +45,5 @@ int ErrorBox::create_objects(const char *text)
        y = get_h() - 50;
        add_tool(new BC_OKButton(x, y));
        show_window(1);
        y = get_h() - 50;
        add_tool(new BC_OKButton(x, y));
        show_window(1);

-       return 0;
+       unlock_window();

 }
 }

diff --git a/cinelerra-5.1/guicast/errorbox.h b/cinelerra-5.1/guicast/errorbox.h
index 578a3db1dd71241c449b2f650b3d756caed70979..96efa72e08fa583771ac62a9763af0eda81a913a 100644 (file)
--- a/cinelerra-5.1/guicast/errorbox.h
+++ b/cinelerra-5.1/guicast/errorbox.h
@@ -34,7 +34,7 @@ public:
                int h = 120);
        virtual ~ErrorBox();
 
                int h = 120);
        virtual ~ErrorBox();
 

-       int create_objects(const char *text);
+       void create_objects(const char *text);

 };
 
 #endif
 };
 
 #endif

diff --git a/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C b/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C
index 32ac6781556606c302a950ea80eadfe4764f86e1..10692ce465bccd1ce0a81611e1fea6a91490d458 100644 (file)
--- a/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C
+++ b/cinelerra-5.1/plugins/bluebanana/bluebananawindow.C
@@ -2478,6 +2478,7 @@ int BluebananaWindow::repeat_event(int64_t d){
     if(config_consume!=config_produce)
       flush_config_change();
   }
     if(config_consume!=config_produce)
       flush_config_change();
   }

+  if(!plugin->server->plugin) return 0;

   if(!plugin->server->plugin->on) return 0;
   if(d==207){
 
   if(!plugin->server->plugin->on) return 0;
   if(d==207){
 

diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
index c6bbc6e67bec24c3d61d5f4709fc14ae761a0a99..90dfa4ee46650f7b464070e058329f165c6174b9 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
@@ -622,12 +622,19 @@ void BlondTheme::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_down.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_up.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blond/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index 0ee14d330ca7716e533a18cb9aa12a16cac58d31..fc9c629fcfbffd1d08b24075089de2f4fde89929 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@ -642,12 +642,19 @@ void BlondCVTheme::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",


@@ -911,7 +918,7 @@ void BlondCVTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 {
        mbuttons_x = 0;
        mbuttons_y = gui->mainmenu->get_h();
 {
        mbuttons_x = 0;
        mbuttons_y = gui->mainmenu->get_h();

-       mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2);
+       mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2);

        mbuttons_h = get_image("mbutton_bg")->get_h();
        mclock_x = 10;
        mclock_y = mbuttons_y + mbuttons_h + CWINDOW_METER_MARGIN;
        mbuttons_h = get_image("mbutton_bg")->get_h();
        mclock_x = 10;
        mclock_y = mbuttons_y + mbuttons_h + CWINDOW_METER_MARGIN;

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_down.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
index 6bad18b8c9552c7fa0a23d7ef70608ac41dad2b7..a013cbda5076418f2ac94c9da1ea6d35b40ab706 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C
+++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
@@ -622,12 +622,19 @@ void BlueDotTheme::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_down.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_up.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blue/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
index 2915dc0b9fb595b0c9bde50fa8bb82f20330a79d..0725792904b45ea4e40aa7a741de15ceff1c01ee 100644 (file)
--- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
+++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
@@ -667,12 +667,19 @@ void BlueDotTheme::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",


@@ -952,7 +959,7 @@ void BlueDotTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
 // Position of menu buttons (start, stop, ff, etc.)
        mbuttons_x = 0;
        mbuttons_y = gui->mainmenu->get_h();
 // Position of menu buttons (start, stop, ff, etc.)
        mbuttons_x = 0;
        mbuttons_y = gui->mainmenu->get_h();

-       mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2);
+       mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_p_toggle[0]->get_w()+2);

        mbuttons_h = get_image("mbutton_left")->get_h();
        mclock_x = 20;          //x position of digits in clock window
        mclock_y = mbuttons_y + 1 + mbuttons_h + CWINDOW_METER_MARGIN;
        mbuttons_h = get_image("mbutton_left")->get_h();
        mclock_x = 20;          //x position of digits in clock window
        mclock_y = mbuttons_y + 1 + mbuttons_h + CWINDOW_METER_MARGIN;

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_down.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
index 5d34edff596437d470d9c435f1367374404ca7d8..d1f873ac72b4e3a72430092b37fb3bf6bb7b17a0 100644 (file)
--- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C
+++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
@@ -628,12 +628,19 @@ void BrightTheme::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_bright/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_bright/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_down.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_bright/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_bright/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_up.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_bright/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_bright/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_bright/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_down.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_up.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_hulk/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index fffc6b45de013392095957244ddf4bd1e88bb420..25d2071bb621cbd0606e25a22ef0ada355c72fbe 100644 (file)
--- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@ -623,12 +623,19 @@ void HULKTHEME::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_down.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_pinklady/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
index 73adc37b64c1d95df653af269e9261f102891a3a..45189e10362d8b6138d0d5b2034bd4233f2050a6 100644 (file)
--- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
+++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
@@ -608,12 +608,19 @@ void PINKLADY::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_suv/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_suv/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_down.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_suv/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_suv/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_up.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_suv/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_suv/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_suv/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C
index 876e3ab296bde2b3661f95f930d88d8526d89b2c..52cd48221f1eba772f4c08bfc011cb9303b49112 100644 (file)
--- a/cinelerra-5.1/plugins/theme_suv/suv.C
+++ b/cinelerra-5.1/plugins/theme_suv/suv.C
@@ -609,12 +609,19 @@ void SUV::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkd.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkd.png
deleted file mode 100644 (file)
index 98430bc..0000000
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkd.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkdhi.png
deleted file mode 100644 (file)
index cecf416..0000000
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/proxy_chkdhi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_down.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_down.png
deleted file mode 100644 (file)
index e909005..0000000
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/proxy_down.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_hi.png
deleted file mode 100644 (file)
index 8c00e10..0000000
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/proxy_hi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkd.png
new file mode 100644 (file)
index 0000000..7b87034
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkdhi.png
new file mode 100644 (file)
index 0000000..5fbec07
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_down.png
new file mode 100644 (file)
index 0000000..c64068f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_hi.png
new file mode 100644 (file)
index 0000000..8e09880
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_up.png
new file mode 100644 (file)
index 0000000..1e8d257
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_uphi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_uphi.png
new file mode 100644 (file)
index 0000000..20e152e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_p_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkd.png
new file mode 100644 (file)
index 0000000..d8e4a2b
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkd.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkdhi.png
new file mode 100644 (file)
index 0000000..356d5c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_chkdhi.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_down.png
new file mode 100644 (file)
index 0000000..919ec08
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_down.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_hi.png
new file mode 100644 (file)
index 0000000..7ed4e66
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_hi.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_up.png
new file mode 100644 (file)
index 0000000..293360f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_up.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_uphi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_uphi.png
new file mode 100644 (file)
index 0000000..cac1aa3
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/proxy_s_uphi.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_up.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_up.png
deleted file mode 100644 (file)
index 042fdde..0000000
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/proxy_up.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/proxy_uphi.png b/cinelerra-5.1/plugins/theme_unflat/data/proxy_uphi.png
deleted file mode 100644 (file)
index 5022c25..0000000
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/proxy_uphi.png and /dev/null differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index 7ef924e91d9ab8c76c73dcccf6bf4b1c56547cbb..5a72f3e754230ee6fb85ad713a05cd0dabeed465 100644 (file)
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -617,12 +617,19 @@ void UNFLATTHEME::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
                "ff_down.png",
                "ff_checkedhi.png");
 

-       proxy_toggle = new_image_set(5,
-               "proxy_up.png",
-               "proxy_hi.png",
-               "proxy_chkd.png",
-               "proxy_down.png",
-               "proxy_chkdhi.png");
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");

 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
 
        shbtn_data = new_image_set(3,
                "shbtn_up.png",