X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=84ba6830aa88bd39cfea54d154dd94ead97a07ff;hp=27e0917ec7eabe59d3782ee1f8c5973d9e62fd2d;hb=243336668c89096732786c6b3f3c5918aa2eff26;hpb=318256a48938064b695268d03396977739ef4724

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 27e0917e..84ba6830 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -18,15 +18,19 @@
  *
  */
 
+#include "aboutprefs.h"
 #include "asset.h"
 #include "assets.h"
+#include "atrack.h"
 #include "audioalsa.h"
+#include "autos.h"
 #include "awindowgui.h"
 #include "awindow.h"
 #include "batchrender.h"
 #include "bcdisplayinfo.h"
 #include "bcsignals.h"
 #include "bctimer.h"
+#include "bctrace.h"
 #include "bdcreate.h"
 #include "brender.h"
 #include "cache.h"
@@ -52,11 +56,13 @@
 #include "file.h"
 #include "filesystem.h"
 #include "filexml.h"
+#include "floatautos.h"
 #include "framecache.h"
 #include "gwindow.h"
 #include "gwindowgui.h"
 #include "keyframegui.h"
 #include "indexfile.h"
+#include "intautos.h"
 #include "interlacemodes.h"
 #include "language.h"
 #include "levelwindowgui.h"
@@ -76,6 +82,7 @@
 #include "mwindow.h"
 #include "nestededls.h"
 #include "new.h"
+#include "panautos.h"
 #include "patchbay.h"
 #include "playback3d.h"
 #include "playbackengine.h"
@@ -83,6 +90,7 @@
 #include "pluginserver.h"
 #include "pluginset.h"
 #include "preferences.h"
+#include "proxy.h"
 #include "record.h"
 #include "recordmonitor.h"
 #include "recordlabel.h"
@@ -97,6 +105,7 @@
 #include "theme.h"
 #include "threadloader.h"
 #include "timebar.h"
+#include "timelinepane.h"
 #include "tipwindow.h"
 #include "trackcanvas.h"
 #include "track.h"
@@ -106,6 +115,8 @@
 #include "transition.h"
 #include "transportque.h"
 #include "vframe.h"
+#include "vtrack.h"
+#include "versioninfo.h"
 #include "videodevice.inc"
 #include "videowindow.h"
 #include "vplayback.h"
@@ -114,6 +125,8 @@
 #include "wavecache.h"
 #include "wwindow.h"
 #include "zoombar.h"
+#include "zwindow.h"
+#include "zwindowgui.h"
 #include "exportedl.h"
 
 #include "defaultformats.h"
@@ -168,9 +181,11 @@ Commercials* MWindow::commercials = 0;
 MWindow::MWindow()
  : Thread(1, 0, 0)
 {
+	run_lock = new Mutex("MWindow::run_lock");
 	plugin_gui_lock = new Mutex("MWindow::plugin_gui_lock");
 	dead_plugin_lock = new Mutex("MWindow::dead_plugin_lock");
 	vwindows_lock = new Mutex("MWindow::vwindows_lock");
+	zwindows_lock = new Mutex("MWindow::zwindows_lock");
 	brender_lock = new Mutex("MWindow::brender_lock");
 	keyframe_gui_lock = new Mutex("MWindow::keyframe_gui_lock");
 
@@ -191,6 +206,8 @@ MWindow::MWindow()
 	mainindexes = 0;
 	mainprogress = 0;
 	brender = 0;
+	brender_active = 0;
+	strcpy(cin_lang,"en");
 	channeldb_buz =  new ChannelDB;
 	channeldb_v4l2jpeg =  new ChannelDB;
 	//file_server = 0;
@@ -219,25 +236,21 @@ MWindow::MWindow()
 // Need to delete brender temporary here.
 MWindow::~MWindow()
 {
+	run_lock->lock("MWindow::~MWindow");
 	in_destructor = 1;
-	stop_playback(1);
-	stop_brender();
 //printf("MWindow::~MWindow %d\n", __LINE__);
-	gui->stop_drawing();
 	gui->remote_control->deactivate();
 	gui->record->stop();
 #ifdef HAVE_DVB
 	gui->channel_info->stop();
 #endif
-	brender_lock->lock("MWindow::quit");
-	delete brender;         brender = 0;
-	brender_lock->unlock();
 	delete create_bd;       create_bd = 0;
 	delete create_dvd;      create_dvd = 0;
 	delete batch_render;    batch_render = 0;
 	delete render;          render = 0;
 	commit_commercial();
 	if( commercials && !commercials->remove_user() ) commercials = 0;
+	close_mixers();
 
 // Save defaults for open plugins
 	plugin_gui_lock->lock("MWindow::~MWindow");
@@ -264,6 +277,7 @@ MWindow::~MWindow()
 	if( twindow && twindow->is_running() ) twindow->close_window();
 	if( wwindow && wwindow->is_running() ) wwindow->close_window();
 	vwindows.remove_all_objects();
+	zwindows.remove_all_objects();
 	gui->close(0);
 	if( awindow ) awindow->join();
 	if( cwindow ) cwindow->join();
@@ -284,11 +298,15 @@ MWindow::~MWindow()
 	close_gui(twindow);
 	close_gui(wwindow);
 	vwindows.remove_all_objects();
+	zwindows.remove_all_objects();
 	gui->close(0);
 	join();
 #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();
@@ -317,7 +335,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;
@@ -326,6 +343,7 @@ MWindow::~MWindow()
 	delete dead_plugin_lock;
 	delete plugin_gui_lock;
 	delete vwindows_lock;
+	delete zwindows_lock;
 	delete brender_lock;
 	delete keyframe_gui_lock;
 	colormodels.remove_all_objects();
@@ -334,23 +352,13 @@ MWindow::~MWindow()
 	interlace_asset_fixmethods.remove_all_objects();
 	sighandler->terminate();
 	delete sighandler;
+	delete run_lock;
 }
 
 
-void MWindow::quit(int unlock)
+void MWindow::quit()
 {
-	if(unlock) gui->unlock_window();
-	stop_playback(1);
-
-	brender_lock->lock("MWindow::quit");
-	delete brender;         brender = 0;
-	brender_lock->unlock();
-
-	interrupt_indexes();
-	clean_indexes();
-	save_defaults();
 	gui->set_done(0);
-	if(unlock) gui->lock_window("MWindow::quit");
 }
 
 void MWindow::init_error()
@@ -466,6 +474,39 @@ void MWindow::init_defaults(BC_Hash* &defaults, char *config_path)
 	defaults->load();
 }
 
