X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=c569c9204b085b0d9aa7dc2ff61ea2024b4e8c5c;hb=a88121d876acc81c5a28dbd2cc71e7c6856e2ac0;hp=e128a19bfdd68767466fd22ecaf1706fae82c107;hpb=ad2996ab94e6e12c9c14a5b9f14792f76111dff7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index e128a19b..c569c920 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();
 }
 
@@ -311,8 +309,7 @@ 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)
@@ -408,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);
 }
 
 
@@ -505,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();
 }
 
@@ -532,8 +527,7 @@ void MWindow::blade(double position)
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
 	awindow->gui->async_update_assets();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 void MWindow::cut(double start, double end, double new_position)
@@ -557,8 +551,7 @@ void MWindow::cut(double start, double end, double new_position)
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
 	awindow->gui->async_update_assets();
-	cwindow->playback_engine->que->
-		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+	cwindow->refresh_frame(CHANGE_EDL);
 }
 
 void MWindow::snap_left_edit()
@@ -638,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 )
@@ -668,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)
@@ -682,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();
 }
 
@@ -941,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
@@ -957,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);
@@ -972,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);
@@ -1078,8 +1053,7 @@ void MWindow::mute_selection()
 		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);
 	}
 }
 
@@ -1643,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)
@@ -1890,7 +1863,7 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
 	calling_window_gui->unlock_window();
 	stop_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 ) {
@@ -1898,23 +1871,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();
-	awindow->gui->async_update_assets();
-	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() ) {
@@ -1924,8 +1893,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");
 }
 
 
@@ -1994,6 +1968,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;
@@ -2168,8 +2166,7 @@ void MWindow::trim_selection()
 	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);
 }
 
 
@@ -2213,8 +2210,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");
 }
 
@@ -2426,8 +2422,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);
 }