X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=0334fd0229b6a4d3c8fad1512a0536e09407170b;hb=9304882bd349ce15be054efb7cdcf69a0829f0f9;hp=de0f2ea51e776811843cacae41d2cb50224548b8;hpb=8b0d4fea3dbf5321d0688eb75f25be77f751d003;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index de0f2ea5..0334fd02 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -297,6 +297,9 @@ MWindow::~MWindow()
 #endif
 	reset_caches();
 	dead_plugins->remove_all_objects();
+// must delete theme before destroying plugindb
+//  theme destructor will be deleted by delete_plugins
+	delete theme;           theme = 0;
 	delete_plugins();
 	finit_error();
 	keyframe_threads->remove_all_objects();
@@ -325,7 +328,6 @@ MWindow::~MWindow()
 	delete defaults;        defaults = 0;
 	delete assets;          assets = 0;
 	delete splash_window;   splash_window = 0;
-//	delete theme;           theme = 0;	// deleted by delete_plugins
 	if( !edl->Garbage::remove_user() ) edl = 0;
 	delete channeldb_buz;
 	delete channeldb_v4l2jpeg;
@@ -733,6 +735,66 @@ void MWindow::add_plugins(ArrayList<PluginServer*> &plugins)
 	plugins.remove_all();
 }
 
+void MWindow::init_plugin_tips(ArrayList<PluginServer*> &plugins, const char *lang)
+{
+	const char *cfg_path = File::get_cindat_path();
+	char msg_path[BCTEXTLEN];  int txt = 0;
+	FILE *fp = 0;
+	if( BC_Resources::language[0] ) {
+		snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.%s",
+			cfg_path, lang);
+		fp = fopen(msg_path, "r");
+	}
+	if( !fp ) {
+		txt = 1;
+		snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.txt",
+			cfg_path);
+		fp = fopen(msg_path, "r");
+	}
+	if( !fp ) return;
+	char text[BCTEXTLEN];
+	char *tp = text, *ep = tp + sizeof(text)-1;
+	char title[BCTEXTLEN];
+	title[0] = 0;
+	int no = 0;
+	for(;;) {
+		++no;  int done = 1;
+		char line[BCTEXTLEN], *cp = line;
+		if( fgets(line,sizeof(line)-1,fp) ) {
+			if( *cp == '#' ) continue;
+			done = *cp == ' ' || *cp == '\t' ? 0 : -1;
+		}
+		if( done ) {
+			if( tp > text && *--tp == '\n' ) *tp = 0;
+			if( title[0] ) {
+				tp = !txt ? title : _(title);
+				int idx = plugins.size();
+				while( --idx>=0 && strcmp(plugins[idx]->title, tp) );
+				if( idx >= 0 ) {
+					delete [] plugins[idx]->tip;
+					plugins[idx]->tip = cstrdup(text);
+				}
+				title[0] = 0;
+			}
+			if( done > 0 ) break;
+			tp = text;  *tp = 0;
+			char *dp = strchr(cp, ':');
+			if( !dp ) {
+				printf("plugin tips: error on line %d\n", no);
+				continue;
+			}
+			char *bp = title;
+			while( cp < dp ) *bp++ = *cp++;
+			*bp = 0;
+			++cp;
+		}
+
+		while( *cp == ' ' || *cp == '\t' ) ++cp;
+		for( ; tp<ep && (*tp=*cp)!=0; ++tp,++cp );
+	}
+	fclose(fp);
+}
+
 void MWindow::delete_plugins()
 {
 	plugindb->remove_all_objects();
@@ -962,12 +1024,13 @@ void MWindow::init_theme()
 		fprintf(stderr, _("MWindow::init_theme: prefered theme %s not found.\n"),
 			 preferences->theme);
 
-	if( !theme_plugin && strcasecmp(preferences->theme, DEFAULT_THEME) ) {
+	const char *default_theme = _(DEFAULT_THEME);
+	if( !theme_plugin && strcasecmp(preferences->theme, default_theme) ) {
 		fprintf(stderr, _("MWindow::init_theme: trying default theme %s\n"),
-			DEFAULT_THEME);
+			default_theme);
 		for(int i = 0; i < plugindb->total && !theme_plugin; i++) {
 			if( plugindb->get(i)->theme &&
-			    !strcasecmp(DEFAULT_THEME, plugindb->get(i)->title) )
+			    !strcasecmp(default_theme, plugindb->get(i)->title) )
 				theme_plugin = plugindb->get(i);
 		}
 	}