+
+void MWindow::check_language()
+{
+	char curr_lang[BCTEXTLEN]; curr_lang[0] = 0;
+	const char *env_lang = getenv("LANGUAGE");
+	if( !env_lang ) env_lang = getenv("LC_ALL");
+	if( !env_lang ) env_lang = getenv("LANG");
+	if( !env_lang ) {
+		snprintf(curr_lang, sizeof(curr_lang), "%s_%s-%s",
+			BC_Resources::language, BC_Resources::region, BC_Resources::encoding);
+		env_lang = curr_lang;
+	}
+	char last_lang[BCTEXTLEN]; last_lang[0] = 0;
+	defaults->get("LAST_LANG",last_lang);
+	if( strcmp(env_lang,last_lang)) {
+		printf("lang changed from '%s' to '%s'\n", last_lang, env_lang);
+		defaults->update("LAST_LANG",env_lang);
+		char plugin_path[BCTEXTLEN];
+		create_defaults_path(plugin_path, PLUGIN_FILE);
+		::remove(plugin_path);
+		char ladspa_path[BCTEXTLEN];
+		create_defaults_path(ladspa_path, LADSPA_FILE);
+		::remove(ladspa_path);
+		defaults->save();
+	}
+	if( strlen(env_lang) > 1 &&
+	    ( env_lang[2] == 0 || env_lang[2] == '_'  || env_lang[2] == '.' ) ) {
+		cin_lang[0] = env_lang[0];  cin_lang[1] = env_lang[1];  cin_lang[2] = 0;
+	}
+	else
+		strcpy(cin_lang, "en");
+}
+
 void MWindow::get_plugin_path(char *path, const char *plug_dir, const char *fs_path)
 {
 	char *base_path = FileSystem::basepath(fs_path), *bp = base_path;
@@ -604,6 +645,7 @@ int MWindow::init_ladspa_plugins(MWindow *mwindow, Preferences *preferences)
 		len = !cp ? strlen(path) : cp-path;
 		char index_path[BCTEXTLEN], plugin_path[BCTEXTLEN];
 		memcpy(plugin_path, path, len);  plugin_path[len] = 0;
+		if( cp ) ++len;
 		char *plugin_dir = FileSystem::basepath(plugin_path);
 		strcpy(plugin_path, plugin_dir);  delete [] plugin_dir;
 		create_defaults_path(index_path, LADSPA_FILE);
@@ -639,14 +681,14 @@ int MWindow::init_ladspa_index(MWindow *mwindow, Preferences *preferences,
 	strcpy(plugin_path, path);  delete [] path;
 	printf("init ladspa index: %s\n", plugin_dir);
 	FILE *fp = fopen(index_path,"w");
-        if( !fp ) {
+	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);
+	init_plugin_index(mwindow, preferences, fp, plugin_path);
 	fclose(fp);
 	return 0;
 }
@@ -701,6 +743,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();
@@ -790,10 +892,19 @@ void MWindow::init_preferences()
 	session->load_defaults(defaults);
 	// set x11_host, screens, window_config
 	screens = session->set_default_x11_host();
-	BC_Signals::set_trap_path("/tmp/cinelerra_%d.dmp");
 	BC_Signals::set_trap_hook(trap_hook, this);
 	BC_Signals::set_catch_segv(preferences->trap_sigsegv);
 	BC_Signals::set_catch_intr(preferences->trap_sigintr);
+	if( preferences->trap_sigsegv || preferences->trap_sigintr ) {
+		BC_Trace::enable_locks();
+	}
+	else {
+		BC_Trace::disable_locks();
+	}
+	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;
+	YUV::yuv.yuv_set_colors(preferences->yuv_color_space, preferences->yuv_color_range);
 }
 
 void MWindow::clean_indexes()
@@ -888,6 +999,7 @@ void MWindow::init_gwindow()
 
 void MWindow::init_tipwindow()
 {
+	TipWindow::load_tips(cin_lang);
 	if( !twindow )
 		twindow = new TipWindow(this);
 	twindow->start();
@@ -922,12 +1034,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);
 		}
 	}
@@ -957,8 +1070,8 @@ void MWindow::init_theme()
 	theme->build_menus();
 	init_menus();
 
