avoid overloaded casting pun tripping compiler

diff --git a/cinelerra-5.1/cinelerra/androidcontrol.C b/cinelerra-5.1/cinelerra/androidcontrol.C
index 79008ac8a83f84c1be9d67776fcf78ba99a10329..0417ceb45ddb7b76856c9727b835ebb004df358c 100644 (file)
--- 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 76efb7efeb81e0897ec85a0ec8503bfcd1ea33a9..91bc6b8d61eb2ccb650ef60134a72365620363a2 100644 (file)
--- 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 f3c1dfea9f0a116e5b8c91ab370279fc0ca61f40..8432f0dfd5018ba2a2be2771e42405263194afeb 100644 (file)
--- 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();