X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=a9e93c6419a18f5a3f061358ee6ec94bcd195598;hb=6cf1b80d50c6b458241a0d43487fb8519c575c97;hp=69204d9c4e7bae60b00ecf4e44a06f45a19e1643;hpb=4c207ab325a8e8e6b79a9a18d4647273b5f59f93;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 69204d9c..a9e93c64 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -74,6 +74,7 @@
 #include "vwindowgui.h"
 #include "vwindow.h"
 #include "wintv.h"
+#include "x10tv.h"
 #include "zoombar.h"
 
 #define PANE_DRAG_MARGIN MAX(mwindow->theme->pane_w, mwindow->theme->pane_h)
@@ -165,21 +166,32 @@ void MWindowGUI::create_objects()
 	if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 	set_icon(mwindow->theme->get_image("mwindow_icon"));
 	remote_control = new RemoteControl(this);
+	cwindow_remote_handler = 0;
+	record_remote_handler = 0;
+#ifdef HAVE_X10TV
+// should be first, use if plugged
+	if( !cwindow_remote_handler && mwindow->x10tv ) {
+		cwindow_remote_handler = (RemoteHandler*)
+			new X10TVCWindowHandler(mwindow->x10tv, remote_control);
+		record_remote_handler = (RemoteHandler*)
+			new X10TVRecordHandler(mwindow->x10tv, remote_control);
+	}
+#endif
 #ifdef HAVE_WINTV
-	WinTV *wintv = mwindow->wintv;
-	if( wintv ) {
+	if( !cwindow_remote_handler && mwindow->wintv ) {
 		cwindow_remote_handler = (RemoteHandler*)
-			new WinTVCWindowHandler(wintv, remote_control);
+			new WinTVCWindowHandler(mwindow->wintv, remote_control);
 		record_remote_handler = (RemoteHandler*)
-			new WinTVRecordHandler(wintv, remote_control);
+			new WinTVRecordHandler(mwindow->wintv, remote_control);
 	}
 #endif
-	if( !cwindow_remote_handler ) cwindow_remote_handler =
-		(RemoteHandler*)new CWindowRemoteHandler(remote_control);
-	if( !record_remote_handler  ) record_remote_handler =
-		(RemoteHandler*)new RecordRemoteHandler(remote_control);
 	mwindow->reset_android_remote();
-
+	if( !cwindow_remote_handler )
+		cwindow_remote_handler = (RemoteHandler*)
+			new CWindowKeyEvHandler(mwindow->gui->remote_control);
+	if( !record_remote_handler )
+		record_remote_handler = (RemoteHandler*)
+			new RecordKeyEvHandler(mwindow->gui->remote_control);
 	if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 
 	int x1 = get_w() - MainShBtns::calculate_w(-1, 0, -1) - xS(5);
@@ -1072,11 +1084,21 @@ int MWindowGUI::keypress_event()
 
 	switch( get_keypress() ) {
 	case 'A':
-		if( !ctrl_down() || !shift_down() || alt_down() ) break;
-		mwindow->edl->tracks->clear_selected_edits();
-		draw_overlays(1);
+		if( !alt_down() ) {
+			if( !ctrl_down() || !shift_down() ) break;
+			mwindow->edl->tracks->clear_selected_edits();
+			draw_overlays(1);
+			result = 1;
+			break;
+		} // fall thru
+	case 'a':
+		if( !alt_down() ) break;
+		stop_transport("MWindowGUI::keypress_event 1");
+		mwindow->nearest_auto_keyframe(shift_down(),
+			!ctrl_down() ? PLAY_FORWARD : PLAY_REVERSE);
 		result = 1;
 		break;
+
 	case 'e':
 		mwindow->toggle_editing_mode();
 		result = 1;
@@ -1084,7 +1106,7 @@ int MWindowGUI::keypress_event()
 
 	case 'k': case 'K':
 		if( alt_down() ) break;
-		stop_transport("MWindowGUI::keypress_event 1");
+		stop_transport("MWindowGUI::keypress_event 2");
 		mwindow->nearest_plugin_keyframe(shift_down(),
 			!ctrl_down() ? PLAY_FORWARD : PLAY_REVERSE);
 		result = 1;
@@ -1313,6 +1335,19 @@ void MWindowGUI::use_android_remote(int on)
 	if( android_control ) return;
 	android_control = new AndroidControl(this);
 }
+int MWindowGUI::keyev_grab_remote()
+{
+	if( cwindow_remote_handler && cwindow_remote_handler->is_keytv() &&
+	    record_remote_handler  && record_remote_handler->is_keytv() )
+		return 0;
+	delete cwindow_remote_handler;
+	delete record_remote_handler;
+	cwindow_remote_handler = (RemoteHandler*)
+		new CWindowKeyEvHandler(mwindow->gui->remote_control);
+	record_remote_handler = (RemoteHandler*)
+		new RecordKeyEvHandler(mwindow->gui->remote_control);
+	return 1;
+}
 
 int MWindowGUI::close_event()
 {