X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=e27d40373dab38bd51e9ec63dbd3c811fa7d1fad;hb=74afbc29ac4ce9d94d53e10342979f2c59f1f193;hp=4d77f8a96b48d18d0eeeb380a8af57d9a4e8c758;hpb=0513350234a8dcd08e5a0117d5121724ef7b76b6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 4d77f8a9..e27d4037 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -74,6 +74,7 @@
 #include "vwindow.h"
 #include "vwindowgui.h"
 #include "zoombar.h"
+#include "zwindow.h"
 #include "automation.h"
 #include "maskautos.h"
 
@@ -96,8 +97,7 @@ void MWindow::add_audio_track_entry(int above, Track *dst)
 //	gui->cursor->draw(1);
 //	gui->canvas->flash();
 //	gui->canvas->activate();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 void MWindow::add_video_track_entry(Track *dst)
@@ -116,8 +116,7 @@ void MWindow::add_video_track_entry(Track *dst)
 //	gui->cursor->draw(1);
 //	gui->canvas->flash();
 //	gui->canvas->activate();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 	save_backup();
 }
 
@@ -137,8 +136,7 @@ void MWindow::add_subttl_track_entry(Track *dst)
 //	gui->cursor->draw(1);
 //	gui->canvas->flash();
 //	gui->canvas->activate();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 	save_backup();
 }
 
@@ -301,7 +299,7 @@ void MWindow::asset_to_rate()
 void MWindow::clear_entry()
 {
 	undo->update_undo_before();
-	clear(1, 1);
+	clear(1);
 
 	edl->optimize();
 	save_backup();
@@ -311,11 +309,10 @@ void MWindow::clear_entry()
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
-void MWindow::clear(int clear_handle, int deglitch)
+void MWindow::clear(int clear_handle)
 {
 	double start = edl->local_session->get_selectionstart();
 	double end = edl->local_session->get_selectionend();
@@ -326,12 +323,6 @@ void MWindow::clear(int clear_handle, int deglitch)
 			edl->session->plugins_follow_edits,
 			edl->session->autos_follow_edits);
 	}
-	
-// always needed by paste operations
-	if(deglitch)
-	{
-		edl->deglitch(start);
-	}
 }
 
 void MWindow::set_automation_mode(int mode)
@@ -414,8 +405,7 @@ void MWindow::concatenate_tracks()
 
 	restart_brender();
 	gui->update(1, 1, 0, 0, 1, 0, 0);
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 
@@ -511,8 +501,7 @@ void MWindow::crop_video()
 	undo->update_undo_after(_("crop"), LOAD_ALL);
 
 	restart_brender();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_ALL, edl, 1);
+	cwindow->refresh_frame(CHANGE_ALL);
 	save_backup();
 }
 
@@ -520,7 +509,25 @@ void MWindow::cut()
 {
 	double start = edl->local_session->get_selectionstart();
 	double end = edl->local_session->get_selectionend();
-	cut(start, end);
+	if( EQUIV(start,end) )
+		blade(start);
+	else
+		cut(start, end);
+}
+
+void MWindow::blade(double position)
+{
+	undo->update_undo_before();
+	edl->blade(position);
+	edl->optimize();
+	save_backup();
+	undo->update_undo_after(_("blade"), LOAD_EDITS | LOAD_TIMEBAR);
+	restart_brender();
+	update_plugin_guis();
+	gui->update(1, 2, 1, 1, 1, 1, 0);
+	cwindow->update(1, 0, 0, 0, 1);
+	awindow->gui->async_update_assets();
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 void MWindow::cut(double start, double end, double new_position)
@@ -531,8 +538,6 @@ void MWindow::cut(double start, double end, double new_position)
 		edl->session->labels_follow_edits,
 		edl->session->plugins_follow_edits,
 		edl->session->autos_follow_edits);
-	edl->deglitch(start);
-
 
 	edl->optimize();
 	save_backup();
@@ -545,8 +550,8 @@ void MWindow::cut(double start, double end, double new_position)
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	awindow->gui->async_update_assets();
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 void MWindow::snap_left_edit()
@@ -626,19 +631,6 @@ int MWindow::cut_default_keyframe()
 }
 
 
-void MWindow::delete_inpoint()
-{
-	edl->local_session->unset_inpoint();
-	save_backup();
-}
-
-void MWindow::delete_outpoint()
-{
-	edl->local_session->unset_outpoint();
-	save_backup();
-}
-
-
 void MWindow::delete_track()
 {
 	if( edl->tracks->last )
@@ -656,8 +648,7 @@ void MWindow::delete_tracks()
 	update_plugin_states();
 
 	gui->update(1, 1, 1, 0, 1, 0, 0);
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 void MWindow::delete_track(Track *track)
@@ -670,8 +661,7 @@ void MWindow::delete_track(Track *track)
 	update_plugin_states();
 
 	gui->update(1, 1, 1, 0, 1, 0, 0);
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 	save_backup();
 }
 
