/*****************************************************************************
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: fileinfo.cpp,v 1.17 2003/07/12 13:33:10 gbazin Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id$
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <errno.h> /* ENOMEM */
-#include <string.h> /* strerror() */
-#include <stdio.h>
-
#include <vlc/vlc.h>
-
-#ifdef WIN32 /* mingw32 hack */
-#undef Yield
-#undef CreateDialog
-#endif
-
-/* Let vlc take care of the i18n stuff */
-#define WXINTL_NO_GETTEXT_MACRO
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-#include <wx/treectrl.h>
-
#include <vlc/intf.h>
-#if defined MODULE_NAME_IS_skins
-# include "../skins/src/skin_common.h"
-#endif
-
#include "wxwindows.h"
/*****************************************************************************
* Event Table.
*****************************************************************************/
+static int ItemChanged( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+
+
/* IDs for the controls and the menu commands */
enum
{
BEGIN_EVENT_TABLE(FileInfo, wxFrame)
/* Button events */
- EVT_BUTTON(wxID_OK, FileInfo::OnClose)
+ EVT_BUTTON(wxID_OK, 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(_("FileInfo")), wxDefaultPosition,
+ wxFrame( p_parent, -1, wxU(_("Stream and media info")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
+ playlist_t *p_playlist;
+
/* Initializations */
p_intf = _p_intf;
SetIcon( *p_intf->p_sys->p_icon );
fileinfo_root_label = wxT("");
- /* Create the OK button */
- wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("Close")) );
- ok_button->SetDefault();
-
/* Place everything in sizers */
- wxBoxSizer *ok_button_sizer = new wxBoxSizer( wxHORIZONTAL );
- ok_button_sizer->Add( ok_button, 0, wxALL, 5 );
- ok_button_sizer->Layout();
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
panel_sizer->Add( fileinfo_tree, 1, wxEXPAND | wxALL, 5 );
- panel_sizer->Add( ok_button_sizer, 0, wxALIGN_CENTRE );
panel_sizer->Layout();
panel->SetSizerAndFit( panel_sizer );
main_sizer->Add( panel, 1, wxEXPAND, 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 );
+ }
+
+ b_need_update = VLC_TRUE;
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 )
{
* 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( wxU(p_input->psz_name) );
- fileinfo_root_label = wxU(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 == wxU(p_input->psz_name) )
+ else if( fileinfo_root_label == wxL2U(p_input->input.p_item->psz_name) &&
+ b_need_update == VLC_FALSE )
{
return;
}
/* We rebuild the tree from scratch */
fileinfo_tree->DeleteChildren( fileinfo_root );
- fileinfo_root_label = wxU(p_input->psz_name);
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ fileinfo_root_label = wxL2U(p_input->input.p_item->psz_name);
- input_info_category_t *p_cat = p_input->stream.p_info;
-
- while( p_cat )
+ 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->input.p_item->pp_categories[i];
+
wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root,
wxU(p_cat->psz_name) );
- input_info_t *p_info = p_cat->p_info;
- while( p_info )
+ for( int j = 0; j < p_cat->i_infos; j++ )
{
+ info_t *p_info = p_cat->pp_infos[j];
+
fileinfo_tree->AppendItem( cat, (wxString)wxU(p_info->psz_name) +
wxT(": ") + wxU(p_info->psz_value) );
- p_info = p_info->p_next;
}
- p_cat = p_cat->p_next;
fileinfo_tree->Expand( cat );
}
+ vlc_mutex_unlock( &p_input->input.p_item->lock );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ b_need_update = VLC_FALSE;
return;
}
{
}
-void FileInfo::OnClose( wxCommandEvent& event )
+void FileInfo::OnButtonClose( wxCommandEvent& event )
+{
+ wxCloseEvent cevent;
+ OnClose(cevent);
+}
+
+void FileInfo::OnClose( wxCloseEvent& WXUNUSED(event) )
{
Hide();
}
+
+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;
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff