Use pl_Release with the right argument.

[vlc] / modules / gui / wxwidgets / dialogs / fileinfo.cpp

diff --git a/modules/gui/wxwidgets/dialogs/fileinfo.cpp b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
index f831391b82152265854738503afeb1f348052155..0a75ac35192b47b326dc5011e1152ea6eddd9eed 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/fileinfo.cpp
+++ b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
@@ -55,9 +55,8 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
              wxDefaultSize, wxDEFAULT_FRAME_STYLE )
 {
     p_intf = _p_intf;
-    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
-                                                 VLC_OBJECT_PLAYLIST,
-                                                 FIND_ANYWHERE );
+    playlist_t *p_playlist = pl_Yield( p_intf );
+
     b_stats = config_GetInt(p_intf, "stats");
     /* Initializations */
     SetIcon( *p_intf->p_sys->p_icon );
@@ -102,11 +101,11 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
     if( p_playlist )
     {
         var_AddCallback( p_playlist, "item-change", ItemChanged, this );
-        vlc_object_release( p_playlist );
+        pl_Release( p_intf );
     }
 
     last_update = 0L;
-    b_need_update = VLC_TRUE;
+    b_need_update = true;
     Update();
 }
 
@@ -115,39 +114,37 @@ void FileInfo::Update()
     if( mdate() - last_update < 400000L ) return;
     last_update = mdate();
 
-    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
-                                                 VLC_OBJECT_PLAYLIST,
-                                                 FIND_ANYWHERE );
+    playlist_t *p_playlist = pl_Yield( p_intf );
     if( !p_playlist ) return;
 
     input_thread_t *p_input = p_playlist->p_input ;
-
-    if( !p_input || p_input->b_dead || !p_input->input.p_item->psz_name )
+    if( !p_input || p_input->b_dead || !input_GetItem(p_input)->psz_name )
     {
         item_info->Clear();
         advanced_info->Clear();
         if( b_stats )
             stats_info->Clear();
-        vlc_object_release( p_playlist );
+        pl_Release( p_intf );
         return;
     }
+    pl_Release( p_intf );
 
     vlc_object_yield( p_input );
-    vlc_mutex_lock( &p_input->input.p_item->lock );
-    if( b_need_update == VLC_TRUE )
+    vlc_mutex_lock( &input_GetItem(p_input)->lock );
+    if( b_need_update == true )
     {
-        vlc_mutex_unlock( &p_input->input.p_item->lock  );
-        item_info->Update( p_input->input.p_item );
-        vlc_mutex_lock( &p_input->input.p_item->lock  );
-        advanced_info->Update( p_input->input.p_item );
+        vlc_mutex_unlock( &input_GetItem(p_input)->lock  );
+        item_info->Update( input_GetItem(p_input) );
+        vlc_mutex_lock( &input_GetItem(p_input)->lock  );
+        advanced_info->Update( input_GetItem(p_input) );
     }
     if( b_stats )
-        stats_info->Update( p_input->input.p_item );
-    vlc_mutex_unlock( &p_input->input.p_item->lock );
+        stats_info->Update( input_GetItem(p_input) );
+    vlc_mutex_unlock( &input_GetItem(p_input)->lock );
 
     vlc_object_release(p_input);
-    vlc_object_release( p_playlist );
-    b_need_update = VLC_FALSE;
+    pl_Release( p_intf );
+    b_need_update = false;
     panel_sizer->Layout();
 
     return;
@@ -172,6 +169,6 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
                         vlc_value_t oldval, vlc_value_t newval, void *param )
 {
     FileInfo *p_fileinfo = (FileInfo *)param;
-    p_fileinfo->b_need_update = VLC_TRUE;
+    p_fileinfo->b_need_update = true;
     return VLC_SUCCESS;
 }