@@ -872,14 +862,12 @@ void MWindow::finish_modify_handles()
 //printf("MWindow::finish_modify_handles %d\n", __LINE__);
 		edl->local_session->set_selectionstart(session->drag_position);
 		edl->local_session->set_selectionend(session->drag_position);
-		edl->deglitch(session->drag_position);
 	}
 	else
 	if( edit_mode != MOVE_NO_EDITS ) {
 //printf("MWindow::finish_modify_handles %d\n", __LINE__);
 		edl->local_session->set_selectionstart(session->drag_start);
 		edl->local_session->set_selectionend(session->drag_start);
-		edl->deglitch(session->drag_start);
 	}
 
 // clamp the selection to 0
@@ -894,6 +882,8 @@ void MWindow::finish_modify_handles()
 	sync_parameters(CHANGE_EDL);
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
+// label list can be modified
+	awindow->gui->async_update_assets();
 	cwindow->update(1, 0, 0, 0, 1);
 }
 
@@ -929,8 +919,7 @@ void MWindow::move_edits(ArrayList<Edit*> *edits,
 	undo->update_undo_after(_("move edit"), LOAD_ALL);
 
 	restart_brender();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 
 	update_plugin_guis();
 	gui->update(1, 1,      // 1 for incremental drawing.  2 for full refresh
@@ -945,8 +934,7 @@ void MWindow::move_effect(Plugin *plugin, Track *track, int64_t position)
 	undo->update_undo_after(_("paste effect"), LOAD_ALL);
 
 	restart_brender();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1); 
+	cwindow->refresh_frame(CHANGE_EDL);
 	update_plugin_guis();
 	gui->update(1, 1,      // 1 for incremental drawing.  2 for full refresh
 		0, 0, 0, 0, 0);
@@ -960,8 +948,7 @@ void MWindow::move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t positio
 	undo->update_undo_after(_("move effect"), LOAD_ALL);
 
 	restart_brender();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 	update_plugin_guis();
 	gui->update(1, 1,      // 1 for incremental drawing.  2 for full refresh
 		0, 0, 0, 0, 0);
@@ -1059,18 +1046,14 @@ void MWindow::mute_selection()
 		edl->paste_silence(start, end, 0,
 			edl->session->plugins_follow_edits,
 			edl->session->autos_follow_edits);
-		edl->deglitch(start);
-		edl->deglitch(end);
 
-		
 		save_backup();
 		undo->update_undo_after(_("mute"), LOAD_EDITS);
 
 		restart_brender();
 		update_plugin_guis();
 		gui->update(1, 2, 1, 1, 1, 1, 0);
-		cwindow->playback_engine->que->
-			send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+		cwindow->refresh_frame(CHANGE_EDL);
 	}
 }
 
@@ -1124,7 +1107,7 @@ int MWindow::paste(double start,
 	int edit_plugins,
 	int edit_autos)
 {
-	clear(0, 1);
+	clear(0);
 
 // Want to insert with assets shared with the master EDL.
 	insert(start, file,
@@ -1147,7 +1130,7 @@ void MWindow::paste()
 		gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
 		FileXML file;
 		file.read_from_string(string);
-		clear(0, 1);
+		clear(0);
 
 		insert(start, &file,
 			edl->session->labels_follow_edits,
@@ -1626,8 +1609,6 @@ void MWindow::paste_silence()
 		edl->session->labels_follow_edits,
 		edl->session->plugins_follow_edits,
 		edl->session->autos_follow_edits);
-	edl->deglitch(start);
-	edl->deglitch(end);
 	edl->optimize();
 	save_backup();
 	undo->update_undo_after(_("silence"), LOAD_EDITS | LOAD_TIMEBAR);
@@ -1636,8 +1617,7 @@ void MWindow::paste_silence()
 	restart_brender();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 void MWindow::detach_transition(Transition *transition)
@@ -1880,22 +1860,12 @@ void MWindow::set_transition_length(double length)
 
 void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
 {
-
 	calling_window_gui->unlock_window();
+	stop_playback(0);
+	if( undo->redo_load_flags() & LOAD_SESSION )
+		close_mixers();
 
-	cwindow->playback_engine->que->
-		send_command(STOP, CHANGE_NONE, 0, 0);
-	cwindow->playback_engine->interrupt_playback(0);
-
-	for( int i = 0; i < vwindows.size(); i++ ) {
-		if( vwindows.get(i)->is_running() ) {
-			vwindows.get(i)->playback_engine->que->
-				send_command(STOP, CHANGE_NONE, 0, 0);
-			vwindows.get(i)->playback_engine->interrupt_playback(0);
-		}
-	}
-
-	cwindow->gui->lock_window("MWindow::redo_entry");
+	cwindow->gui->lock_window("MWindow::redo_entry 1");
 	for( int i = 0; i < vwindows.size(); i++ ) {
 		if( vwindows.get(i)->is_running() ) {
 			if( calling_window_gui != vwindows.get(i)->gui ) {
@@ -1903,22 +1873,19 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
 			}
 		}
 	}
-	gui->lock_window();
+	gui->lock_window("MWindow::redo_entry 3");
 
 	undo->redo();
 
 	save_backup();
+	restart_brender();
 	update_plugin_states();
 	update_plugin_guis();
-	restart_brender();
+
 	gui->update(1, 2, 1, 1, 1, 1, 1);
+	gui->unlock_window();
 	cwindow->update(1, 1, 1, 1, 1);
-
-	if( calling_window_gui != cwindow->gui )
-		cwindow->gui->unlock_window();
-	if( calling_window_gui != gui )
-		gui->unlock_window();
-
+	cwindow->gui->unlock_window();
 
 	for( int i = 0; i < vwindows.size(); i++ ) {
 		if( vwindows.get(i)->is_running() ) {
@@ -1928,8 +1895,13 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
 		}
 	}
 
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_ALL, edl, 1);
+	if( calling_window_gui != gui )
+		gui->unlock_window();
+
+	awindow->gui->async_update_assets();
+
+	cwindow->refresh_frame(CHANGE_ALL);
+	calling_window_gui->lock_window("MWindow::redo_entry 4");
 }
 
 
@@ -1998,6 +1970,30 @@ void MWindow::set_outpoint(int is_mwindow)
 	}
 }
 
