* all: rework of the input.

[vlc] / modules / gui / wxwindows / fileinfo.cpp

diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp
index fe30bf1601f1b0a2cbb43eee4468509207fd5f44..f0cdb34d0dfdcbeb246c7a10e1732307cda7cc31 100644 (file)
--- a/modules/gui/wxwindows/fileinfo.cpp
+++ b/modules/gui/wxwindows/fileinfo.cpp
@@ -87,7 +87,7 @@ void FileInfo::UpdateFileInfo()
 {
     input_thread_t *p_input = p_intf->p_sys->p_input;
 
-    if( !p_input || p_input->b_dead || !p_input->psz_name )
+    if( !p_input || p_input->b_dead || p_input->input.p_item->psz_name )
     {
         if( fileinfo_root )
         {
@@ -103,22 +103,22 @@ void FileInfo::UpdateFileInfo()
          * retrieved with the GetItemText() method, but it doesn't work on
          * Windows when the wxTR_HIDE_ROOT style is set. That's why we need to
          * use the fileinfo_root_label variable... */
-        fileinfo_root = fileinfo_tree->AddRoot( wxL2U(p_input->psz_name) );
-        fileinfo_root_label = wxL2U(p_input->psz_name);
+        fileinfo_root = fileinfo_tree->AddRoot( wxL2U(p_input->input.p_item->psz_name) );
+        fileinfo_root_label = wxL2U(p_input->input.p_item->psz_name);
     }
-    else if( fileinfo_root_label == wxL2U(p_input->psz_name) )
+    else if( fileinfo_root_label == wxL2U(p_input->input.p_item->psz_name) )
     {
         return;
     }
 
     /* We rebuild the tree from scratch */
     fileinfo_tree->DeleteChildren( fileinfo_root );
-    fileinfo_root_label = wxL2U(p_input->psz_name);
+    fileinfo_root_label = wxL2U(p_input->input.p_item->psz_name);
 
-    vlc_mutex_lock( &p_input->p_item->lock );
-    for( int i = 0; i < p_input->p_item->i_categories; i++ )
+    vlc_mutex_lock( &p_input->input.p_item->lock );
+    for( int i = 0; i < p_input->input.p_item->i_categories; i++ )
     {
-        info_category_t *p_cat = p_input->p_item->pp_categories[i];
+        info_category_t *p_cat = p_input->input.p_item->pp_categories[i];
 
         wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root,
                                                       wxL2U(p_cat->psz_name) );
@@ -131,7 +131,7 @@ void FileInfo::UpdateFileInfo()
         }
         fileinfo_tree->Expand( cat );
     }
-    vlc_mutex_unlock( &p_input->p_item->lock );
+    vlc_mutex_unlock( &p_input->input.p_item->lock );
 
     return;
 }