+	theme->sort_image_sets();
 	theme->check_used();
-
 //printf("MWindow::init_theme %d total_time=%d\n", __LINE__, (int)timer.get_difference());
 }
 
@@ -974,6 +1087,7 @@ void MWindow::init_edl()
 	edl->create_objects();
 	fill_preset_defaults(default_standard, edl->session);
 	edl->load_defaults(defaults);
+	edl->session->brender_start = edl->session->brender_end = 0;
 	edl->create_default_tracks();
 	edl->tracks->update_y_pixels(theme);
 }
@@ -1011,6 +1125,243 @@ VWindow *MWindow::get_viewer(int start_it, int idx)
 	return vwindow;
 }
 
+ZWindow *MWindow::get_mixer(Mixer *&mixer)
+{
+	zwindows_lock->lock("MWindow::get_mixer");
+	if( !mixer ) mixer = edl->mixers.new_mixer();
+	ZWindow *zwindow = 0;
+	for( int i=0; !zwindow && i<zwindows.size(); ++i )
+		if( zwindows[i]->idx < 0 ) zwindow = zwindows[i];
+	if( !zwindow )
+		zwindows.append(zwindow = new ZWindow(this));
+	zwindow->idx = mixer->idx;
+	zwindows_lock->unlock();
+	return zwindow;
+}
+
+void MWindow::del_mixer(ZWindow *zwindow)
+{
+	zwindows_lock->lock("MWindow::del_mixer 0");
+	edl->mixers.del_mixer(zwindow->idx);
+	zwindow->idx = -1;
+	if( session->selected_zwindow >= 0 ) {
+		int i = zwindows.number_of(zwindow);
+		if( i >= 0 && i < session->selected_zwindow )
+			--session->selected_zwindow;
+		else if( i == session->selected_zwindow )
+			session->selected_zwindow = -1;
+	}
+	zwindows_lock->unlock();
+	gui->lock_window("MWindow::del_mixer 1");
+	gui->update_mixers(0, -1);
+	gui->unlock_window();
+}
+
+void MWindow::start_mixer()
+{
+	Mixer *mixer = 0;
+	ZWindow *zwindow = get_mixer(mixer);
+	const char *title = 0;
+
+	for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+		PatchGUI *patchgui = get_patchgui(track);
+		if( !patchgui || !patchgui->mixer ) continue;
+		mixer->mixer_ids.append(track->get_mixer_id());
+		if( !title ) title = track->title;
+	}
+
+	session->selected_zwindow = -1;
+	gui->lock_window("MWindow::start_mixer");
+	gui->update_mixers(0, 0);
+	gui->unlock_window();
+
+	zwindow->set_title(title);
+	zwindow->start();
+	refresh_mixers();
+}
+
+int MWindow::mixer_track_active(Track *track)
+{
+	int i = session->selected_zwindow;
+	if( i < 0 || i >= zwindows.size() ) return 0;
+	ZWindow *zwindow = zwindows[i];
+	Mixer *mixer = edl->mixers.get_mixer(zwindow->idx);
+	if( !mixer ) return 0;
+	int n = mixer->mixer_ids.number_of(track->get_mixer_id());
+	return n >= 0 ? 1 : 0;
+}
+
+void MWindow::update_mixer_tracks()
+{
+	zwindows_lock->lock("MixPatch::handle_event");
+	int i = session->selected_zwindow;
+	if( i >= 0 && i < zwindows.size() ) {
+		ZWindow *zwindow = zwindows[i];
+		zwindow->update_mixer_ids();
+	}
+	zwindows_lock->unlock();
+}
+
+void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking,
+		int use_inout, int update_refresh, int toggle_audio)
+{
+	zwindows_lock->lock("MWindow::queue_mixers");
+	for( int vidx=0; vidx<zwindows.size(); ++vidx ) {
+		ZWindow *zwindow = zwindows[vidx];
+		if( zwindow->idx < 0 ) continue;
+		Mixer *mixer = edl->mixers.get_mixer(zwindow->idx);
+		if( !mixer || !mixer->mixer_ids.size() ) continue;
+		int k = -1;
+		for( Track *track = edl->tracks->first; k<0 && track!=0; track=track->next ) {
+			if( track->data_type != TRACK_VIDEO ) continue;
+			int mixer_id = track->get_mixer_id();
+			k = mixer->mixer_ids.size();
+			while( --k >= 0 && mixer_id != mixer->mixer_ids[k] );
+		}
+		if( k < 0 ) continue;
+		EDL *mixer_edl = new EDL(this->edl);
+		mixer_edl->create_objects();
+		mixer_edl->copy_all(edl);
+		mixer_edl->remove_vwindow_edls();
+		for( Track *track = mixer_edl->tracks->first; track!=0; track=track->next ) {
+			k = mixer->mixer_ids.size();
+			while( --k >= 0 && track->get_mixer_id() != mixer->mixer_ids[k] );
+			if( k >= 0 ) {
+				track->record = 1;
+				track->play = track->data_type == TRACK_VIDEO ? 1 : 0;
+			}
+			else
+				track->record = track->play = 0;
+		}
+		zwindow->change_source(mixer_edl);
+		zwindow->issue_command(command,
+			wait_tracking, use_inout, update_refresh, toggle_audio);
+	}
+	zwindows_lock->unlock();
+}
+
+void MWindow::refresh_mixers()
+{
+	queue_mixers(edl,CURRENT_FRAME,0,0,1,0);
+}
+
+void MWindow::stop_mixers()
+{
+	for( int vidx=0; vidx<zwindows.size(); ++vidx ) {
+		ZWindow *zwindow = zwindows[vidx];
+		if( zwindow->idx < 0 ) continue;
+		zwindow->issue_command(STOP, 0, 0, 0, 0);
+	}
+}
+
+void MWindow::close_mixers()
+{
+	zwindows_lock->lock("MWindow::close_mixers");
+	for( int i=0; i<zwindows.size(); ++i ) {
+		ZWindow *zwindow = zwindows[i];
+		if( zwindow->idx < 0 ) continue;
+		ZWindowGUI *zgui = zwindow->zgui;
+		zgui->lock_window("MWindow::select_zwindow 0");
+		zgui->set_done(0);
+		zgui->unlock_window();
+	}
+	zwindows_lock->unlock();
+	for( int i=0; i<zwindows.size(); ++i ) {
+		ZWindow *zwindow = zwindows[i];
+		if( zwindow->idx < 0 ) continue;
+		zwindow->close_window();
+	}
+}
+
+void MWindow::open_mixers()
+{
+	for( int i=0; i<edl->mixers.size(); ++i ) {
+		Mixer *mixer = edl->mixers[i];
+		ZWindow *zwindow = get_mixer(mixer);
+		zwindow->set_title(mixer->title);
+		zwindow->start();
+	}
+        refresh_mixers();
+}
+
+int MWindow::select_zwindow(ZWindow *zwindow)
+{
+	int ret = 0, n = zwindows.number_of(zwindow);
+	if( session->selected_zwindow != n ) {
+		session->selected_zwindow = n;
+		for( int i=0; i<zwindows.size(); ++i ) {
+			ZWindow *zwindow = zwindows[i];
+			if( zwindow->idx < 0 ) continue;
+			ZWindowGUI *zgui = zwindow->zgui;
+			zgui->lock_window("MWindow::select_zwindow 0");
+			zwindow->highlighted = i == n ? 1 : 0;
+			if( zgui->draw_overlays() )
+				zgui->canvas->get_canvas()->flash(1);
+			zgui->unlock_window();
+		}
+		ret = 1;
+		gui->lock_window("MWindow::select_window 1");
+		gui->update_mixers(0, -1);
+		gui->unlock_window();
+	}
+	return ret;
+}
+
+void MWindow::tile_mixers()
+{
+	int nz = 0;
+	for( int i=0; i<zwindows.size(); ++i ) {
+		ZWindow *zwindow = zwindows[i];
+		if( zwindow->idx < 0 ) continue;
+		++nz;
+	}
+	if( !nz ) return;
+	int zn = ceil(sqrt(nz));
+	int x1 = 1 + gui->get_x(), x2 = cwindow->gui->get_x();
+	int y1 = 1, y2 = gui->get_y();
+	int rw = gui->get_root_w(0), rh = gui->get_root_h(0);
+	if( x1 < 0 ) x1 = 0;
+	if( y1 < 0 ) y1 = 0;
+	if( x2 > rw ) x2 = rw;
+	if( y2 > rh ) y2 = rh;
+	int dx = x2 - x1, dy = y2 - y1;
+	int zw = dx / zn;
+	int lt = BC_DisplayInfo::get_left_border();
+	int top = BC_DisplayInfo::get_top_border();
+	int bw = lt + BC_DisplayInfo::get_right_border();  // borders
+	int bh = top + BC_DisplayInfo::get_bottom_border();
+	int zx = 0, zy = 0;  // window origins
+	int mw = 10+10, mh = 10+10; // canvas margins
+	int rsz = 0, n = 0, dz = 0;
+	int ow = edl->session->output_w, oh = edl->session->output_h;
+	for( int i=0; i<zwindows.size(); ++i ) {
+		ZWindow *zwindow = zwindows[i];
+		if( zwindow->idx < 0 ) continue;
+		int ww = zw - bw, hh = (ww - mw) * oh / ow + mh, zh = hh + bh;
+		if( rsz < hh ) rsz = hh;
+		int xx = zx + x1, yy = zy + y1;
+		int mx = x2 - zw, my = y2 - zh;
+		if( xx > mx ) xx = mx;
+		if( yy > my ) yy = my;
+		xx += lt + dz;  yy += top + dz;
+		zwindow->reposition(xx,yy, ww,hh);
+		if( zwindow->running() ) {
+			ZWindowGUI *gui = (ZWindowGUI *)zwindow->get_gui();
+			gui->lock_window("MWindow::tile_mixers");
+			gui->BC_WindowBase::reposition_window(xx,yy, ww,hh);
+			gui->unlock_window();
+		}
+		if( ++n >= zn ) {
+			n = 0;  rsz += bh;
+			if( (zy += rsz) > (dy - rsz) ) dz += 10;
+			rsz = 0;
+			zx = 0;
+		}
+		else
+			zx += zw;
+	}
+}
+
 void MWindow::init_cache()
 {
 	audio_cache = new CICache(preferences);
@@ -1061,21 +1412,21 @@ void MWindow::init_menus()
                            interlace_asset_fixmethods.append(new InterlacefixmethodItem(string, x));
 
 	// Interlacing Modes
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_UNDETECTED); // Not included in the list for the project options.
+	ILACEASSETMODELISTADD(ILACE_MODE_UNDETECTED); // Not included in the list for the project options.
 
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_TOP_FIRST);
-	ILACEPROJECTMODELISTADD(BC_ILACE_MODE_TOP_FIRST);
+	ILACEASSETMODELISTADD(ILACE_MODE_TOP_FIRST);
+	ILACEPROJECTMODELISTADD(ILACE_MODE_TOP_FIRST);
 
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_BOTTOM_FIRST);
-	ILACEPROJECTMODELISTADD(BC_ILACE_MODE_BOTTOM_FIRST);
+	ILACEASSETMODELISTADD(ILACE_MODE_BOTTOM_FIRST);
+	ILACEPROJECTMODELISTADD(ILACE_MODE_BOTTOM_FIRST);
 
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_NOTINTERLACED);
-	ILACEPROJECTMODELISTADD(BC_ILACE_MODE_NOTINTERLACED);
+	ILACEASSETMODELISTADD(ILACE_MODE_NOTINTERLACED);
+	ILACEPROJECTMODELISTADD(ILACE_MODE_NOTINTERLACED);
 
 	// Interlacing Fixing Methods
