X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=6ad64376e6b3e47839d20d5adae6fdd49d495d3a;hb=463702f1b724c43a1cb7951ce7d71986f9715d5f;hp=a69af4e7642b3907bb2c50f690ebfcdb031d6d99;hpb=214bd0ba9e21635e03d0c0e2b2ae1a7e9170583c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index a69af4e7..6ad64376 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -230,6 +230,7 @@ MWindow::MWindow()
 	restart_status = 0;
 	screens = 1;
 	in_destructor = 0;
+	speed_edl = 0;
 }
 
 
@@ -251,7 +252,7 @@ MWindow::~MWindow()
 	commit_commercial();
 	if( commercials && !commercials->remove_user() ) commercials = 0;
 	close_mixers();
-
+	if( speed_edl ) { speed_edl->remove_user();  speed_edl = 0; }
 // Save defaults for open plugins
 	plugin_gui_lock->lock("MWindow::~MWindow");
 	for(int i = 0; i < plugin_guis->size(); i++) {
@@ -470,6 +471,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();
 }
@@ -745,18 +747,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();
-	char msg_path[BCTEXTLEN];  int txt = 0;
+	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 ) {
-		txt = 1;
 		snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.txt",
-			cfg_path);
+			dat_path);
 		fp = fopen(msg_path, "r");
 	}
 	if( !fp ) return;
@@ -775,9 +776,8 @@ void MWindow::init_plugin_tips(ArrayList<PluginServer*> &plugins, const char *la
 		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) );
+				while( --idx>=0 && strcmp(plugins[idx]->title, title) );
 				if( idx >= 0 ) {
 					delete [] plugins[idx]->tip;
 					plugins[idx]->tip = cstrdup(text);
@@ -1961,7 +1961,8 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 				nested_edl->create_objects();
 				nested_edl->load_xml(&xml_file, LOAD_ALL);
 //printf("MWindow::load_filenames %p %s\n", nested_edl, nested_edl->project_path);
-				new_edl->create_nested(nested_edl, filenames->get(i));
+				new_edl->create_nested(nested_edl);
+				new_edl->set_path(filenames->get(i));
 				nested_edl->Garbage::remove_user();
 			}
 			else {
@@ -2263,32 +2264,37 @@ void MWindow::test_plugins(EDL *new_edl, char *path)
 }
 
 
-void MWindow::init_shm()
+void MWindow::init_shm(const char *pfn, int64_t min)
 {
+	int64_t result = 0;
 // Fix shared memory
-	FILE *fd = fopen("/proc/sys/kernel/shmmax", "w");
-	if(fd) {
-		fprintf(fd, "0x7fffffff");
+	FILE *fd = fopen(pfn, "r");
+	if( fd ) {
+		fscanf(fd, "%jd", &result);
 		fclose(fd);
+		if( result >= min ) return;
 	}
-	fd = 0;
 
-	fd = fopen("/proc/sys/kernel/shmmax", "r");
-	if(!fd) {
-		MainError::show_error("MWindow::init_shm: couldn't open /proc/sys/kernel/shmmax for reading.\n");
+	fd = fopen(pfn, "w");
+	if( !fd ) return;
+	fprintf(fd, "0x%jx", min);
+	fclose(fd);
+
+	fd = fopen(pfn, "r");
+	if( !fd ) {
+		eprintf(_("MWindow::init_shm: couldn't open %s for reading.\n"), pfn);
 		return;
 	}
 
-	int64_t result = 0;
 	fscanf(fd, "%jd", &result);
 	fclose(fd);
-	fd = 0;
-	if(result < 0x7fffffff) {
-		eprintf(_("MWindow::init_shm: /proc/sys/kernel/shmmax is %p.\n"
+	if( result < min ) {
+		eprintf(_("MWindow::init_shm: %s is %p.\n"
 			"you probably need to be root, or:\n"
-			"as root, run: echo 0x7fffffff > /proc/sys/kernel/shmmax\n"
+			"as root, run: echo 0x%jx > %s\n"
 			"before trying to start cinelerra.\n"
-			"It should be at least 0x7fffffff for Cinelerra.\n"), (void *)result);
+			"It should be at least 0x%jx for Cinelerra.\n"),
+			pfn, (void *)result, min, pfn, min);
 	}
 }
 
@@ -2473,7 +2479,8 @@ void MWindow::create_objects(int want_gui,
 		&MWindowGUI::keyboard_listener);
 
 	hide_splash();
-	init_shm();
+	init_shm("/proc/sys/kernel/shmmax", 0x7fffffff);
+	init_shm("/proc/sys/kernel/shmmni", 0x4000);
 	if(debug) PRINT_TRACE
 
 	BC_WindowBase::get_resources()->vframe_shm = 1;