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

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

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()
 {
+       lock_window("ChannelEditWindow::create_objects");
        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();
+       unlock_window();
 }
 
 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"),
-       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()
 {
+       lock_window("ConfirmScan::create_objects");
        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();
+       unlock_window();
 }
 
-
-
-
-
-
-
 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),
-       390,
-       300,
-       390,
-       300,
-       0,
-       0,
-       1)
+       390, 300, 390, 300, 0, 0, 1)
 {
        this->channel_picker = channel_picker;
        this->window = window;
@@ -1011,8 +985,10 @@ ChannelEditEditWindow::ChannelEditEditWindow(ChannelEditEditThread *thread,
 ChannelEditEditWindow::~ChannelEditEditWindow()
 {
 }
+
 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;
@@ -1088,6 +1064,7 @@ void ChannelEditEditWindow::create_objects(Channel *channel)
        x += 200;
        add_subwindow(new BC_CancelButton(this));
        show_window();
+       unlock_window();
 }
 
 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,
-       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;
@@ -1504,6 +1479,7 @@ int ChannelEditPictureWindow::calculate_w(ChannelPicker *channel_picker)
 
 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;
@@ -1592,6 +1568,7 @@ void ChannelEditPictureWindow::create_objects()
        y += pad;
        add_subwindow(new BC_OKButton(this));
        show_window();
+       unlock_window();
 }
 
 int ChannelEditPictureWindow::translation_event()