-	ILACEFIXMETHODLISTADD(BC_ILACE_FIXMETHOD_NONE);
-	ILACEFIXMETHODLISTADD(BC_ILACE_FIXMETHOD_UPONE);
-	ILACEFIXMETHODLISTADD(BC_ILACE_FIXMETHOD_DOWNONE);
+	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_NONE);
+	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_UPONE);
+	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_DOWNONE);
 }
 
 void MWindow::init_indexes()
@@ -1096,7 +1447,7 @@ void MWindow::init_gui()
 void MWindow::init_signals()
 {
 	sighandler = new SigHandler;
-	sighandler->initialize();
+	sighandler->initialize("/tmp/cinelerra_%d.dmp");
 ENABLE_BUFFER
 }
 
@@ -1132,25 +1483,35 @@ void MWindow::init_brender()
 		session->brender_end = 0;
 		brender_lock->unlock();
 	}
-	if(brender) brender->restart(edl);
+	brender_active = 0;
+	stop_brender();
 }
 
 void MWindow::restart_brender()
 {
 //printf("MWindow::restart_brender 1\n");
-	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)
 		{
@@ -1169,14 +1530,30 @@ int MWindow::brender_available(int position)
 	return result;
 }
 
-void MWindow::set_brender_start()
+void MWindow::set_brender_active(int v, int update)
 {
-	edl->session->brender_start = edl->local_session->get_selectionstart(1);
-	restart_brender();
-	gui->draw_overlays(1);
+	if( !preferences->use_brender ) v = 0;
+	brender_active = v;
+	gui->mainmenu->brender_active->set_checked(v);
+	if( v != 0 ) {
+		edl->session->brender_start = edl->local_session->get_selectionstart(1);
+		edl->session->brender_end = edl->local_session->get_selectionend(1);
+
+		if(EQUIV(edl->session->brender_end, edl->session->brender_start)) {
+			edl->session->brender_end = edl->tracks->total_video_length();
+		}
+		restart_brender();
+	}
+	else {
+		edl->session->brender_start = edl->session->brender_end = 0;
+		stop_brender();
+	}
+	if( update ) {
+		gui->update_timebar(0);
+		gui->draw_overlays(1);
+	}
 }
 
