X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=0bfd3770b58e6fbbc4090e5cbe096f0eab411aa9;hb=564227981f9c1b021445fa0352b75c7670172912;hp=633af24ad9e45ca582c0fe0165518944b978bf75;hpb=5c3e5d5e76c29b49708b4e42d194402150b508ab;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 633af24a..0bfd3770 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"
@@ -104,6 +105,7 @@
 #include "theme.h"
 #include "threadloader.h"
 #include "timebar.h"
+#include "timelinepane.h"
 #include "tipwindow.h"
 #include "trackcanvas.h"
 #include "track.h"
@@ -123,6 +125,8 @@
 #include "wavecache.h"
 #include "wwindow.h"
 #include "zoombar.h"
+#include "zwindow.h"
+#include "zwindowgui.h"
 #include "exportedl.h"
 
 #include "defaultformats.h"
@@ -181,6 +185,7 @@ MWindow::MWindow()
 	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");
 
@@ -232,10 +237,8 @@ MWindow::MWindow()
 MWindow::~MWindow()
 {
 	run_lock->lock("MWindow::~MWindow");
-	stop_playback(1);
 	in_destructor = 1;
 //printf("MWindow::~MWindow %d\n", __LINE__);
-	gui->stop_drawing();
 	gui->remote_control->deactivate();
 	gui->record->stop();
 #ifdef HAVE_DVB
@@ -247,6 +250,7 @@ MWindow::~MWindow()
 	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");
@@ -273,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();
@@ -293,6 +298,7 @@ MWindow::~MWindow()
 	close_gui(twindow);
 	close_gui(wwindow);
 	vwindows.remove_all_objects();
+	zwindows.remove_all_objects();
 	gui->close(0);
 	join();
 #endif
@@ -337,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();
@@ -896,6 +903,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()
@@ -1061,8 +1069,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());
 }
 
@@ -1116,6 +1124,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);
@@ -1406,17 +1651,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->stop_playback();
+	cwindow->stop_playback(wait);
 
 	for(int i = 0; i < vwindows.size(); i++) {
 		VWindow *vwindow = vwindows[i];
 		if( !vwindow->is_running() ) continue;
-		vwindow->playback_engine->stop_playback();
+		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,
@@ -1434,7 +1682,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();
@@ -1818,7 +2068,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 		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 = edl->tracks->total_length();
 		edl->local_session->loop_playback = 0;
 		edl->local_session->set_selectionstart(0);
 		edl->local_session->set_selectionend(0);
@@ -2502,10 +2752,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);
 	}
 }
 
@@ -3020,8 +3267,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;
@@ -3039,13 +3286,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();
+			}
 		}
 	}
 
@@ -3055,15 +3313,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
 }
@@ -3200,25 +3456,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);
@@ -3230,9 +3486,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);
 	}
 }
@@ -3399,7 +3656,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);
 }
 
@@ -3836,4 +4093,19 @@ PanAuto* MWindow::get_pan_auto(PatchGUI *patch)
 	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;
+}