Fixes from hobophobe on IRC

diff --git a/modules/gui/skins2/events/evt_key.cpp b/modules/gui/skins2/events/evt_key.cpp
index 621276667499b7dade67f4c90d513bf16e3ff379..086a0f617482894d70c32a0a6ebc30f2cec53fd7 100644 (file)
--- a/modules/gui/skins2/events/evt_key.cpp
+++ b/modules/gui/skins2/events/evt_key.cpp
@@ -39,7 +39,7 @@ const string EvtKey::getAsString() const
         msg_Warn( getIntf(), "Unknown action type" );
 
     // Add the key
-    char *keyName = KeyToString( m_key );
+    const char *keyName = KeyToString( m_key );
     if( keyName )
         event += (string)":" + keyName;
     else

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index d9834f7f8239bae1df48f6b6b10fd8e8942c4124..01f6d7be4407abc56086efab7b75c01665d47738 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -1071,7 +1071,7 @@ void Interface::PlayStream()
                                        FIND_ANYWHERE );
     if( p_playlist == NULL ) return;
 
-    if( p_playlist->i_size && p_playlist->i_enabled )
+    if( !playlist_IsEmpty(p_playlist) && p_playlist->i_enabled )
     {
         vlc_value_t state;
 

diff --git a/modules/gui/wxwidgets/menus.cpp b/modules/gui/wxwidgets/menus.cpp
index 7a7fa79c9a8c64bf6e80b76933a19ede3e3791d9..92ab16bb659a8805142abe960d9a482a7e045568 100644 (file)
--- a/modules/gui/wxwidgets/menus.cpp
+++ b/modules/gui/wxwidgets/menus.cpp
@@ -271,7 +271,7 @@ int IntfAutoMenuBuilder( intf_thread_t *p_intf, ArrayOfInts &ri_objects,
     } \
     else \
     { \
-        if( p_playlist && !playlist_IsEmpty( p_playlist->i_size ) ) \
+        if( p_playlist && !playlist_IsEmpty( p_playlist ) ) \
         { \
             popupmenu.InsertSeparator( 0 ); \
             popupmenu.Insert( 0, Play_Event, wxU(_("Play")) ); \