-
 int MWindow::has_commercials()
 {
 	return theme->use_commercials;
@@ -1275,22 +1652,20 @@ int MWindow::put_commercial()
 
 void MWindow::stop_playback(int wait)
 {
-	int locked  = gui->get_window_lock();
-        if( locked ) gui->unlock_window();
+	gui->stop_drawing();
 
-	cwindow->playback_engine->que->send_command(STOP,
-		CHANGE_NONE,
-		0,
-		0);
-	cwindow->playback_engine->interrupt_playback(wait);
+	cwindow->stop_playback(wait);
 
 	for(int i = 0; i < vwindows.size(); i++) {
 		VWindow *vwindow = vwindows[i];
 		if( !vwindow->is_running() ) continue;
-		vwindow->playback_engine->que->send_command(STOP, CHANGE_NONE, 0, 0);
-		vwindow->playback_engine->interrupt_playback(wait);
+		vwindow->stop_playback(wait);
+	}
+	for(int i = 0; i < zwindows.size(); i++) {
+		ZWindow *zwindow = zwindows[i];
+		if( zwindow->idx < 0 ) continue;
+		zwindow->stop_playback(wait);
 	}
-        if( locked ) gui->lock_window("MWindow::stop_playback");
 }
 
 int MWindow::load_filenames(ArrayList<char*> *filenames,
@@ -1308,7 +1683,9 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 
 // Need to stop playback since tracking depends on the EDL not getting
 // deleted.
+	gui->unlock_window();
 	stop_playback(1);
+	gui->lock_window("MWindow::load_filenames 0");
 
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 	undo->update_undo_before();
@@ -1369,14 +1746,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;
@@ -1407,17 +1780,16 @@ 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
 			case FILE_UNRECOGNIZED_CODEC:
 			{
 // Test index file
-				IndexFile indexfile(this, new_asset);
-				result = indexfile.open_index();
-				if(!result)
-				{
-					indexfile.close_index();
+				{	IndexFile indexfile(this, new_asset);
+					if( !(result = indexfile.open_index()) )
+						indexfile.close_index();
 				}
 
 // Test existing EDLs
@@ -1426,7 +1798,7 @@ SET_TRACE
 						new_edls[j]->assets->get_asset(new_asset->path) :
 						edl->assets->get_asset(new_asset->path);
 					if( old_asset ) {
-						*new_asset = *old_asset;
+						new_asset->copy_from(old_asset,1);
 						result = 0;
 					}
 				}
@@ -1499,7 +1871,29 @@ SET_TRACE
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 				xml_file.read_from_file(filenames->get(i));
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
-
+				const char *cin_version = 0;
+				while( !xml_file.read_tag() ) {
+					if( xml_file.tag.title_is("EDL") ) {
+						cin_version = xml_file.tag.get_property("VERSION");
+						break;
+					}
+				}
+				xml_file.rewind();
+				if( !cin_version ) {
+					eprintf(_("XML file %s\n not from cinelerra."),filenames->get(i));
+					char string[BCTEXTLEN];
+					sprintf(string,_("Unknown %s"), filenames->get(i));
+					gui->show_message(string);
+					result = 1;
+					break;
+				}
+				if( strcmp(cin_version, CINELERRA_VERSION) ) {
+					char string[BCTEXTLEN];
+					snprintf(string, sizeof(string),
+						 _("Warning: XML from cinelerra version %s\n"
+						"Session data may be incompatible."), cin_version);
+					show_warning(&preferences->warn_version, string);
+				}
 				if(load_mode == LOADMODE_NESTED)
 				{
 // Load temporary EDL for nesting.
@@ -1528,6 +1922,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);
@@ -1548,12 +1951,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__);
@@ -1576,10 +1977,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,
@@ -1607,32 +2005,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__);
 
@@ -1660,10 +2052,6 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 						show_plugin(plugin);
 					}
 				}
