wxwidgets: meta fixes, constify update_download

diff --git a/include/vlc_update.h b/include/vlc_update.h
index fd4aa04ed0e198d2eab3f979d27a0808bf842faf..746146f8bff9d8b1988952d8edd4fc3a85ade36a 100644 (file)
--- a/include/vlc_update.h
+++ b/include/vlc_update.h
@@ -176,7 +176,7 @@ VLC_EXPORT( update_iterator_t *, update_iterator_New, ( update_t * ) );
 VLC_EXPORT( void, update_iterator_Delete, ( update_iterator_t * ) );
 VLC_EXPORT( unsigned int, update_iterator_Action, ( update_iterator_t *, int ) );
 VLC_EXPORT( unsigned int, update_iterator_ChooseMirrorAndFile, ( update_iterator_t *, int, int, int ) );
-VLC_EXPORT( void, update_download, ( update_iterator_t *, char * ) );
+VLC_EXPORT( void, update_download, ( update_iterator_t *, const char * ) );
 
 /**
  * @}

diff --git a/modules/gui/wxwidgets/input_manager.cpp b/modules/gui/wxwidgets/input_manager.cpp
index 80e6191d2572726ece14bb43142b607c18964b64..2add7473e10a9bd194ef383cfeaf1f0df8ac27f1 100644 (file)
--- a/modules/gui/wxwidgets/input_manager.cpp
+++ b/modules/gui/wxwidgets/input_manager.cpp
@@ -210,10 +210,7 @@ void InputManager::UpdateInput()
 
 void InputManager::UpdateNowPlaying()
 {
-    const char *psz_now_playing = 
-        input_item_GetNowPlaying( input_GetItem(p_input) ) ?
-                    strdup( input_GetItem(p_input)->p_meta->psz_nowplaying ):
-                    strdup( "" );
+    const char *psz_now_playing = input_item_GetNowPlaying( input_GetItem(p_input) );
     if( psz_now_playing && *psz_now_playing )
     {
         p_main_intf->statusbar->SetStatusText(
@@ -225,7 +222,6 @@ void InputManager::UpdateNowPlaying()
         p_main_intf->statusbar->SetStatusText(
                    wxU(input_GetItem(p_input)->psz_name), 2 );
     }
-    free( psz_now_playing );
 }
 
 void InputManager::UpdateButtons( vlc_bool_t b_play )

diff --git a/modules/gui/wxwidgets/playlist_manager.cpp b/modules/gui/wxwidgets/playlist_manager.cpp
index d9ba45313ec9084a3326581195b43cef0d80c523..dd5cc7e34cedc3fdad37fb422450fc678f78db90 100644 (file)
--- a/modules/gui/wxwidgets/playlist_manager.cpp
+++ b/modules/gui/wxwidgets/playlist_manager.cpp
@@ -299,17 +299,10 @@ void PlaylistManager::UpdateTreeItem( wxTreeItemId item )
     wxString msg;
     wxString duration = wxU( "" );
 
-    char *psz_artist;
-    if( input_item_GetArtist( o_item->p_input ) )
+    const char *psz_artist = input_item_GetArtist( p_item->p_input );
+    if( ! psz_artist )
     {
-        psz_artist = strdup( input_item_GetArtist( o_item->p_input ) );
-    }
-    else psz_artist = strdup( "" );
-
-    if( !psz_artist )
-    {
-        UnlockPlaylist( p_intf->p_sys, p_playlist );
-        return;
+        psz_artist = "";
     }
 
     char psz_duration[MSTRTIME_MAX_SIZE];
@@ -331,7 +324,6 @@ void PlaylistManager::UpdateTreeItem( wxTreeItemId item )
         msg = wxString(wxU( psz_artist )) + wxT(" - ") +
                     wxString(wxU(p_item->p_input->psz_name)) + duration;
     }
-    free( psz_artist );
     treectrl->SetItemText( item , msg );
     treectrl->SetItemImage( item, p_item->p_input->i_type );
 

diff --git a/src/misc/update.c b/src/misc/update.c
index 871726d01ff724353eadb317287da88b8addff8f..a8756f4935ad2e4a1512354c24f3b1a36f64fd3d 100644 (file)
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -1209,7 +1209,7 @@ void update_download_for_real( download_thread_t *p_this );
  * \param psz_dest destination file path
  * \return nothing
  */
-void update_download( update_iterator_t *p_uit, char *psz_dest )
+void update_download( update_iterator_t *p_uit, const char *psz_dest )
 {
     download_thread_t *p_dt =
         vlc_object_create( p_uit->p_u->p_libvlc, sizeof( download_thread_t ) );