X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=9de65dba075855f78b5c4aa1234f471cbb4350d1;hp=6150f954131af90569483dc305304075ff4c09d8;hb=cb73d14fe59acbe8eba0a62f4af26a23072201fa;hpb=a94468d6de897136e77c70662177f4b8b4454b6b

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 6150f954..9de65dba 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;
@@ -897,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
@@ -2341,9 +2340,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