-				else
-				{
-					plugin->show = 0;
-				}
 
 				plugin = (Plugin*)plugin->next;
 			}
@@ -1677,15 +2065,42 @@ 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->preview_end = 0;
 		edl->local_session->loop_playback = 0;
 		edl->local_session->set_selectionstart(0);
 		edl->local_session->set_selectionend(0);
+		set_brender_active(0, 0);
 		fit_selection();
 		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__);
@@ -1730,8 +2145,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)
 {
@@ -1844,7 +2286,6 @@ void MWindow::create_objects(int want_gui,
 	int want_new,
 	char *config_path)
 {
-	FileSystem fs;
 	const int debug = 0;
 	if(debug) PRINT_TRACE
 
@@ -1860,6 +2301,7 @@ void MWindow::create_objects(int want_gui,
 	if(debug) PRINT_TRACE
 	default_standard = default_std();
 	init_defaults(defaults, config_path);
+	check_language();
 	init_preferences();
 	if(splash_window)
 		splash_window->operation->update(_("Initializing Plugins"));
@@ -1867,6 +2309,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
@@ -1895,6 +2338,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());
 
@@ -1906,24 +2352,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();
@@ -2067,7 +2510,18 @@ ENABLE_BUFFER
 
 void MWindow::run()
 {
+	run_lock->lock("MWindow::run");
 	gui->run_window();
+	stop_playback(1);
+
+	brender_lock->lock("MWindow::run 1");
+	delete brender;         brender = 0;
+	brender_lock->unlock();
+
+	interrupt_indexes();
+	clean_indexes();
+	save_defaults();
+	run_lock->unlock();
 }
 
 void MWindow::show_vwindow()
@@ -2134,6 +2588,14 @@ void MWindow::show_gwindow()
 
 	gui->mainmenu->show_gwindow->set_checked(1);
 }
+void MWindow::hide_gwindow()
+{
+	session->show_gwindow = 0;
+
+	gwindow->gui->lock_window("MWindow::show_gwindow");
+	gwindow->gui->hide_window();
+	gwindow->gui->unlock_window();
+}
 
 void MWindow::show_lwindow()
 {
@@ -2196,6 +2658,22 @@ void MWindow::set_auto_keyframes(int value, int lock_mwindow, int lock_cwindow)
 	if(lock_cwindow) cwindow->gui->unlock_window();
 }
 
+void MWindow::set_auto_visibility(Autos *autos, int value)
+{
+	if( autos->type == Autos::AUTOMATION_TYPE_PLUGIN )
+		edl->session->auto_conf->plugins = value;
+	else if( autos->autoidx >= 0 )
+		edl->session->auto_conf->autos[autos->autoidx] = value;
+	else
+		return;
+
+	gui->update(0, 1, 0, 0, 0, 0, 0);
+	gui->mainmenu->update_toggles(1);
+	gui->unlock_window();
+	gwindow->gui->update_toggles(1);
+	gui->lock_window("MWindow::set_auto_visibility");
+}
+
 void MWindow::set_keyframe_type(int mode)
 {
 	gui->lock_window("MWindow::set_keyframe_type");
@@ -2275,10 +2753,7 @@ void MWindow::sync_parameters(int change_type)
 	}
 	else
 	{
-		cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-							change_type,
-							edl,
-							1);
+		cwindow->refresh_frame(change_type);
 	}
 }
 
@@ -2388,12 +2863,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);
 
@@ -2405,8 +2879,8 @@ SET_TRACE
 // Needs mwindow to do GUI
 			gui->set_mwindow(this);
 			gui->open_plugin(0, preferences, edl, plugin);
