From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 5 Jul 2016 22:00:04 +0000 (-0600)
Subject: avoid overloaded casting pun tripping compiler
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=c88e3df2c765bfff605a98f1feed145af81ca238;p=goodguy%2Fhistory.git

avoid overloaded casting pun tripping compiler
---

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();