+void MWindow::unset_inoutpoint(int is_mwindow)
+{
+	undo->update_undo_before();
+	edl->unset_inoutpoint();
+	save_backup();
+	undo->update_undo_after(_("clear in/out"), LOAD_TIMEBAR);
+
+	if( !is_mwindow ) {
+		gui->lock_window("MWindow::unset_inoutpoint 1");
+	}
+	gui->update_timebar(1);
+	if( !is_mwindow ) {
+		gui->unlock_window();
+	}
+
+	if( is_mwindow ) {
+		cwindow->gui->lock_window("MWindow::unset_inoutpoint 2");
+	}
+	cwindow->gui->timebar->update(1);
+	if( is_mwindow ) {
+		cwindow->gui->unlock_window();
+	}
+}
+
 void MWindow::splice(EDL *source)
 {
 	FileXML file;
@@ -2164,38 +2160,24 @@ void MWindow::trim_selection()
 		edl->session->labels_follow_edits,
 		edl->session->plugins_follow_edits,
 		edl->session->autos_follow_edits);
-	edl->deglitch(0);
-	edl->deglitch(edl->local_session->get_selectionend() -
-		edl->local_session->get_selectionstart());
-	
 
 	save_backup();
 	undo->update_undo_after(_("trim selection"), LOAD_EDITS | LOAD_TIMEBAR);
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
+	awindow->gui->async_update_assets();
 	restart_brender();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 
 void MWindow::undo_entry(BC_WindowBase *calling_window_gui)
 {
 	calling_window_gui->unlock_window();
-
-	cwindow->playback_engine->que->
-		send_command(STOP, CHANGE_NONE, 0, 0);
-	cwindow->playback_engine->interrupt_playback(0);
-
-//printf("MWindow::undo_entry %d %d\n", __LINE__, vwindows.size());
-	for( int i = 0; i < vwindows.size(); i++ ) {
-		if( vwindows.get(i)->is_running() ) {
-			vwindows.get(i)->playback_engine->que->
-				send_command(STOP, CHANGE_NONE, 0, 0);
-			vwindows.get(i)->playback_engine->interrupt_playback(0);
-		}
-	}
+	stop_playback(0);
+	if( undo->undo_load_flags() & LOAD_SESSION )
+		close_mixers();
 
 	cwindow->gui->lock_window("MWindow::undo_entry 1");
 	for( int i = 0; i < vwindows.size(); i++ ) {
@@ -2232,8 +2214,7 @@ void MWindow::undo_entry(BC_WindowBase *calling_window_gui)
 
 	awindow->gui->async_update_assets();
 
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_ALL, edl, 1);
+	cwindow->refresh_frame(CHANGE_ALL);
 	calling_window_gui->lock_window("MWindow::undo_entry 4");
 }
 
@@ -2305,22 +2286,15 @@ void MWindow::remap_audio(int pattern)
 			if( pattern == MWindow::AUDIO_5_1_TO_2 ) {
 				switch( current_track ) {
 				case 0:
-					pan_auto->values[0] = 0.5;
-					pan_auto->values[1] = 0.5;
-					break;
-				case 1:
+				case 4:
 					pan_auto->values[0] = 1;
 					break;
-				case 2:
+				case 1:
+				case 5:
 					pan_auto->values[1] = 1;
 					break;
+				case 2:
 				case 3:
-					pan_auto->values[0] = 1;
-					break;
-				case 4:
-					pan_auto->values[1] = 1;
-					break;
-				case 5:
 					pan_auto->values[0] = 0.5;
 					pan_auto->values[1] = 0.5;
 					break;
@@ -2445,8 +2419,7 @@ void MWindow::cut_commercials()
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }