X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=238c17aa43a09938d5a7bad1ade30d2fdef7e48e;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=75dc29acaa32d70f80126e10c741c780e9620622;hpb=ed1cab1d6cbde6129bbd09b9609f7bba03ab610f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 75dc29ac..238c17aa 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -18,6 +18,7 @@
  *
  */
 
+#include "aboutprefs.h"
 #include "asset.h"
 #include "assets.h"
 #include "atrack.h"
@@ -89,6 +90,7 @@
 #include "pluginserver.h"
 #include "pluginset.h"
 #include "preferences.h"
+#include "proxy.h"
 #include "record.h"
 #include "recordmonitor.h"
 #include "recordlabel.h"
@@ -297,6 +299,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 +330,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 +737,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();
@@ -833,6 +897,7 @@ void MWindow::init_preferences()
 	}
 	BC_WindowBase::get_resources()->popupmenu_btnup = preferences->popupmenu_btnup;
 	BC_WindowBase::get_resources()->textbox_focus_policy = preferences->textbox_focus_policy;
+	BC_WindowBase::get_resources()->grab_input_focus = preferences->grab_input_focus;
 }
 
 void MWindow::clean_indexes()
@@ -962,12 +1027,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);
 		}
 	}
@@ -1180,20 +1246,28 @@ void MWindow::init_brender()
 void MWindow::restart_brender()
 {
 //printf("MWindow::restart_brender 1\n");
-	if(!brender_active || !preferences->use_brender) return;
-	if(brender) brender->restart(edl);
+	if( !brender_active || !preferences->use_brender ) return;
+	if( !brender ) return;
+	int locked  = gui->get_window_lock();
+	if( locked ) gui->unlock_window();
+	brender->restart(edl);
+	if( locked ) gui->lock_window("MWindow::restart_brender");
 }
 
 void MWindow::stop_brender()
 {
-	if(brender) brender->stop();
+	if( !brender ) return;
+	int locked  = gui->get_window_lock();
+	if( locked ) gui->unlock_window();
+	brender->stop();
+	if( locked ) gui->lock_window("MWindow::stop_brender");
 }
 
 int MWindow::brender_available(int position)
 {
 	int result = 0;
 	brender_lock->lock("MWindow::brender_available 1");
-	if(brender)
+	if(brender && brender_active)
 	{
 		if(brender->map_valid)
 		{
@@ -1226,8 +1300,10 @@ void MWindow::set_brender_active(int v, int update)
 		}
 		restart_brender();
 	}
-	else
+	else {
+		edl->session->brender_start = edl->session->brender_end = 0;
 		stop_brender();
+	}
 	if( update ) {
 		gui->update_timebar(0);
 		gui->draw_overlays(1);
@@ -1421,14 +1497,10 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
 				if(load_mode != LOADMODE_RESOURCESONLY)
 				{
-SET_TRACE
 					RecordLabels *labels = edl->session->label_cells ?
 						new RecordLabels(new_file) : 0;
-SET_TRACE
 					asset_to_edl(new_edl, new_asset, labels);
-SET_TRACE
 					new_edls.append(new_edl);
-SET_TRACE
 					new_asset->Garbage::remove_user();
 					delete labels;
 					new_asset = 0;
@@ -1459,6 +1531,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
@@ -1600,6 +1673,15 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 						if(update_filename)
 							set_filename(new_edl->local_session->clip_title);
 					}
+					else
+					if( load_mode == LOADMODE_RESOURCESONLY ) {
+						strcpy(new_edl->local_session->clip_title,
+							filenames->get(i));
+						struct stat st;
+						time_t t = !stat(filenames->get(i),&st) ?
+							st.st_mtime : time(&t);
+						ctime_r(&t, new_edl->local_session->clip_notes);
+					}
 				}
 
 				new_edls.append(new_edl);
@@ -1620,12 +1702,10 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
 
-	if(!result) gui->statusbar->default_message();
-
-
-
-
-
+	if(!result) {
+		gui->reset_default_message();
+		gui->default_message();
+	}
 
 
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
@@ -1648,10 +1728,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,
@@ -1679,32 +1756,26 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 	}
 
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
-	if(new_assets.size())
+	for(int i = 0; i < new_assets.size(); i++)
 	{
-		for(int i = 0; i < new_assets.size(); i++)
-		{
-			Asset *new_asset = new_assets[i];
+		Asset *new_asset = new_assets[i];
 
-			File *new_file = 0;
-			int got_it = 0;
-			for(int j = 0; j < new_files.size(); j++)
+		File *new_file = 0;
+		int got_it = 0;
+		for(int j = 0; j < new_files.size(); j++)
+		{
+			new_file = new_files[j];
+			if(!strcmp(new_file->asset->path,
+				new_asset->path))
 			{
-				new_file = new_files[j];
-				if(!strcmp(new_file->asset->path,
-					new_asset->path))
-				{
-					got_it = 1;
-					break;
-				}
+				got_it = 1;
+				break;
 			}
-
-			mainindexes->add_next_asset(got_it ? new_file : 0, new_asset);
-			got_indexes = 1;
-			edl->assets->update(new_asset);
-
 		}
 
-
+		mainindexes->add_next_asset(got_it ? new_file : 0, new_asset);
+		got_indexes = 1;
+		edl->assets->update(new_asset);
 	}
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
@@ -1732,10 +1803,6 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 						show_plugin(plugin);
 					}
 				}
-				else
-				{
-					plugin->show = 0;
-				}
 
 				plugin = (Plugin*)plugin->next;
 			}
@@ -1749,6 +1816,9 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 	    ( load_mode == LOADMODE_REPLACE ||
 	      load_mode == LOADMODE_REPLACE_CONCATENATE ) ) {
 		select_asset(0, 0);
+		edl->session->proxy_scale = 1;
+		edl->session->proxy_use_scaler = 0;
+		edl->session->proxy_auto_scale = 0;
 		edl->local_session->preview_start = 0;
 		edl->local_session->preview_end = edl->tracks->total_playable_length();
 		edl->local_session->loop_playback = 0;
@@ -1759,6 +1829,29 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 		goto_start();
 	}
 
+	if( ( edl->session->proxy_auto_scale && edl->session->proxy_scale != 1 ) &&
+	    ( load_mode != LOADMODE_REPLACE && load_mode != LOADMODE_REPLACE_CONCATENATE ) ) {
+		ArrayList<Indexable *> orig_idxbls;
+		for( int i=0; i<new_assets.size(); ++i )
+			orig_idxbls.append(new_assets.get(i));
+		for( int i=0; i<new_edls.size(); ++i ) {
+			EDL *new_edl = new_edls[i];
+			for( Track *track=new_edl->tracks->first; track; track=track->next ) {
+				if( track->data_type != TRACK_VIDEO ) continue;
+				for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+					Indexable *idxbl = (Indexable *)edit->asset;
+					if( !idxbl ) continue;
+					if( !idxbl->have_video() ) continue;
+					if( edit->channel != 0 ) continue; // first layer only
+					orig_idxbls.append(edit->asset);
+				}
+			}
+		}
+		gui->unlock_window(); // to update progress bar
+		render_proxy(orig_idxbls);
+		gui->lock_window("MWindow::load_filenames");
+	}
+
 // need to update undo before project, since mwindow is unlocked & a new load
 // can begin here.  Should really prevent loading until we're done.
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
@@ -1803,8 +1896,35 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 	return 0;
 }
 
+void MWindow::render_proxy(ArrayList<Indexable *> &new_idxbls)
+{
+	Asset *format_asset = new Asset;
+	format_asset->format = FILE_FFMPEG;
+	format_asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0);
+	ProxyRender proxy_render(this, format_asset);
+	int new_scale = edl->session->proxy_scale;
+	int use_scaler = edl->session->proxy_use_scaler;
 
+	for( int i=0; i<new_idxbls.size(); ++i ) {
+		Indexable *orig = new_idxbls.get(i);
+		Asset *proxy = proxy_render.add_original(orig, new_scale);
+		if( !proxy ) continue;
+		FileSystem fs;
+		int exists = fs.get_size(proxy->path) > 0 ? 1 : 0;
+		int got_it = exists && // if proxy exists, and is newer than orig
+		    fs.get_date(proxy->path) > fs.get_date(orig->path) ? 1 : 0;
+		if( got_it ) continue;
+		proxy_render.add_needed(orig, proxy);
+	}
 
