upgrade to ffmpeg-2.8

[goodguy/history.git] / cinelerra-5.0 / cinelerra / mwindow.C

diff --git a/cinelerra-5.0/cinelerra/mwindow.C b/cinelerra-5.0/cinelerra/mwindow.C
index 8fffe15fd88eab00d98ce7cfdcb28c59cf4e64d0..a53bd4c8c898c1bf18e8c9b17d67f5edd239e540 100644 (file)
--- a/cinelerra-5.0/cinelerra/mwindow.C
+++ b/cinelerra-5.0/cinelerra/mwindow.C
@@ -27,13 +27,14 @@
 #include "bcdisplayinfo.h"
 #include "bcsignals.h"
 #include "bctimer.h"
+#include "bdcreate.h"
 #include "brender.h"
 #include "cache.h"
 #include "channel.h"
 #include "channeldb.h"
 #include "channelinfo.h"
 #include "clip.h"
-#include "colormodels.h"
+#include "bccmodels.h"
 #include "commercials.h"
 #include "cplayback.h"
 #include "ctimebar.h"
@@ -41,6 +42,7 @@
 #include "cwindow.h"
 #include "bchash.h"
 #include "devicedvbinput.inc"
+#include "dvdcreate.h"
 #include "editpanel.h"
 #include "edl.h"
 #include "edlsession.h"
@@ -192,6 +194,7 @@ MWindow::MWindow()
        plugin_guis = 0;
        dead_plugins = 0;
        keyframe_threads = 0;
+       create_bd = 0;
        create_dvd = 0;
        batch_render = 0;
        render = 0;
@@ -222,6 +225,7 @@ MWindow::~MWindow()
        brender_lock->lock("MWindow::quit");
        delete brender;         brender = 0;
        brender_lock->unlock();
+       delete create_bd;       create_bd = 0;
        delete create_dvd;      create_dvd = 0;
        delete batch_render;    batch_render = 0;
        commit_commercial();
@@ -800,25 +804,25 @@ void MWindow::init_channeldb()
 void MWindow::init_menus()
 {
        char string[BCTEXTLEN];
-       cmodel_to_text(string, BC_RGB888);
+       BC_CModels::to_text(string, BC_RGB888);
        colormodels.append(new ColormodelItem(string, BC_RGB888));
-       cmodel_to_text(string, BC_RGBA8888);
+       BC_CModels::to_text(string, BC_RGBA8888);
        colormodels.append(new ColormodelItem(string, BC_RGBA8888));
-//     cmodel_to_text(string, BC_RGB161616);
+//     BC_CModels::to_text(string, BC_RGB161616);
 //     colormodels.append(new ColormodelItem(string, BC_RGB161616));
-//     cmodel_to_text(string, BC_RGBA16161616);
+//     BC_CModels::to_text(string, BC_RGBA16161616);
 //     colormodels.append(new ColormodelItem(string, BC_RGBA16161616));
-       cmodel_to_text(string, BC_RGB_FLOAT);
+       BC_CModels::to_text(string, BC_RGB_FLOAT);
        colormodels.append(new ColormodelItem(string, BC_RGB_FLOAT));
-       cmodel_to_text(string, BC_RGBA_FLOAT);
+       BC_CModels::to_text(string, BC_RGBA_FLOAT);
        colormodels.append(new ColormodelItem(string, BC_RGBA_FLOAT));
-       cmodel_to_text(string, BC_YUV888);
+       BC_CModels::to_text(string, BC_YUV888);
        colormodels.append(new ColormodelItem(string, BC_YUV888));
-       cmodel_to_text(string, BC_YUVA8888);
+       BC_CModels::to_text(string, BC_YUVA8888);
        colormodels.append(new ColormodelItem(string, BC_YUVA8888));
-//     cmodel_to_text(string, BC_YUV161616);
+//     BC_CModels::to_text(string, BC_YUV161616);
 //     colormodels.append(new ColormodelItem(string, BC_YUV161616));
-//     cmodel_to_text(string, BC_YUVA16161616);
+//     BC_CModels::to_text(string, BC_YUVA16161616);
 //     colormodels.append(new ColormodelItem(string, BC_YUVA16161616));
 }
 
@@ -847,6 +851,7 @@ ENABLE_BUFFER
 void MWindow::init_render()
 {
        render = new Render(this);
+       create_bd = new CreateBD_Thread(this);
        create_dvd = new CreateDVD_Thread(this);
        batch_render = new BatchRenderThread(this);
 }
@@ -1990,6 +1995,7 @@ int MWindow::set_editing_mode(int new_editing_mode, int lock_mwindow, int lock_c
 
 void MWindow::sync_parameters(int change_type)
 {
+       if( in_destructor ) return;
 
 // Sync engines which are playing back
        if(cwindow->playback_engine->is_playing_back)