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

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

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)
- : 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;
@@ -49,32 +42,16 @@ RecordWindow::~RecordWindow()
 //     delete loadmode;
 }
 
-
-
 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:")));
 
-//printf("RecordWindow::create_objects 1\n");
        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,
-                                       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
@@ -83,18 +60,12 @@ void RecordWindow::create_objects()
 //     loadmode->create_objects();
 
        add_subwindow(new BC_OKButton(this));
-//printf("RecordWindow::create_objects 1\n");
        add_subwindow(new BC_CancelButton(this));
-//printf("RecordWindow::create_objects 1\n");
        show_window();
+       unlock_window();
 }
 
 
-
-
-
-
-
 RecordToTracks::RecordToTracks(Record *record, int default_)
  : BC_CheckBox(200, 270, default_) { this->record = record; }
 RecordToTracks::~RecordToTracks()