X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=79ce0e3b53b4a7ddbbaa37a53caa35ee3be2a278;hb=f3ab8166b4ee39bd518e7ddce28648f74e072673;hp=202a7687d073b3e4c0202258fe48942ca3e0f3da;hpb=8aa6d71ebd2c65785a8b553fc6fc38ac19041ce0;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 202a7687..79ce0e3b 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -210,7 +210,6 @@ MWindow::MWindow()
 	strcpy(cin_lang,"en");
 	channeldb_buz =  new ChannelDB;
 	channeldb_v4l2jpeg =  new ChannelDB;
-	//file_server = 0;
 	plugin_guis = 0;
 	dead_plugins = 0;
 	keyframe_threads = 0;
@@ -319,7 +318,6 @@ MWindow::~MWindow()
 	delete gwindow;         gwindow = 0;
 	delete cwindow;         cwindow = 0;
 	delete gui;		gui = 0;
-	//delete file_server;  file_server = 0; // reusable
 	delete mainindexes;     mainindexes = 0;
 	delete mainprogress;    mainprogress = 0;
 	delete audio_cache;     audio_cache = 0;  // delete the cache after the assets
@@ -471,6 +469,7 @@ void MWindow::init_defaults(BC_Hash* &defaults, char *config_path)
 	else
 		create_defaults_path(path, CONFIG_FILE);
 
+	delete defaults;
 	defaults = new BC_Hash(path);
 	defaults->load();
 }
@@ -561,6 +560,9 @@ int MWindow::load_plugin_index(MWindow *mwindow, const char *index_path, const c
 		case PLUGIN_TYPE_FFMPEG: {
 			server = new_ffmpeg_server(mwindow, path);
 			break; }
+		case PLUGIN_TYPE_LV2: {
+			server = new_lv2_server(mwindow, path);
+			break; }
 		}
 		if( !server ) continue;
 		plugins.append(server);
@@ -629,6 +631,7 @@ int MWindow::init_plugins(MWindow *mwindow, Preferences *preferences)
 	fprintf(fp, "%s\n", plugin_path);
 	init_plugin_index(mwindow, preferences, fp, plugin_path);
 	init_ffmpeg_index(mwindow, preferences, fp);
+	init_lv2_index(mwindow, preferences, fp);
 	fclose(fp);
 	return load_plugin_index(mwindow, index_path, plugin_path);
 }
@@ -675,25 +678,6 @@ void MWindow::init_plugin_index(MWindow *mwindow, Preferences *preferences,
 	scan_plugin_index(mwindow, preferences, fp, plugin_dir, ".", idx);
 }
 
-int MWindow::init_ladspa_index(MWindow *mwindow, Preferences *preferences,
-	const char *index_path, const char *plugin_dir)
-{
-	char plugin_path[BCTEXTLEN], *path = FileSystem::basepath(plugin_dir);
-	strcpy(plugin_path, path);  delete [] path;
-	printf("init ladspa index: %s\n", plugin_dir);
-	FILE *fp = fopen(index_path,"w");
-	if( !fp ) {
-		fprintf(stderr,_("MWindow::init_ladspa_index: "
-			"can't create plugin index: %s\n"), index_path);
-		return 1;
-	}
-	fprintf(fp, "%d\n", PLUGIN_FILE_VERSION);
-	fprintf(fp, "%s\n", plugin_dir);
-	init_plugin_index(mwindow, preferences, fp, plugin_path);
-	fclose(fp);
-	return 0;
-}
-
 void MWindow::scan_plugin_index(MWindow *mwindow, Preferences *preferences, FILE *fp,
 	const char *plug_dir, const char *plug_path, int &idx)
 {
@@ -746,17 +730,17 @@ void MWindow::add_plugins(ArrayList<PluginServer*> &plugins)
 
 void MWindow::init_plugin_tips(ArrayList<PluginServer*> &plugins, const char *lang)
 {
-	const char *cfg_path = File::get_cindat_path();
+	const char *dat_path = File::get_cindat_path();
 	char msg_path[BCTEXTLEN];
 	FILE *fp = 0;
 	if( BC_Resources::language[0] ) {
 		snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.%s",
-			cfg_path, lang);
+			dat_path, lang);
 		fp = fopen(msg_path, "r");
 	}
 	if( !fp ) {
 		snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.txt",
-			cfg_path);
+			dat_path);
 		fp = fopen(msg_path, "r");
 	}
 	if( !fp ) return;
@@ -2275,10 +2259,9 @@ void MWindow::init_shm(const char *pfn, int64_t min)
 	}
 
 	fd = fopen(pfn, "w");
-	if( fd ) {
-		fprintf(fd, "0x%jx", min);
-		fclose(fd);
-	}
+	if( !fd ) return;
+	fprintf(fd, "0x%jx", min);
+	fclose(fd);
 
 	fd = fopen(pfn, "r");
 	if( !fd ) {
@@ -2342,9 +2325,6 @@ void MWindow::create_objects(int want_gui,
 	BC_Resources::init_fontconfig(string);
 	if(debug) PRINT_TRACE
 
-// Initialize before too much else is running
-// Preferences & theme are required for building MPEG table of contents
-
 // Default project created here
 	init_edl();
 	if(debug) PRINT_TRACE