X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=b3209c83c8f6fef173db821913a59d9339f4256e;hp=743c721cf2fcd6f6cc1aba24d3e11348556df200;hb=eb7b1a0bb84ed4f40b651b74ff72e63b97cce1c2;hpb=e23393f4ff9f772ac8f47926cf490dc87a630ed4

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 743c721c..b3209c83 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -36,6 +36,7 @@
 #include "edl.h"
 #include "edlsession.h"
 #include "filesystem.h"
+#include "filexml.h"
 #include "keyframepopup.h"
 #include "keys.h"
 #include "language.h"
@@ -269,7 +270,7 @@ void MWindowGUI::create_objects()
 
 	if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 
-	int x = get_w() - MainShBtns::calculate_w(0);
+	int x = get_w() - MainShBtns::calculate_w(-1, 0, -1);
 	add_subwindow(mainmenu = new MainMenu(mwindow, this, x));
 	mainmenu->create_objects();
 	add_subwindow(mainshbtns = new MainShBtns(mwindow, x, -1));
@@ -410,7 +411,7 @@ int MWindowGUI::resize_event(int w, int h)
 //printf("MWindowGUI::resize_event %d\n", __LINE__);
 	mwindow->session->mwindow_w = w;
 	mwindow->session->mwindow_h = h;
-	int x = w - MainShBtns::calculate_w(0);
+	int x = w - MainShBtns::calculate_w(-1, 0, -1);
 	mainmenu->resize_event(x, mainmenu->get_h());
 	mainshbtns->reposition_window(x, -1);
 	mwindow->theme->get_mwindow_sizes(this, w, h);
@@ -931,9 +932,9 @@ int MWindowGUI::visible(int64_t x1, int64_t x2, int64_t view_x1, int64_t view_x2
 }
 
 
-void MWindowGUI::show_message(const char *message, int color)
+void MWindowGUI::show_message(const char *message, int msg_color, int bar_color)
 {
-	statusbar->show_message(message, color);
+	statusbar->show_message(message, msg_color, bar_color);
 }
 
 void MWindowGUI::update_default_message()
@@ -1172,7 +1173,7 @@ int MWindowGUI::keypress_event()
 	if( result ) return result;
 
 	Track *this_track = 0, *first_track = 0;
-	int collapse = 0, packed = 0, overwrite = 0;
+	int collapse = 0, packed = 0, overwrite = 0, plugins = 0;
 	double position = 0;
 
 	switch( get_keypress() ) {
@@ -1202,6 +1203,8 @@ int MWindowGUI::keypress_event()
 		mwindow->selected_edits_to_clipboard(packed);
 		result = 1;
 		break;
+	case 'P':
+		plugins = 1;
 	case 'b':
 		overwrite = -1; // fall thru
 	case 'v':
@@ -1222,7 +1225,10 @@ int MWindowGUI::keypress_event()
 		}
 		else
 			position = mwindow->edl->local_session->get_selectionstart();
-		mwindow->paste(position, first_track, 0, overwrite);
+		if( !plugins )
+			mwindow->paste(position, first_track, 0, overwrite);
+		else
+			mwindow->paste_clipboard(first_track, position, 1, 0, 1, 1, 1);
 		mwindow->edl->tracks->clear_selected_edits();
 		draw_overlays(1);
 		result = 1;
@@ -1241,8 +1247,7 @@ int MWindowGUI::keypress_event()
 		result = 1;
 		break;
 
-	case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8':
+	case '1' ... '8':
 		if( !alt_down() || shift_down() ) break;
 		if( !mwindow->select_asset(get_keypress()-'1',1) )
 			result = 1;
@@ -2343,7 +2348,7 @@ void MWindowGUI::stop_transport(const char *lock_msg)
 {
 	if( !mbuttons->transport->is_stopped() ) {
 		if( lock_msg ) unlock_window();
-		mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+		mbuttons->transport->handle_transport(STOP, 1);
 		if( lock_msg ) lock_window(lock_msg);
 	}
 }