KeyToString: allocate key on heap

This will allow returning dynamically generated strings

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index f24dd6455a11d5750ac7c8e3ba88729a0ac73b51..795c42f6004b7a26773d6ad63df9fbb4f22532e9 100644 (file)
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -86,7 +86,7 @@
 #define KEY_MOUSEWHEELLEFT   0x00F20000
 #define KEY_MOUSEWHEELRIGHT  0x00F30000
 
-VLC_EXPORT( const char *, KeyToString, (uint_fast32_t i_key) ) LIBVLC_USED;
+VLC_EXPORT( char *, KeyToString, (uint_fast32_t i_key) ) LIBVLC_USED;
 VLC_EXPORT( uint_fast32_t, StringToKey,  (char *psz_key) ) LIBVLC_USED;
 
 typedef enum vlc_key {

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 5bcfd33de91990f7f30ede28ca41de315e2c1d31..4dbe968b6ad3ed50e0db5a9fd5a0295596c8a000 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -86,9 +86,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     if( val & KEY_MODIFIER_COMMAND )
         [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x98"]];
 
-    const char *base = KeyToString( val & ~KEY_MODIFIER );
+    char *base = KeyToString( val & ~KEY_MODIFIER );
     if( base )
+    {
         [o_temp_str appendString: [NSString stringWithUTF8String: base]];
+        free( base );
+    }
     else
         o_temp_str = [NSMutableString stringWithString:_NS("Not Set")];
     return o_temp_str;

diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index c02945cbd807b87d27f752c8e5cc5049d4021974..820c8d308ff33d4e257d7c31b46e1454afd44272 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -231,16 +231,23 @@ int qtWheelEventToVLCKey( QWheelEvent *e )
 
 QString VLCKeyToString( int val )
 {
-    const char *base = KeyToString (val & ~KEY_MODIFIER);
+    char *base = KeyToString (val & ~KEY_MODIFIER);
 
     QString r = "";
     if( val & KEY_MODIFIER_CTRL )
-        r+= "Ctrl+";
+        r+= qfu( "Ctrl+" );
     if( val & KEY_MODIFIER_ALT )
-        r+= "Alt+";
+        r+= qfu( "Alt+" );
     if( val & KEY_MODIFIER_SHIFT )
-        r+= "Shift+";
+        r+= qfu( "Shift+" );
 
-    return r + (base ? base : qtr( "Unset" ) );
+    if (base)
+    {
+        r += qfu( base );
+        free( base );
+    }
+    else
+        r += qtr( "Unset" );
+    return r;
 }
 

diff --git a/modules/gui/skins2/events/evt_key.cpp b/modules/gui/skins2/events/evt_key.cpp
index ad10f7b02b2cc3768ce695c138646d4192377932..99d01ad32c694e60ac575bfcd91c360ea5dd9404 100644 (file)
--- a/modules/gui/skins2/events/evt_key.cpp
+++ b/modules/gui/skins2/events/evt_key.cpp
@@ -39,9 +39,12 @@ const string EvtKey::getAsString() const
         msg_Warn( getIntf(), "Unknown action type" );
 
     // Add the key
-    const char *keyName = KeyToString( m_key );
+    char *keyName = KeyToString( m_key );
     if( keyName )
+    {
         event += (string)":" + keyName;
+        free( keyName );
+    }
     else
         msg_Warn( getIntf(), "Unknown key: %d", m_key );
 

diff --git a/src/config/keys.c b/src/config/keys.c
index 07980e682d01751c41863aee71446b4b9020e0d5..0fd50cdd2890034a9c3aa83ae51a5f566db6386f 100644 (file)
--- a/src/config/keys.c
+++ b/src/config/keys.c
@@ -171,14 +171,14 @@ static int cmpkey (const void *key, const void *elem)
     return ((uintptr_t)key) - ((key_descriptor_t *)elem)->i_key_code;
 }
 
-const char *KeyToString (uint_fast32_t sym)
+char *KeyToString (uint_fast32_t sym)
 {
     key_descriptor_t *d;
 
     d = (key_descriptor_t *)
         bsearch ((void *)(uintptr_t)sym, vlc_keys, vlc_num_keys,
                  sizeof (vlc_keys[0]), cmpkey);
-    return d ? d->psz_key_string : NULL;
+    return d ? strdup (d->psz_key_string) : NULL;
 }
 
 uint_fast32_t StringToKey (char *name)