X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=0d4421e930c2acb9b83e084e93179aa7fca0c9ab;hb=0d49253b107e67067b6143958fee3f8e4c0e0b6c;hp=cdf80b206eebfe6790a595886f76791041903f00;hpb=8068cd62fe64d3e6d95d563b4cab15f768411ba9;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index cdf80b20..0d4421e9 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -369,7 +369,7 @@ void MWindow::create_defaults_path(char *string, const char *config_file)
 // set the .bcast path
 	FileSystem fs;
 
-	sprintf(string, "%s", BCASTDIR);
+	sprintf(string, "%s/", File::get_config_path());
 	fs.complete_path(string);
 	if(!fs.is_dir(string))
 		fs.create_dir(string);
@@ -597,8 +597,7 @@ int MWindow::init_ladspa_plugins(MWindow *mwindow, Preferences *preferences)
 	char *path = getenv("LADSPA_PATH");
 	char ladspa_path[BCTEXTLEN];
 	if( !path ) {
-		get_exe_path(ladspa_path);
-		strcat(ladspa_path, "/ladspa");
+		strncpy(ladspa_path, File::get_ladspa_path(), sizeof(ladspa_path));
 		path = ladspa_path;
 	}
 	for( int len=0; *path; path+=len ) {
@@ -903,6 +902,11 @@ void MWindow::show_warning(int *do_warning, const char *text)
 	wwindow->show_warning(do_warning, text);
 }
 
+int MWindow::wait_warning()
+{
+	return wwindow->wait_result();
+}
+
 void MWindow::init_theme()
 {
 	Timer timer;
@@ -2434,7 +2438,7 @@ void MWindow::hide_plugin(Plugin *plugin, int lock)
 			ptr->hide_gui();
 			delete_plugin(ptr);
 //sleep(1);
-//			return;
+			return;
 		}
 	}
 	if(lock) plugin_gui_lock->unlock();
@@ -2876,17 +2880,18 @@ void MWindow::save_backup()
 	FileXML file;
 	edl->optimize();
 	edl->set_path(session->filename);
-	edl->save_xml(&file, BACKUP_PATH, 0, 0);
+	char backup_path[BCTEXTLEN];
+	snprintf(backup_path, sizeof(backup_path), "%s/%s",
+		File::get_config_path(), BACKUP_FILE);
+	edl->save_xml(&file, backup_path, 0, 0);
 	file.terminate_string();
-	char path[BCTEXTLEN];
 	FileSystem fs;
-	strcpy(path, BACKUP_PATH);
-	fs.complete_path(path);
+	fs.complete_path(backup_path);
 
-	if(file.write_to_file(path))
+	if(file.write_to_file(backup_path))
 	{
 		char string2[256];
-		sprintf(string2, _("Couldn't open %s for writing."), BACKUP_PATH);
+		sprintf(string2, _("Couldn't open %s for writing."), backup_path);
 		gui->show_message(string2);
 	}
 }
@@ -2896,13 +2901,14 @@ void MWindow::load_backup()
 	ArrayList<char*> path_list;
 	path_list.set_array_delete();
 	char *out_path;
-	char string[BCTEXTLEN];
-	strcpy(string, BACKUP_PATH);
+	char backup_path[BCTEXTLEN];
+	snprintf(backup_path, sizeof(backup_path), "%s/%s",
+		File::get_config_path(), BACKUP_FILE);
 	FileSystem fs;
-	fs.complete_path(string);
+	fs.complete_path(backup_path);
 
-	path_list.append(out_path = new char[strlen(string) + 1]);
-	strcpy(out_path, string);
+	path_list.append(out_path = new char[strlen(backup_path) + 1]);
+	strcpy(out_path, backup_path);
 
 	load_filenames(&path_list, LOADMODE_REPLACE, 0);
 	edl->local_session->clip_title[0] = 0;
@@ -2925,6 +2931,9 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height)
 {
 	w = 1;  h = 1;
 	if(!width || !height) return 1;
+	if( width == 720 && (height == 480 || height == 576) ) {
+		w = 4;  h = 3;  return 0; // for NTSC and PAL
+	}
 	double ar = (double)width / height;
 // square-ish pixels
 	if( EQUIV(ar, 1.0000) ) return 0;