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 21e121d657a60ba9e69183f417d14e427f5eba93..0a75ac35192b47b326dc5011e1152ea6eddd9eed 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/fileinfo.cpp
+++ b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
@@ -40,7 +40,7 @@ enum
 
 BEGIN_EVENT_TABLE(FileInfo, wxFrame)
     /* Button events */
-    EVT_BUTTON(wxID_OK, FileInfo::OnButtonClose)
+    EVT_BUTTON(wxID_CLOSE, FileInfo::OnButtonClose)
 
     /* Hide the window when the user closes the window */
     EVT_CLOSE(FileInfo::OnClose)
@@ -51,29 +51,37 @@ END_EVENT_TABLE()
  * Constructor.
  *****************************************************************************/
 FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
-    wxFrame( p_parent, -1, wxU(_("Stream and media info")), wxDefaultPosition,
+    wxFrame( p_parent, -1, wxU(_("Stream and Media Info")), wxDefaultPosition,
              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 );
     SetAutoLayout( TRUE );
 
+    /* Create a panel to put everything in */
+    wxPanel *panel = new wxPanel( this, -1 );
+    panel->SetAutoLayout( TRUE );
+
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
     panel_sizer = new wxBoxSizer( wxVERTICAL );
 
-    wxNotebook *notebook = new wxNotebook( this, -1 );
+    wxNotebook *notebook = new wxNotebook( panel, -1 );
 #if (!wxCHECK_VERSION(2,5,2))
         wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
 #endif
-    item_info = new ItemInfoPanel( p_intf, notebook, false );
-    stats_info = new InputStatsInfoPanel( p_intf, notebook );
+    item_info = new MetaDataPanel( p_intf, notebook, false );
+    advanced_info = new AdvancedInfoPanel( p_intf, notebook );
+    if( b_stats )
+        stats_info = new InputStatsInfoPanel( p_intf, notebook );
 
     notebook->AddPage( item_info, wxU(_("General") ), true );
-    notebook->AddPage( stats_info, wxU(_("Statistics") ), false );
+    notebook->AddPage( advanced_info, wxU(_("Advanced information") ), false );
+    if( b_stats )
+        notebook->AddPage( stats_info, wxU(_("Statistics") ), false );
 
 #if (!wxCHECK_VERSION(2,5,2))
     panel_sizer->Add( notebook_sizer, 1, wxEXPAND | wxALL, 5 );
@@ -81,59 +89,62 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
     panel_sizer->Add( notebook, 1, wxEXPAND | wxALL, 5 );
 #endif
 
-    panel_sizer->Layout();
-    SetSizerAndFit( panel_sizer );
+    panel_sizer->Add( new wxButton( panel, wxID_CLOSE, wxU(_("&Close")) ) ,
+                      0, wxALL|wxALIGN_RIGHT, 5 );
 
+    panel_sizer->Layout();
+    panel->SetSizerAndFit( panel_sizer );
+    main_sizer->Add( panel, 1, wxGROW, 0 );
+    main_sizer->Layout();
+    SetSizerAndFit( main_sizer );
 
     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();
 }
 
 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 =
-        (input_thread_t *)vlc_object_find( p_playlist, VLC_OBJECT_INPUT,
-                                           FIND_CHILD );
-
-    if( !p_input || p_input->b_dead || !p_input->input.p_item->psz_name )
+    input_thread_t *p_input = p_playlist->p_input ;
+    if( !p_input || p_input->b_dead || !input_GetItem(p_input)->psz_name )
     {
         item_info->Clear();
-        stats_info->Clear();
-        if ( p_input )
-        {
-            vlc_object_release(p_input);
-        }
-        vlc_object_release( p_playlist );
+        advanced_info->Clear();
+        if( b_stats )
+            stats_info->Clear();
+        pl_Release( p_intf );
         return;
     }
+    pl_Release( p_intf );
 
-    vlc_mutex_lock( &p_input->input.p_item->lock );
-    if( b_need_update == VLC_TRUE )
+    vlc_object_yield( p_input );
+    vlc_mutex_lock( &input_GetItem(p_input)->lock );
+    if( b_need_update == true )
     {
-        item_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) );
     }
-    stats_info->Update( p_input->input.p_item );
-    vlc_mutex_unlock( &p_input->input.p_item->lock );
+    if( b_stats )
+        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;
@@ -158,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;
 }