+// render needed proxies
+	int result = proxy_render.create_needed_proxies(new_scale);
+	if( !result ) {
+		add_proxy(use_scaler,
+			&proxy_render.orig_idxbls, &proxy_render.orig_proxies);
+	}
+	format_asset->remove_user();
+}
 
 void MWindow::test_plugins(EDL *new_edl, char *path)
 {
@@ -1917,7 +2037,6 @@ void MWindow::create_objects(int want_gui,
 	int want_new,
 	char *config_path)
 {
-	FileSystem fs;
 	const int debug = 0;
 	if(debug) PRINT_TRACE
 
@@ -1941,6 +2060,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
@@ -1969,6 +2089,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());
 
@@ -1980,24 +2103,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();
@@ -2497,12 +2617,11 @@ SET_TRACE
 SET_TRACE
 
 //printf("MWindow::show_plugin 1\n");
-	if(!done)
-	{
-		if(!plugin->track)
-		{
-			printf("MWindow::show_plugin track not defined.\n");
-		}
+	if( !done && !plugin->track ) {
+		printf("MWindow::show_plugin track not defined.\n");
+		done = 1;
+	}
+	if( !done ) {
 		PluginServer *server = scan_plugindb(plugin->title,
 			plugin->track->data_type);
 
@@ -2881,7 +3000,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
@@ -2973,9 +3092,13 @@ void MWindow::rebuild_indices()
 		index_state->index_status = INDEX_NOTTESTED;
 		if( indexable->is_asset ) {
 			Asset *asset = (Asset *)indexable;
-			if( asset->format != FILE_PCM )
+			if( asset->format != FILE_PCM ) {
+				asset->format = FILE_UNKNOWN;
 				asset->reset_audio();
+			}
 			asset->reset_video();
+//			File file; // re-probe the asset
+//			file.open_file(preferences, asset, 1, 0);
 		}
 		mainindexes->add_next_asset(0, indexable);
 	}
@@ -3120,8 +3243,8 @@ void MWindow::remove_asset_from_caches(Asset *asset)
 void MWindow::remove_assets_from_project(int push_undo, int redraw,
 		ArrayList<Indexable*> *drag_assets, ArrayList<EDL*> *drag_clips)
 {
-	for(int i = 0; i < session->drag_assets->total; i++) {
-		Indexable *indexable = session->drag_assets->get(i);
+	for(int i = 0; i < drag_assets->total; i++) {
+		Indexable *indexable = drag_assets->get(i);
 		if(indexable->is_asset) remove_asset_from_caches((Asset*)indexable);
 	}
 
@@ -3138,11 +3261,11 @@ void MWindow::remove_assets_from_project(int push_undo, int redraw,
 		}
 	}
 
-	for(int i = 0; i < session->drag_assets->size(); i++) {
+	for(int i = 0; i < drag_assets->size(); i++) {
 		for(int j = 0; j < vwindows.size(); j++) {
 			VWindow *vwindow = vwindows[j];
 			if( !vwindow->is_running() ) continue;
-			if(session->drag_assets->get(i) == vwindow->get_source()) {
+			if(drag_assets->get(i) == vwindow->get_source()) {
 				vwindow->gui->lock_window("MWindow::remove_assets_from_project 2");
 				vwindow->delete_source(1, 1);
 				vwindow->gui->unlock_window();
@@ -3150,29 +3273,22 @@ void MWindow::remove_assets_from_project(int push_undo, int redraw,
 		}
 	}
 
-	for(int i = 0; i < session->drag_assets->size(); i++) {
-		Indexable *indexable = session->drag_assets->get(i);
+	for(int i = 0; i < drag_assets->size(); i++) {
+		Indexable *indexable = drag_assets->get(i);
 		remove_indexfile(indexable);
 	}
 
 //printf("MWindow::rebuild_indices 1 %s\n", indexable->path);
 	if(push_undo) undo->update_undo_before();
 	if(drag_assets) edl->remove_from_project(drag_assets);
-	if(drag_clips) edl->remove_from_project(session->drag_clips);
+	if(drag_clips) edl->remove_from_project(drag_clips);
 	if(redraw) save_backup();
 	if(push_undo) undo->update_undo_after(_("remove assets"), LOAD_ALL);
-	if(redraw)
-	{
+	if(redraw) {
 		restart_brender();
 
 		gui->lock_window("MWindow::remove_assets_from_project 3");
-		gui->update(1,
-			1,
-			1,
-			1,
-			0,
-			1,
-			0);
+		gui->update(1, 1, 1, 1, 0, 1, 0);
 		gui->unlock_window();
 
 	// Removes from playback here
@@ -3246,7 +3362,8 @@ void MWindow::dump_exe(FILE *fp)
 	char mtime[256];
 	strftime(mtime, sizeof(mtime), "%F %T", tm);
 	fprintf(fp,"mtime: %s\n", mtime);
-
+#if 0
+// people hit ctl-c waiting for this
 	int fd = open(proc_path,O_RDONLY+O_NONBLOCK);
 	if( fd < 0 ) { fprintf(fp,"open: %m\n"); return; }
 	uint8_t *bfr = 0;
@@ -3271,6 +3388,7 @@ void MWindow::dump_exe(FILE *fp)
 	for( int i=0; i<20; ++i ) fprintf(fp, "%02x", digest[i]);
 	if( ret < 0 ) fprintf(fp, " (ret %d)", ret);
 	if( pos < st.st_size ) fprintf(fp, " (pos %jd)", pos);
+#endif
 	fprintf(fp, "\n");
 }
 
@@ -3283,7 +3401,7 @@ void MWindow::trap_hook(FILE *fp, void *vp)
 	mwindow->dump_edl(fp);
 	fprintf(fp, "\nUNDO:\n");
 	mwindow->dump_undo(fp);
-	fprintf(fp, "\nEXE:\n");
+	fprintf(fp, "\nEXE: %s\n", AboutPrefs::build_timestamp);
 	mwindow->dump_exe(fp);
 }
 
@@ -3549,7 +3667,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.
@@ -3605,7 +3724,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;