X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=f072467e39a6c3475a4aacb2ca72be2026c80d53;hb=9a75aafbc51be29b49351a51e9084bb34d255c0d;hp=73df71401e603fe569df21ebde0bac0dd3630c5b;hpb=a6e4ede4b9a11b56b3aece044ff2a1546630ca38;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 73df7140..f072467e 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -243,6 +243,7 @@ MWindow::MWindow()
 	in_destructor = 0;
 	speed_edl = 0;
 	beeper = 0;
+	redraw_tracks = 0;
 	shuttle = 0;
 	wintv = 0;
 	x10tv = 0;
@@ -265,9 +266,10 @@ MWindow::~MWindow()
 #ifdef HAVE_DVB
 	gui->channel_info->stop();
 #endif
-	delete beeper;
-	delete create_bd;       create_bd = 0;
-	delete create_dvd;      create_dvd = 0;
+	delete beeper;		beeper = 0;
+	delete redraw_tracks;	redraw_tracks = 0;
+	delete create_bd;	create_bd = 0;
+	delete create_dvd;	create_dvd = 0;
 #ifdef HAVE_SHUTTLE
 	delete shuttle;         shuttle = 0;
 #endif
@@ -1210,10 +1212,23 @@ ZWindow *MWindow::get_mixer(Mixer *&mixer)
 	return zwindow;
 }
 
-void MWindow::del_mixer(ZWindow *zwindow)
+ZWindow *MWindow::get_mixer(int idx)
 {
-	zwindows_lock->lock("MWindow::del_mixer 0");
-	edl->mixers.del_mixer(zwindow->idx);
+	ZWindow *zwindow = 0;
+	zwindows_lock->lock("MWindow::get_mixer");
+	for( int i=0; !zwindow && i<zwindows.size(); ++i ) {
+		ZWindow *zwdw = zwindows[i];
+		if( !zwdw->running() ) continue;
+		if( zwdw->idx != idx ) continue;
+		zwindow = zwindows[i];
+	}
+	zwindows_lock->unlock();
+	return zwindow;
+}
+
+void MWindow::close_mixer(ZWindow *zwindow)
+{
+	zwindows_lock->lock("MWindow::close_mixer 0");
 	if( session->selected_zwindow >= 0 ) {
 		int i = zwindows.number_of(zwindow);
 		if( i >= 0 && i < session->selected_zwindow )
@@ -1222,7 +1237,7 @@ void MWindow::del_mixer(ZWindow *zwindow)
 			session->selected_zwindow = -1;
 	}
 	zwindows_lock->unlock();
-	gui->lock_window("MWindow::del_mixer 1");
+	gui->lock_window("MWindow::close_mixer 1");
 	gui->update_mixers(0, -1);
 	gui->unlock_window();
 }
@@ -1297,11 +1312,11 @@ void MWindow::handle_mixers(EDL *edl, int command, int wait_tracking,
 			k = mixer->mixer_ids.size();
 			while( --k >= 0 && track->get_mixer_id() != mixer->mixer_ids[k] );
 			if( k >= 0 ) {
-				track->record = 1;
+				track->armed = 1;
 				track->play = track->data_type == TRACK_VIDEO ? 1 : 0;
 			}
 			else
-				track->record = track->play = 0;
+				track->armed = track->play = 0;
 		}
 		zwindow->change_source(mixer_edl);
 		zwindow->handle_mixer(command, 0,
@@ -1356,7 +1371,7 @@ ZWindow *MWindow::create_mixer(Indexable *indexable, double position)
 	Mixer *mixer = 0;
 	ZWindow *zwindow = get_mixer(mixer);
 	while( track ) {
-		track->play = track->record = 0;
+		track->play = track->armed = 0;
 		if( track->data_type == TRACK_VIDEO ) {
 			sprintf(track->title, _("Mixer %d"), zwindow->idx);
 		}
@@ -1499,6 +1514,14 @@ void MWindow::tile_mixers()
 	}
 }
 
