Changeset 1595dc2534196eac95a1488e864292fab033e99c

Timestamp:

05/01/04 14:00:39 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1073307639 +0000

git-parent:

[aa830d43217dd81fa8dda23613d394d58c0f38d0]

git-author:

Clément Stenac <zorglub@videolan.org> 1073307639 +0000

Message:

modules/gui/wxwindows/playlist.cpp
modules/gui/wxwindows/iteminfo.cpp

• Show the info as a tree view.
  At the moment, all is shown. We should maybe hide the "Options" tree
  as it rather "internal"
  
• Improved a little the layout
  
• Added a popup menu to to the playlist
  
• Minimize playlist rebuilds
  

Files:

• modules/gui/wxwindows/dialogs.cpp (modified) (2 diffs)
• modules/gui/wxwindows/interface.cpp (modified) (4 diffs)
• modules/gui/wxwindows/iteminfo.cpp (modified) (4 diffs)
• modules/gui/wxwindows/open.cpp (modified) (4 diffs)
• modules/gui/wxwindows/playlist.cpp (modified) (16 diffs)
• modules/gui/wxwindows/streamwizard.cpp (modified) (3 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (8 diffs)

modules/gui/wxwindows/dialogs.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-2 2003/12/11 02:26:03 asmax
+3 2004/01/05 13:00:39 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -290 +290 @@
-            if( event.GetInt() )
-                playlist_Add( p_playlist, (const char *)paths[i].mb_str(),
-0, 0
+(const char *)paths[i].mb_str()
-                              PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO),
-                              PLAYLIST_END );
-            else
-                playlist_Add( p_playlist, (const char *)paths[i].mb_str(),
-
+
+
-    }
-

modules/gui/wxwindows/interface.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001, 2003 VideoLAN
-2 2004/01/03 10:55:07 gbazin
+3 2004/01/05 13:00:39 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -209 +209 @@
-Interface::Interface( intf_thread_t *_p_intf ):
-    wxFrame( NULL, -1, wxT("VLC media player"),
-DefaultSize
+Size(700,100)
-{
-    /* Initializations */
@@ -1175 +1175 @@
-#endif
-
+#undef WIN32
-    vlc_mutex_unlock( &p_intf->change_lock );
-}
@@ -1313 +1314 @@
-
-    for( size_t i = 0; i < filenames.GetCount(); i++ )
-
+
+
-                      PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
-                      PLAYLIST_END );