@@ -1469,6 +1532,7 @@ SET_TRACE
 			case FILE_NOT_FOUND:
 				sprintf(string, _("Failed to open %s"), new_asset->path);
 				gui->show_message(string, theme->message_error);
+				gui->update_default_message();
 				break;
 
 // Unknown format
@@ -1665,10 +1729,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 					edl->session->autos_follow_edits);
 		}
 
-		paste_edls(&new_edls,
-			load_mode,
-			0,
-			-1,
+		paste_edls(&new_edls, load_mode, 0, -1,
 			edl->session->labels_follow_edits,
 			edl->session->plugins_follow_edits,
 			edl->session->autos_follow_edits,
@@ -1743,10 +1804,6 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 						show_plugin(plugin);
 					}
 				}
-				else
-				{
-					plugin->show = 0;
-				}
 
 				plugin = (Plugin*)plugin->next;
 			}
@@ -1952,6 +2009,7 @@ void MWindow::create_objects(int want_gui,
 	if(debug) PRINT_TRACE
 	init_ladspa_plugins(this, preferences);
 	if(debug) PRINT_TRACE
+	init_plugin_tips(*plugindb, cin_lang);
 	if(splash_window)
 		splash_window->operation->update(_("Initializing GUI"));
 	if(debug) PRINT_TRACE
@@ -1980,6 +2038,9 @@ void MWindow::create_objects(int want_gui,
 
 	Timer timer;
 
+	init_awindow();
+	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
+
 	init_compositor();
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
 
@@ -1991,24 +2052,21 @@ void MWindow::create_objects(int want_gui,
 	init_gui();
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
 
-	init_awindow();
-	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
-
 	init_levelwindow();
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
 
-	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
-
 	init_indexes();
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
 
 	init_channeldb();
-
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
+
 	init_gwindow();
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
+
 	init_render();
 	if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference());
+
 	init_brender();
 	init_exportedl();
 	init_commercials();
@@ -2892,7 +2950,7 @@ void MWindow::update_project(int load_mode)
 	const int debug = 0;
 
 	if(debug) PRINT_TRACE
-	restart_brender();
+	init_brender();
 	edl->tracks->update_y_pixels(theme);
 
 	if(debug) PRINT_TRACE
@@ -3557,7 +3615,8 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 	int result = file->open_file(preferences, asset, 1, 0);
 	if( !result && delete_tracks > 0 )
 		undo->update_undo_before();
-	if( !result && asset->video_data && asset->get_video_layers() > 0 ) {
+	int video_layers = asset->get_video_layers();
+	if( !result && asset->video_data && vstream < video_layers ) {
 		// try to get asset up to date, may fail
 		file->select_video_stream(asset, vstream);
 		// either way use what was/is there.
@@ -3613,7 +3672,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 	if( !result && asset->audio_data && asset->channels > 0 ) {
 		session->sample_rate = asset->get_sample_rate();
 		int64_t channel_mask = 0;
-		int astrm = !asset->video_data ? -1 :
+		int astrm = !asset->video_data || vstream >= video_layers ? -1 :
 			file->get_audio_for_video(vstream, astream, channel_mask);
 		if( astrm >= 0 ) file->select_audio_stream(asset, astrm);
 		if( astrm < 0 || !channel_mask ) channel_mask = (1<<asset->channels)-1;