-			gui->show_gui();
 			plugin->show = 1;
+			gui->show_gui();
 		}
 	}
 	plugin_gui_lock->unlock();
@@ -2772,7 +3246,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
@@ -2794,8 +3268,8 @@ void MWindow::update_project(int load_mode)
 	if(debug) PRINT_TRACE
 
 // Close all the vwindows
-	if(load_mode == LOADMODE_REPLACE ||
-		load_mode == LOADMODE_REPLACE_CONCATENATE) {
+	if( load_mode == LOADMODE_REPLACE ||
+	    load_mode == LOADMODE_REPLACE_CONCATENATE ) {
 		if(debug) PRINT_TRACE
 		int first_vwindow = 0;
 		if(session->show_vwindow) first_vwindow = 1;
@@ -2813,13 +3287,24 @@ void MWindow::update_project(int load_mode)
 			vwindow->close_window();
 		}
 		if(debug) PRINT_TRACE
+		select_zwindow(0);
+		close_mixers();
+
+		for( int i=0; i<edl->mixers.size(); ++i ) {
+			Mixer *mixer = edl->mixers[i];
+			ZWindow *zwindow = get_mixer(mixer);
+			zwindow->set_title(mixer->title);
+			zwindow->start();
+		}
 	}
-	else if(vwindows.size()) {
-		VWindow *vwindow = vwindows[DEFAULT_VWINDOW];
-		if( vwindow->is_running() ) {
-			vwindow->gui->lock_window("MWindow::update_project");
-			vwindow->update(1);
-			vwindow->gui->unlock_window();
+	else {
+		if(vwindows.size()) {
+			VWindow *vwindow = vwindows[DEFAULT_VWINDOW];
+			if( vwindow->is_running() ) {
+				vwindow->gui->lock_window("MWindow::update_project");
+				vwindow->update(1);
+				vwindow->gui->unlock_window();
+			}
 		}
 	}
 
@@ -2829,15 +3314,13 @@ void MWindow::update_project(int load_mode)
 	cwindow->gui->unlock_window();
 
 	if(debug) PRINT_TRACE
-	cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-		CHANGE_ALL,
-		edl,
-		1);
+	cwindow->refresh_frame(CHANGE_ALL);
 
 	awindow->gui->async_update_assets();
 	if(debug) PRINT_TRACE
 
 	gui->lock_window("MWindow::update_project");
+	gui->update_mixers(0, 0);
 	gui->flush();
 	if(debug) PRINT_TRACE
 }
@@ -2864,9 +3347,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);
 	}
@@ -2970,25 +3457,25 @@ void MWindow::reset_caches()
 	wave_cache->remove_all();
 	audio_cache->remove_all();
 	video_cache->remove_all();
-	if( cwindow->playback_engine && cwindow->playback_engine->audio_cache )
-		cwindow->playback_engine->audio_cache->remove_all();
-	if( cwindow->playback_engine && cwindow->playback_engine->video_cache )
-		cwindow->playback_engine->video_cache->remove_all();
-
+	if( cwindow->playback_engine ) {
+		if( cwindow->playback_engine->audio_cache )
+			cwindow->playback_engine->audio_cache->remove_all();
+		if( cwindow->playback_engine->video_cache )
+			cwindow->playback_engine->video_cache->remove_all();
+	}
 	for(int i = 0; i < vwindows.size(); i++) {
 		VWindow *vwindow = vwindows[i];
 		if( !vwindow->is_running() ) continue;
-		if(vwindow->playback_engine && vwindow->playback_engine->audio_cache)
+		if( !vwindow->playback_engine ) continue;
+		if( vwindow->playback_engine->audio_cache )
 			vwindow->playback_engine->audio_cache->remove_all();
-		if(vwindow->playback_engine && vwindow->playback_engine->video_cache)
+		if( vwindow->playback_engine->video_cache )
 			vwindow->playback_engine->video_cache->remove_all();
 	}
 }
 
 void MWindow::remove_asset_from_caches(Asset *asset)
 {
-	gui->resource_thread->get_video_source(0);
-	gui->resource_thread->get_audio_source(0);
 	frame_cache->remove_asset(asset);
 	wave_cache->remove_asset(asset);
 	audio_cache->delete_entry(asset);
@@ -3000,9 +3487,10 @@ void MWindow::remove_asset_from_caches(Asset *asset)
 	for(int i = 0; i < vwindows.size(); i++) {
 		VWindow *vwindow = vwindows[i];
 		if( !vwindow->is_running() ) continue;
-		if(vwindow->playback_engine && vwindow->playback_engine->audio_cache)
+		if( !vwindow->playback_engine ) continue;
+		if( vwindow->playback_engine->audio_cache )
 			vwindow->playback_engine->audio_cache->delete_entry(asset);
-		if(vwindow->playback_engine && vwindow->playback_engine->video_cache)
+		if( vwindow->playback_engine->video_cache )
 			vwindow->playback_engine->video_cache->delete_entry(asset);
 	}
 }
@@ -3011,8 +3499,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);
 	}
 
