batchrender hang on close, apply pref saves defaults, overwrite/splice tweaks, specif...

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

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 79ce0e3b53b4a7ddbbaa37a53caa35ee3be2a278..c65f99f21167bf5c15932b3cd44c4196638d3c5e 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -881,10 +881,25 @@ int MWindow::plugin_exists(char *plugin_path)
        return !plugindb ? 0 : plugin_exists(plugin_path, *plugindb);
 }
 
+void MWindow::remove_plugin_index()
+{
+       char index_path[BCTEXTLEN];
+       MWindow::create_defaults_path(index_path, PLUGIN_FILE);
+       ::remove(index_path);
+}
+
 void MWindow::init_preferences()
 {
        preferences = new Preferences;
        preferences->load_defaults(defaults);
+       const char *lv2_path = getenv("LV2_PATH");
+       if( lv2_path && strcmp(lv2_path, preferences->lv2_path) ) {
+               strncpy(preferences->lv2_path, lv2_path, sizeof(preferences->lv2_path));
+               remove_plugin_index();
+       }
+       else if( !lv2_path && preferences->lv2_path[0] ) {
+               File::setenv_path("LV2_PATH",preferences->lv2_path, 0);
+       }
        session = new MainSession(this);
        session->load_defaults(defaults);
        // set x11_host, screens, window_config
@@ -1613,37 +1628,49 @@ void MWindow::set_brender_active(int v, int update)
 
 int MWindow::has_commercials()
 {
+#ifdef HAVE_COMMERCIAL
        return theme->use_commercials;
+#else
+       return 0;
+#endif
 }
 
 void MWindow::init_commercials()
 {
+#ifdef HAVE_COMMERCIAL
        if( !commercials ) {
                commercials = new Commercials(this);
                commercial_active = 0;
        }
        else
                commercials->add_user();
+#endif
 }
 
 void MWindow::commit_commercial()
 {
+#ifdef HAVE_COMMERCIAL
        if( !commercial_active ) return;
        commercial_active = 0;
        if( !commercials ) return;
        commercials->commitDb();
+#endif
 }
 
 void MWindow::undo_commercial()
 {
+#ifdef HAVE_COMMERCIAL
        if( !commercial_active ) return;
        commercial_active = 0;
        if( !commercials ) return;
        commercials->undoDb();
+#endif
 }
 
 int MWindow::put_commercial()
 {
+       int result = 0;
+#ifdef HAVE_COMMERCIAL
        double start = edl->local_session->get_selectionstart();
        double end = edl->local_session->get_selectionend();
        if( start >= end ) return 0;
@@ -1651,7 +1678,6 @@ int MWindow::put_commercial()
        const char *errmsg = 0;
        int count = 0;
        Tracks *tracks = edl->tracks;
-       int result = 0;
        //check it
        for(Track *track=tracks->first; track && !errmsg; track=track->next) {
                if( track->data_type != TRACK_VIDEO ) continue;
@@ -1704,6 +1730,7 @@ int MWindow::put_commercial()
                undo_commercial();
                result = 1;
        }
+#endif
        return result;
 }