+void MWindow::set_gang_tracks(int v)
+{
+	edl->session->gang_tracks = v;
+	gui->update(1, 1, 0, 0, 1, 0, 0);
+	gui->flush();
+}
+
+
 void MWindow::init_cache()
 {
 	audio_cache = new CICache(preferences);
@@ -1769,7 +1792,7 @@ int MWindow::put_commercial()
 	//check it
 	for(Track *track=tracks->first; track && !errmsg; track=track->next) {
 		if( track->data_type != TRACK_VIDEO ) continue;
-		if( !track->record ) continue;
+		if( !track->armed ) continue;
 		if( count > 0 ) { errmsg = _("multiple video tracks"); break; }
 		++count;
 		int64_t units_start = track->to_units(start,0);
@@ -1789,7 +1812,7 @@ int MWindow::put_commercial()
 	//run it
 	for(Track *track=tracks->first; track && !errmsg; track=track->next) {
 		if( track->data_type != TRACK_VIDEO ) continue;
-		if( !track->record ) continue;
+		if( !track->armed ) continue;
 		int64_t units_start = track->to_units(start,0);
 		int64_t units_end = track->to_units(end,0);
 		Edits *edits = track->edits;
@@ -2974,6 +2997,7 @@ void MWindow::show_lwindow()
 
 void MWindow::restore_windows()
 {
+	gui->unlock_window();
 	if( !session->show_vwindow ) {
 		for( int i=0, n=vwindows.size(); i<n; ++i ) {
 			VWindow *vwindow = vwindows[i];
@@ -3018,6 +3042,7 @@ void MWindow::restore_windows()
 	else if( session->show_lwindow && lwindow->gui->is_hidden() )
 		show_lwindow();
 
+	gui->lock_window("MWindow::restore_windows");
 	gui->focus();
 }
 
@@ -3750,6 +3775,7 @@ void MWindow::update_project(int load_mode)
 
 		for( int i=0; i<edl->mixers.size(); ++i ) {
 			Mixer *mixer = edl->mixers[i];
+			if( !mixer->show ) continue;
 			ZWindow *zwindow = get_mixer(mixer);
 			zwindow->set_title(mixer->title);
 			zwindow->start();
@@ -3964,7 +3990,7 @@ void MWindow::clip_to_media()
 		return;
 	}
 	undo_before();
-	awindow->gui->close_view_popup();
+	awindow->gui->stop_vicon_drawing();
 	int clips_total = session->drag_clips->total;
 	for( int i=0; i<clips_total; ++i ) {
 		EDL *clip = session->drag_clips->values[i];
@@ -4441,7 +4467,7 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height)
 
 void MWindow::reset_caches()
 {
-	awindow->gui->close_view_popup();
+	awindow->gui->stop_vicon_drawing();
 	frame_cache->remove_all();
 	wave_cache->remove_all();
 	audio_cache->remove_all();
@@ -4465,7 +4491,7 @@ void MWindow::reset_caches()
 
 void MWindow::remove_from_caches(Indexable *idxbl)
 {
-	awindow->gui->close_view_popup();
+	awindow->gui->stop_vicon_drawing();
 	frame_cache->remove_item(idxbl);
 	wave_cache->remove_item(idxbl);
 	if( gui->render_engine &&
@@ -4505,7 +4531,7 @@ void MWindow::remove_from_caches(Indexable *idxbl)
 void MWindow::remove_assets_from_project(int push_undo, int redraw, int delete_indexes,
 		ArrayList<Indexable*> *drag_assets, ArrayList<EDL*> *drag_clips)
 {
-	awindow->gui->close_view_popup();
+	awindow->gui->stop_vicon_drawing();
 
 // Remove from VWindow.
 	if( drag_clips ) {
@@ -4989,7 +5015,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 				track->track_h = edl->session->output_h;
 			}
 			else if( delete_tracks )
-				edl->tracks->delete_track(track);
+				edl->tracks->delete_track(track, 0);
 		}
 		edl->retrack();
 		edl->resample(old_framerate, session->frame_rate, TRACK_VIDEO);
@@ -5025,7 +5051,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 						delete edit;
 				}
 				if( !track->edits->first )
-					edl->tracks->delete_track(track);
+					edl->tracks->delete_track(track, 0);
 			}
 		}
 		edl->rechannel();
@@ -5121,3 +5147,28 @@ int MWindow::get_cpus()
 	return get_cpus(edl->session->output_w, edl->session->output_h);
 }
 
+void MWindow::draw_trackmovement()
+{
+	if( !redraw_tracks )
+		redraw_tracks = new DrawTrackMovement(this);
+	redraw_tracks->start();
+}
+
+DrawTrackMovement::DrawTrackMovement(MWindow *mwindow)
+ : Thread(1, 0, 0)
+{
+	this->mwindow = mwindow;
+}
+DrawTrackMovement::~DrawTrackMovement()
+{
+	join();
+}
+
+void DrawTrackMovement::run()
+{
+	mwindow->gui->lock_window("DrawTrackMovement::run");
+	mwindow->edl->tracks->update_y_pixels(mwindow->theme);
+	mwindow->gui->draw_trackmovement();
+	mwindow->gui->unlock_window();
+}
+