X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=6b45541b3f32530e220213818f8d9cb34fcda1ee;hb=4b91e8a72deb0be3437ef0edd745646e525534d4;hp=4884c641fa4383242efe4f63a9ddb7f6c4381343;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 4884c641..6b45541b 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -461,6 +461,33 @@ void MWindow::init_defaults(BC_Hash* &defaults, char *config_path)
 	defaults->load();
 }
 
+
+void MWindow::check_language()
+{
+	char curr_lang[BCTEXTLEN]; curr_lang[0] = 0;
+	const char *env_lang = getenv("LANGUAGE");
+	if( !env_lang ) env_lang = getenv("LC_ALL");
+	if( !env_lang ) env_lang = getenv("LANG");
+	if( !env_lang ) {
+		snprintf(curr_lang, sizeof(curr_lang), "%s-%s.%s",
+			BC_Resources::language, BC_Resources::region, BC_Resources::encoding);
+		env_lang = curr_lang;
+	}
+	char last_lang[BCTEXTLEN]; last_lang[0] = 0;
+	defaults->get("LAST_LANG",last_lang);
+	if( strcmp(env_lang,last_lang)) {
+		printf("lang changed from '%s' to '%s'\n", last_lang, env_lang);
+		defaults->update("LAST_LANG",env_lang);
+		char plugin_path[BCTEXTLEN];
+		create_defaults_path(plugin_path, PLUGIN_FILE);
+		::remove(plugin_path);
+		char ladspa_path[BCTEXTLEN];
+		create_defaults_path(ladspa_path, LADSPA_FILE);
+		::remove(ladspa_path);
+		defaults->save();
+	}
+}
+
 void MWindow::get_plugin_path(char *path, const char *plug_dir, const char *fs_path)
 {
 	char *base_path = FileSystem::basepath(fs_path), *bp = base_path;
@@ -599,6 +626,7 @@ int MWindow::init_ladspa_plugins(MWindow *mwindow, Preferences *preferences)
 		len = !cp ? strlen(path) : cp-path;
 		char index_path[BCTEXTLEN], plugin_path[BCTEXTLEN];
 		memcpy(plugin_path, path, len);  plugin_path[len] = 0;
+		if( cp ) ++len;
 		char *plugin_dir = FileSystem::basepath(plugin_path);
 		strcpy(plugin_path, plugin_dir);  delete [] plugin_dir;
 		create_defaults_path(index_path, LADSPA_FILE);
@@ -785,7 +813,6 @@ void MWindow::init_preferences()
 	session->load_defaults(defaults);
 	// set x11_host, screens, window_config
 	screens = session->set_default_x11_host();
-	BC_Signals::set_trap_path("/tmp/cinelerra_%d.dmp");
 	BC_Signals::set_trap_hook(trap_hook, this);
 	BC_Signals::set_catch_segv(preferences->trap_sigsegv);
 	BC_Signals::set_catch_intr(preferences->trap_sigintr);
@@ -796,6 +823,7 @@ void MWindow::init_preferences()
 		BC_Trace::disable_locks();
 	}
 	BC_WindowBase::get_resources()->popupmenu_btnup = preferences->popupmenu_btnup;
+	BC_WindowBase::get_resources()->textbox_focus_policy = preferences->textbox_focus_policy;
 }
 
 void MWindow::clean_indexes()
@@ -1098,7 +1126,7 @@ void MWindow::init_gui()
 void MWindow::init_signals()
 {
 	sighandler = new SigHandler;
-	sighandler->initialize();
+	sighandler->initialize("/tmp/cinelerra_%d.dmp");
 ENABLE_BUFFER
 }
 
@@ -1891,6 +1919,7 @@ void MWindow::create_objects(int want_gui,
 	if(debug) PRINT_TRACE
 	default_standard = default_std();
 	init_defaults(defaults, config_path);
+	check_language();
 	init_preferences();
 	if(splash_window)
 		splash_window->operation->update(_("Initializing Plugins"));
@@ -2471,8 +2500,8 @@ SET_TRACE
 // Needs mwindow to do GUI
 			gui->set_mwindow(this);
 			gui->open_plugin(0, preferences, edl, plugin);
-			gui->show_gui();
 			plugin->show = 1;
+			gui->show_gui();
 		}
 	}
 	plugin_gui_lock->unlock();
@@ -3545,7 +3574,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 					next_edit = edit->next;
 					if( edit->channel != vstream ||
 					    !edit->asset || !edit->asset->is_asset ||
-					    *asset != *edit->asset )
+					    !asset->equivalent(*edit->asset,1,1,edl) )
 						delete edit;
 				}
 			}
@@ -3605,7 +3634,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 					next_edit = edit->next;
 					if( !((1<<edit->channel) & channel_mask) ||
 					    !edit->asset || !edit->asset->is_asset ||
-					    *asset != *edit->asset )
+					    !asset->equivalent(*edit->asset,1,1,edl) )
 						delete edit;
 				}
 				if( !track->edits->first )