*****************************************************************************/
#include "dialogs/fileinfo.hpp"
+#include "dialogs/infopanels.hpp"
/*****************************************************************************
* Event Table.
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)
* 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 )
{
- playlist_t *p_playlist;
+ p_intf = _p_intf;
+ playlist_t *p_playlist = pl_Yield( p_intf );
+ b_stats = config_GetInt(p_intf, "stats");
/* Initializations */
- p_intf = _p_intf;
SetIcon( *p_intf->p_sys->p_icon );
SetAutoLayout( TRUE );
wxPanel *panel = new wxPanel( this, -1 );
panel->SetAutoLayout( TRUE );
- fileinfo_tree =
- new wxTreeCtrl( panel, -1, wxDefaultPosition, wxSize( 350, 350 ),
- wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT | wxSUNKEN_BORDER );
-
- fileinfo_root_label = wxT("");
-
- /* Place everything in sizers */
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
- wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
- panel_sizer->Add( fileinfo_tree, 1, wxEXPAND | wxALL, 5 );
+ panel_sizer = new wxBoxSizer( wxVERTICAL );
+
+ wxNotebook *notebook = new wxNotebook( panel, -1 );
+#if (!wxCHECK_VERSION(2,5,2))
+ wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
+#endif
+ 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( 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 );
+#else
+ panel_sizer->Add( notebook, 1, wxEXPAND | wxALL, 5 );
+#endif
+
+ 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, wxEXPAND, 0 );
+ main_sizer->Add( panel, 1, wxGROW, 0 );
main_sizer->Layout();
SetSizerAndFit( main_sizer );
- p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
if( p_playlist )
{
var_AddCallback( p_playlist, "item-change", ItemChanged, this );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
- b_need_update = VLC_TRUE;
- UpdateFileInfo();
+ last_update = 0L;
+ b_need_update = true;
+ Update();
}
-void FileInfo::UpdateFileInfo()
+void FileInfo::Update()
{
- input_thread_t *p_input =
- (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
+ if( mdate() - last_update < 400000L ) return;
+ last_update = mdate();
- if( !p_input || p_input->b_dead || !p_input->input.p_item->psz_name )
- {
- if( fileinfo_root )
- {
- fileinfo_root_label = wxT("");
- fileinfo_tree->DeleteChildren( fileinfo_root );
- }
- if (p_input)
- {
- vlc_object_release(p_input);
- }
- return;
- }
+ playlist_t *p_playlist = pl_Yield( p_intf );
+ if( !p_playlist ) return;
- if( !fileinfo_root )
- {
- /* On linux, the first argument of wxTreeCtrl::AddRoot() can be
- * 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->input.p_item->psz_name) );
- fileinfo_root_label = wxL2U(p_input->input.p_item->psz_name);
- }
- else if( fileinfo_root_label == wxL2U(p_input->input.p_item->psz_name) &&
- b_need_update == VLC_FALSE )
+ input_thread_t *p_input = p_playlist->p_input ;
+ if( !p_input || p_input->b_dead || !input_GetItem(p_input)->psz_name )
{
- vlc_object_release(p_input);
+ item_info->Clear();
+ advanced_info->Clear();
+ if( b_stats )
+ stats_info->Clear();
+ pl_Release( p_intf );
return;
}
+ pl_Release( p_intf );
- /* We rebuild the tree from scratch */
- fileinfo_tree->DeleteChildren( fileinfo_root );
- fileinfo_root_label = wxL2U(p_input->input.p_item->psz_name);
-
- vlc_mutex_lock( &p_input->input.p_item->lock );
- for( int i = 0; i < p_input->input.p_item->i_categories; i++ )
+ vlc_object_yield( p_input );
+ vlc_mutex_lock( &input_GetItem(p_input)->lock );
+ if( b_need_update == true )
{
- info_category_t *p_cat = p_input->input.p_item->pp_categories[i];
-
- wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root,
- wxU(p_cat->psz_name) );
- for( int j = 0; j < p_cat->i_infos; j++ )
- {
- info_t *p_info = p_cat->pp_infos[j];
-
- if( p_info->psz_value[0] != 0 )
- /* We only wanna show fields that have an actual value */
- {
- fileinfo_tree->AppendItem( cat, (wxString)wxU(p_info->psz_name)
- + wxT(": ") + wxU(p_info->psz_value) );
- }
- }
- fileinfo_tree->Expand( cat );
+ 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) );
}
- vlc_mutex_unlock( &p_input->input.p_item->lock );
-
- b_need_update = VLC_FALSE;
+ if( b_stats )
+ stats_info->Update( input_GetItem(p_input) );
+ vlc_mutex_unlock( &input_GetItem(p_input)->lock );
vlc_object_release(p_input);
+ pl_Release( p_intf );
+ b_need_update = false;
+ panel_sizer->Layout();
+
return;
}
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;
}
projects / vlc / blobdiff