@@ -3029,11 +3517,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();
@@ -3041,29 +3529,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
@@ -3120,15 +3601,26 @@ void MWindow::dump_undo(FILE *fp)
 
 void MWindow::dump_exe(FILE *fp)
 {
-        char proc_path[BCTEXTLEN], exe_path[BCTEXTLEN];
-        sprintf(proc_path, "/proc/%d/exe", (int)getpid());
-        int ret = readlink(proc_path, exe_path, sizeof(exe_path));
-	if( ret < 0 ) { fprintf(fp,"readlink: %m\n"); return; }
-	exe_path[ret] = 0;
+	char proc_path[BCTEXTLEN], exe_path[BCTEXTLEN];
+	sprintf(proc_path, "/proc/%d/exe", (int)getpid());
+
+	int ret = -1, n = 100;
+	for( int len; (len=readlink(proc_path, exe_path, sizeof(exe_path)))>0; --n ) {
+		exe_path[len] = 0;  strcpy(proc_path, exe_path);
+		ret = 0;
+	}
+	if( n < 0 || ret < 0 ) { fprintf(fp,"readlink: %m\n"); return; }
+
 	struct stat st;
-	if( stat(exe_path,&st) ) { fprintf(fp,"stat: %m\n"); return; }
-	fprintf(fp, "path: %s = %9jd bytes\n",exe_path,st.st_size);
-	int fd = open(exe_path,O_RDONLY+O_NONBLOCK);
+	if( stat(proc_path,&st) ) { fprintf(fp,"stat: %m\n"); return; }
+	fprintf(fp, "path: %s = %9jd bytes\n",proc_path,st.st_size);
+	struct tm *tm = localtime(&st.st_mtime);
+	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;
 	int64_t bfrsz = 0;
@@ -3152,6 +3644,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");
 }
 
@@ -3164,7 +3657,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);
 }
 
@@ -3425,10 +3918,13 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 	EDLSession *session = edl->session;
 	double old_framerate = session->frame_rate;
 	double old_samplerate = session->sample_rate;
+	int old_auto_keyframes = session->auto_keyframes;
+	session->auto_keyframes = 0;
 	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.
@@ -3467,7 +3963,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 					next_edit = edit->next;
 					if( edit->channel != vstream ||
 					    !edit->asset || !edit->asset->is_asset ||
-					    *asset != *edit->asset )
+					    !asset->equivalent(*edit->asset,1,1,edl) )
 						delete edit;
 				}
 			}
@@ -3478,12 +3974,13 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 			else if( delete_tracks )
 				edl->tracks->delete_track(track);
 		}
+		edl->retrack();
 		edl->resample(old_framerate, session->frame_rate, TRACK_VIDEO);
 	}
 	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;
@@ -3527,7 +4024,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 					next_edit = edit->next;
 					if( !((1<<edit->channel) & channel_mask) ||
 					    !edit->asset || !edit->asset->is_asset ||
-					    *asset != *edit->asset )
+					    !asset->equivalent(*edit->asset,1,1,edl) )
 						delete edit;
 				}
 				if( !track->edits->first )
@@ -3538,6 +4035,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 		edl->resample(old_samplerate, session->sample_rate, TRACK_AUDIO);
 	}
 	delete file;
+	session->auto_keyframes = old_auto_keyframes;
 	if( !result && delete_tracks > 0 ) {
 		save_backup();
 		undo->update_undo_after(_("select asset"), LOAD_ALL);
@@ -3566,3 +4064,49 @@ void MWindow::dump_plugindb(FILE *fp)
 		plugindb->get(i)->dump(fp);
 }
 
+FloatAuto* MWindow::get_float_auto(PatchGUI *patch,int idx)
+{
+	Auto *current = 0;
+	double unit_position = edl->local_session->get_selectionstart(1);
+	unit_position = patch->track->to_units(unit_position, 0);
+
+	FloatAutos *ptr = (FloatAutos*)patch->track->automation->autos[idx];
+	return (FloatAuto*)ptr->get_prev_auto( (long)unit_position, PLAY_FORWARD, current);
+}
+
+IntAuto* MWindow::get_int_auto(PatchGUI *patch,int idx)
+{
+	Auto *current = 0;
+	double unit_position = edl->local_session->get_selectionstart(1);
+	unit_position = patch->track->to_units(unit_position, 0);
+
+	IntAutos *ptr = (IntAutos*)patch->track->automation->autos[idx];
+	return (IntAuto*)ptr->get_prev_auto( (long)unit_position, PLAY_FORWARD, current);
+}
+
+PanAuto* MWindow::get_pan_auto(PatchGUI *patch)
+{
+	Auto *current = 0;
+	double unit_position = edl->local_session->get_selectionstart(1);
+	unit_position = patch->track->to_units(unit_position, 0);
+
+	PanAutos *ptr = (PanAutos*)patch->track->automation->autos[AUTOMATION_PAN];
+	return (PanAuto*)ptr->get_prev_auto( (long)unit_position, PLAY_FORWARD, current);
+}
+
+PatchGUI *MWindow::get_patchgui(Track *track)
+{
+	PatchGUI *patchgui = 0;
+	TimelinePane **panes = gui->pane;
+        for( int i=0; i<TOTAL_PANES && !patchgui; ++i ) {
+                if( !panes[i] ) continue;
+                PatchBay *patchbay = panes[i]->patchbay;
+                if( !patchbay ) continue;
+                for( int j=0; j<patchbay->patches.total && !patchgui; ++j ) {
+                        if( patchbay->patches.values[j]->track == track )
+                                patchgui = patchbay->patches.values[j];
+                }
+        }
+        return patchgui;
+}
+