From c88e3df2c765bfff605a98f1feed145af81ca238 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Tue, 5 Jul 2016 16:00:04 -0600 Subject: [PATCH 1/1] avoid overloaded casting pun tripping compiler --- cinelerra-5.1/cinelerra/androidcontrol.C | 2 +- cinelerra-5.1/cinelerra/mwindowgui.C | 4 ++-- cinelerra-5.1/cinelerra/mwindowgui.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cinelerra-5.1/cinelerra/androidcontrol.C b/cinelerra-5.1/cinelerra/androidcontrol.C index 79008ac8..0417ceb4 100644 --- a/cinelerra-5.1/cinelerra/androidcontrol.C +++ b/cinelerra-5.1/cinelerra/androidcontrol.C @@ -59,7 +59,7 @@ bool AndroidControl::is_msg(const char *cp) void AndroidControl::press(int key) { // printf("press 0x%04x\n",key); - if( mwindow_gui->keyboard_listener(key) ) return; + if( mwindow_gui->key_listener(key) ) return; mwindow_gui->remote_control->remote_key(key); } diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C index 76efb7ef..91bc6b8d 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.C +++ b/cinelerra-5.1/cinelerra/mwindowgui.C @@ -1400,10 +1400,10 @@ int MWindowGUI::keypress_event() int MWindowGUI::keyboard_listener(BC_WindowBase *wp) { - return keyboard_listener(wp->get_keypress()); + return key_listener(wp->get_keypress()); } -int MWindowGUI::keyboard_listener(int key) +int MWindowGUI::key_listener(int key) { int result = 1; switch( key ) { diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h index f3c1dfea..8432f0df 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.h +++ b/cinelerra-5.1/cinelerra/mwindowgui.h @@ -132,7 +132,7 @@ public: int resize_event(int w, int h); // handle a resize event int keypress_event(); int keyboard_listener(BC_WindowBase *wp); - int keyboard_listener(int key); + int key_listener(int key); void use_android_remote(int on); int close_event(); int quit(); -- 2.26.2