modules/gui/wxwindows/iteminfo.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-5 2003/12/22 02:24:52 sam
+6 2004/01/05 13:00:39 zorglub
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -141 +141 @@
-wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
-{
-
+info_
-                                  wxDefaultSize );
-
-
+
+
+
+
+
-                                   wxU(_("Item informations")) );
-
+
+
-                                                          wxVERTICAL );
-
-    info_subpanel = new wxPanel( panel, -1 );
-
-    wxFlexGridSizer *subpanel_sizer =
-                    new wxFlexGridSizer( 3, 1 , 0 , 0 );
-
-    /* URI Textbox */
-    wxStaticText *uri_label =
-info_sub
-
-sub
+ info_
+
+
-                                wxU(p_item->psz_uri),
-                                wxDefaultPosition, wxSize( 300, -1 ),
-                                wxTE_PROCESS_ENTER);
-
-
-
-
-
-
+
+
+
+
+
+
-
-    /* Name Textbox */
-    wxStaticText *name_label =
-info_sub
+  info_
-
-    name_text =
-sub
+
-                                   wxU(p_item->psz_name),
-                                   wxDefaultPosition, wxSize( 300, -1 ),
-                                   wxTE_PROCESS_ENTER);
-
-
-
-
-
+
+
+
+
+
+
-
-    /* Author Textbox */
-    wxStaticText *author_label =
-info_sub
+ info_
-
-    author_text =
-
-
+
+
+
-                                   wxDefaultPosition, wxSize( 300, -1 ),
-                                   wxTE_PROCESS_ENTER);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -277 +287 @@
-}
-
+void ItemInfoDialog::UpdateInfo()
+{
+    if( !info_root )
+    {
+       info_root = info_tree->AddRoot( wxU( p_item->psz_name) );
+    }
+
+    /* Rebuild the tree */
+    for( int i = 0; i< p_item->i_categories ; i++)
+    {
+        if( !strcmp( p_item->pp_categories[i]->psz_name, _("Options") ) )
+        {
+            continue;
+        }
+        wxTreeItemId cat = info_tree->AppendItem( info_root,
+                            wxU( p_item->pp_categories[i]->psz_name) );
+
+        for( int j = 0 ; j < p_item->pp_categories[i]->i_infos ; j++ )
+        {
+           info_tree->AppendItem( cat , (wxString)
+                      wxU(p_item->pp_categories[i]->pp_infos[j]->psz_name) +
+                      wxT(": ") +
+                      wxU(p_item->pp_categories[i]->pp_infos[j]->psz_value) );
+        }
+    }
+}
+
-/*****************************************************************************
- * Events methods.
@@ -284 +321 @@
-    p_item->psz_name = strdup( name_text->GetLineText(0).mb_str() );
-    p_item->psz_uri = strdup( uri_text->GetLineText(0).mb_str() );
-
+
+
-    vlc_bool_t b_old_enabled = p_item->b_enabled;
-

modules/gui/wxwindows/open.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001, 2003 VideoLAN
-1 2003/12/22 15:42:43 gbazin
+2 2004/01/05 13:00:39 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -903 +903 @@
-    for( int i = 0; i < (int)mrl.GetCount(); i++ )
-    {
-
-
+
+
+
+
+
+
-
-        /* Count the input options */
@@ -913 +917 @@
-        }
-
-Allocate ppsz_
+Insert 
-        for( int j = 0; j < i_options; j++ )
-        {
-
-
-
-
-
-
-
+
+
-
-        /* Get the options from the subtitles dialog */
-        if( subsfile_checkbox->IsChecked() && subsfile_mrl.GetCount() )
-        {
-            ppsz_options = (char **)realloc( ppsz_options, sizeof(char *) *
-                               (i_total_options + subsfile_mrl.GetCount()) );
-
-            for( int j = 0; j < (int)subsfile_mrl.GetCount(); j++ )
-            {
-psz_options[i_total_options + j] =
-strdup(
+laylist_AddOption( p_playlist, i_pos ,
+               
-            }
-
-            i_total_options += subsfile_mrl.GetCount();
-        }
-
@@ -942 +936 @@
-        if( sout_checkbox->IsChecked() && sout_mrl.GetCount() )
-        {
-            ppsz_options = (char **)realloc( ppsz_options, sizeof(char *) *
-                               (i_total_options + sout_mrl.GetCount()) );
-
-            for( int j = 0; j < (int)sout_mrl.GetCount(); j++ )
-            {
-psz_options[i_total_options + j] =
-strdup(
+laylist_AddOption( p_playlist, i_pos ,
+               
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        i += i_options;
-    }

modules/gui/wxwindows/playlist.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001, 2003 VideoLAN
-2 2003/12/22 14:31:01 gbazin
+3 2004/01/05 13:00:39 zorglub
- *
- * Authors: Olivier Teuli� <ipkiss@via.ecp.fr>
@@ -34 +34 @@
-int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
-                     vlc_value_t old_val, vlc_value_t new_val, void *param );
+int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
+                     vlc_value_t old_val, vlc_value_t new_val, void *param );
+int ItemChanged( vlc_object_t *p_this, const char *psz_variable,
+                     vlc_value_t old_val, vlc_value_t new_val, void *param );
-
-/*****************************************************************************
@@ -73 +77 @@
-    Down_Event,
-    Infos_Event,
+
+    PopupPlay_Event,
+    PopupDel_Event,
+    PopupEna_Event,
+    PopupInfo_Event,
-
-    SearchText_Event,
@@ -115 +124 @@
-    EVT_LIST_COL_CLICK(ListView_Event, Playlist::OnColSelect)
-    EVT_LIST_KEY_DOWN(ListView_Event, Playlist::OnKeyDown)
+    EVT_LIST_ITEM_RIGHT_CLICK(ListView_Event, Playlist::OnPopup)
+
+    /* Popup events */
+    EVT_MENU( PopupPlay_Event, Playlist::OnPopupPlay)
+    EVT_MENU( PopupDel_Event, Playlist::OnPopupDel)
+    EVT_MENU( PopupEna_Event, Playlist::OnPopupEna)
+    EVT_MENU( PopupInfo_Event, Playlist::OnPopupInfo)
+
-
-    /* Button events */
@@ -215 +232 @@
-    SetMenuBar( menubar );
-
+    /* Create the popup menu */
+    popup_menu = new wxMenu;
+    popup_menu->Append( PopupPlay_Event, wxU(_("Play item")) );
+    popup_menu->Append( PopupDel_Event, wxU(_("Delete item")) );
+    popup_menu->Append( PopupEna_Event, wxU(_("Toggle enabled")) );
+    popup_menu->Append( PopupInfo_Event, wxU(_("Info on item")) );
-
-    /* Create a panel to put everything in */
@@ -341 +364 @@
-
-    /* We want to be noticed of playlist changes */
+
+    /* Some global changes happened -> Rebuild all */
-    var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
+
+    /* We went to the next item */
+    var_AddCallback( p_playlist, "playlist-current", PlaylistNext, this );
+
+    /* One item has been updated */
+    var_AddCallback( p_playlist, "item-change", ItemChanged, this );
+
+
-    vlc_object_release( p_playlist );
-
@@ -362 +395 @@
-    var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this );
-    vlc_object_release( p_playlist );
+}
+
+/**********************************************************************
+ * Update one playlist item
+ **********************************************************************/
+void Playlist::UpdateItem( int i )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+    if( p_playlist == NULL )
+    {
+        return;
+    }
+    if( i < 0 || i > p_playlist->i_size )
+    {
+        vlc_object_release(p_playlist);
+        return;
+    }
+    listview->SetItem( i, 0, wxL2U(p_playlist->pp_items[i]->psz_name) );
+    listview->SetItem( i, 1, wxL2U( playlist_GetInfo( p_playlist, i,
+                                       "General" , "Author" ) ) );
+    listview->SetItem( i, 2,
+             wxL2U(playlist_FindGroup(p_playlist,p_playlist->
+                                    pp_items[i]->i_group) ) );
+
+    if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
+    {
+        wxListItem listitem;
+        listitem.m_itemId = i;
+        listitem.SetTextColour( *wxLIGHT_GREY);
+        listview->SetItem(listitem);
+    }
+
+    char psz_duration[MSTRTIME_MAX_SIZE];
+    mtime_t dur = p_playlist->pp_items[i]->i_duration;
+    if( dur != -1 ) secstotimestr( psz_duration, dur/1000000 );
+    else memcpy( psz_duration , "-:--:--", sizeof("-:--:--") );
+    listview->SetItem( i, 3, wxU(psz_duration) );
+
+    /* Change the colour for the currenty played stream */
+    wxListItem listitem;
+    listitem.m_itemId = i;
+    if( i == p_playlist->i_index )
+    {
+        listitem.SetTextColour( *wxRED );
+    }
+    else
+    {
+        listitem.SetTextColour( *wxBLACK );
+    }
+    listview->SetItem( listitem );
+
+    vlc_object_release(p_playlist);
-}
-
@@ -388 +475 @@
-        wxString filename = wxL2U(p_playlist->pp_items[i]->psz_name);
-        listview->InsertItem( i, filename );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-    /* Change the colour for the currenty played stream */
-    wxListItem listitem;
-    listitem.m_itemId = p_playlist->i_index;
-    listitem.SetTextColour( *wxRED );
-    listview->SetItem( listitem );
-
-    if( i_focused )
@@ -816 +881 @@
-        {
-            playlist_Enable( p_playlist, item );
+            UpdateItem( item );
-        }
-    }
-    vlc_object_release( p_playlist);
-    Rebuild();
-}
-
@@ -837 +902 @@
-        {
-            playlist_Disable( p_playlist, item );
+            UpdateItem( item );
-        }
-    }
-    vlc_object_release( p_playlist);
-    Rebuild();
-}
-
@@ -913 +978 @@
-    vlc_object_release( p_playlist );
-}
+
-void Playlist::OnKeyDown( wxListEvent& event )
-{
@@ -924 +990 @@
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    if( iteminfo_dialog == NULL )
-    {
-        /* We use the first selected item, so find it */
-        long i_item = listview->GetNextItem( i_item, wxLIST_NEXT_ALL,
-                                             wxLIST_STATE_SELECTED );
-        if( i_item >= 0 && i_item < p_playlist->i_size )
-        {
@@ -944 +1006 @@
-                              p_intf, p_playlist->pp_items[i_item], this );
-            if( iteminfo_dialog->ShowModal()  == wxID_OK )
-Rebuild(
+UpdateItem( i_item 
-            delete iteminfo_dialog;
-            iteminfo_dialog = NULL;
@@ -950 +1012 @@
-    }
-    vlc_object_release( p_playlist );
+}
+
+void Playlist::OnInfos( wxCommandEvent& WXUNUSED(event) )
+{
+    /* We use the first selected item, so find it */
+    long i_item = listview->GetNextItem( -1 , wxLIST_NEXT_ALL,
+                                         wxLIST_STATE_SELECTED );
+    ShowInfos( i_item );
-}
-
@@ -985 +1055 @@
-
-/*****************************************************************************
+ * Popup management functions
+ *****************************************************************************/
+void Playlist::OnPopup( wxListEvent& event )
+{
+    i_popup_item = event.GetIndex();
+    Playlist::PopupMenu( popup_menu , ScreenToClient( wxGetMousePosition() ) );
+}
+
+
+void Playlist::OnPopupPlay( wxMenuEvent& event )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+    if( p_playlist == NULL )
+    {
+        return;
+    }
+    if( i_popup_item != -1 )
+    {
+        playlist_Goto( p_playlist, i_popup_item );
+    }
+    vlc_object_release( p_playlist );
+}
+
+void Playlist::OnPopupDel( wxMenuEvent& event )
+{
+    DeleteItem( i_popup_item );
+}
+
+void Playlist::OnPopupEna( wxMenuEvent& event )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+    if( p_playlist == NULL )
+    {
+        return;
+    }
+
+    if( p_playlist->pp_items[i_popup_item]->b_enabled )
+        //playlist_IsEnabled( p_playlist, i_popup_item ) )
+    {
+        playlist_Disable( p_playlist, i_popup_item );
+    }
+    else
+    {
+        playlist_Enable( p_playlist, i_popup_item );
+    }
+    vlc_object_release( p_playlist);
+    UpdateItem( i_popup_item );
+}
+
+void Playlist::OnPopupInfo( wxMenuEvent& event )
+{
+    ShowInfos( i_popup_item );
+}
+
+/*****************************************************************************
- * PlaylistChanged: callback triggered by the intf-change playlist variable
- *  We don't rebuild the playlist directly here because we don't want the
@@ -999 +1128 @@
-}
-
+/*****************************************************************************
+ * Next: callback triggered by the playlist-current playlist variable
+ *****************************************************************************/
+int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
+                 vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+    Playlist *p_playlist_dialog = (Playlist *)param;
+    p_playlist_dialog->UpdateItem( old_val.i_int );
+    p_playlist_dialog->UpdateItem( new_val.i_int );
+    return 0;
+}
+
+
+/*****************************************************************************
+ * ItemChanged: callback triggered by the item-change playlist variable
+ *****************************************************************************/
+int ItemChanged( vlc_object_t *p_this, const char *psz_variable,
+                 vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+    Playlist *p_playlist_dialog = (Playlist *)param;
+    p_playlist_dialog->UpdateItem( new_val.i_int );
+}
+
-
-/***************************************************************************

modules/gui/wxwindows/streamwizard.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-3 2003/12/22 02:24:52 sam
+4 2004/01/05 13:00:39 zorglub
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -205 +205 @@
-    for( int i = 0; i < (int)p_open_dialog->mrl.GetCount(); i++ )
-    {
-
-
+
+
+
+
+
+
-
-        /* Count the input options */
@@ -216 +220 @@
-        }
-
-Allocate ppsz_
+Insert 
-        for( int j = 0; j < i_options; j++ )
-        {
-
-
-
-
+
+
-        }
-
-        i_total_options = i_options;
-
-        /* Get the options from the stream output dialog */
-        if( sout_mrl.GetCount() )
-        {
-            ppsz_options = (char **)realloc( ppsz_options, sizeof(char *) *
-                               (i_total_options + sout_mrl.GetCount()) );
-
-            for( int j = 0; j < (int)sout_mrl.GetCount(); j++ )
-            {
-psz_options[i_total_options + j] =
-strdup(
+laylist_AddOption( p_playlist, i_pos ,
+               
-            }
-
-            i_total_options += sout_mrl.GetCount();
-
-        }
-
-
-
-
-
-
-
-
+
+
-
-        i += i_options;

modules/gui/wxwindows/wxwindows.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-2 2003/12/22 14:31:01 gbazin
+3 2004/01/05 13:00:39 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -750 +750 @@
-    void UpdatePlaylist();
-    void ShowPlaylist( bool show );
+    void UpdateItem( int );
-
-    bool b_need_update;
@@ -756 +757 @@
-private:
-    void DeleteItem( int item );
+    void ShowInfos( int item );
-
-    /* Event handlers (these functions should _not_ be virtual) */
@@ -786 +788 @@
-    void OnNewGroup( wxCommandEvent& event );
-
+    /* Popup functions */
+    void OnPopup( wxListEvent& event );
+    void OnPopupPlay( wxMenuEvent& event );
+    void OnPopupDel( wxMenuEvent& event );
+    void OnPopupEna( wxMenuEvent& event );
+    void OnPopupInfo( wxMenuEvent& event );
-    void Rebuild();
-
@@ -792 +800 @@
-    DECLARE_EVENT_TABLE();
-
+    wxMenu *popup_menu;
-
-    ItemInfoDialog *iteminfo_dialog;
@@ -801 +810 @@
-    int i_sort_mode;
-
+    int i_popup_item;
+
-    int i_title_sorted;
-    int i_author_sorted;
@@ -852 +863 @@
-    void OnNewGroup( wxCommandEvent& event );
-
+    void UpdateInfo();
+
-    DECLARE_EVENT_TABLE();
-
@@ -868 +881 @@
-    wxTextCtrl *name_text;
-    wxTextCtrl *author_text;
+
+    wxTreeCtrl *info_tree;
+    wxTreeItemId info_root;
-
-    wxCheckBox *enabled_checkbox;