X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwxwindows%2Fplaylist.cpp;h=744bcf009812271720231fd4ec2dc1520482f7c1;hb=301ea6e495df7e0ce311301ae28749e428dbcb69;hp=c3ec344338328d6c16610b6354e805be155d987e;hpb=151a7cdf2a5c4fe998567691a89960ae296849e7;p=vlc diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp index c3ec344338..744bcf0098 100644 --- a/modules/gui/wxwindows/playlist.cpp +++ b/modules/gui/wxwindows/playlist.cpp @@ -1,12 +1,13 @@ /***************************************************************************** * playlist.cpp : wxWindows plugin for vlc ***************************************************************************** - * Copyright (C) 2000-2001 VideoLAN - * $Id: playlist.cpp,v 1.25 2003/11/21 13:20:41 zorglub Exp $ + * Copyright (C) 2000-2004 VideoLAN + * $Id$ * * Authors: Olivier Teulière + * Clément Stenac * - * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/OR MODIFy * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. @@ -24,20 +25,44 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* ENOMEM */ -#include /* strerror() */ -#include - #include #include #include "wxwindows.h" -#include + +#include "bitmaps/shuffle.xpm" +#include "bitmaps/repeat.xpm" +#include "bitmaps/loop.xpm" + +#include "bitmaps/type_unknown.xpm" +#include "bitmaps/type_afile.xpm" +#include "bitmaps/type_vfile.xpm" +#include "bitmaps/type_net.xpm" +#include "bitmaps/type_card.xpm" +#include "bitmaps/type_disc.xpm" +#include "bitmaps/type_cdda.xpm" +#include "bitmaps/type_directory.xpm" +#include "bitmaps/type_playlist.xpm" +#include "bitmaps/type_node.xpm" + +#include +#include + +#define HELP_SHUFFLE N_( "Shuffle" ) +#define HELP_LOOP N_( "Loop" ) +#define HELP_REPEAT N_( "Repeat" ) /* Callback prototype */ -int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, - vlc_value_t old_val, vlc_value_t new_val, void *param ); +static int PlaylistChanged( vlc_object_t *, const char *, + vlc_value_t, vlc_value_t, void * ); +static int PlaylistNext( vlc_object_t *, const char *, + vlc_value_t, vlc_value_t, void * ); +static int ItemChanged( vlc_object_t *, const char *, + vlc_value_t, vlc_value_t, void * ); +static int ItemAppended( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t oval, vlc_value_t nval, void *param ); +static int ItemDeleted( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t oval, vlc_value_t nval, void *param ); /***************************************************************************** * Event Table. @@ -48,6 +73,7 @@ enum { /* menu items */ AddFile_Event = 1, + AddDir_Event, AddMRL_Event, Close_Event, Open_Event, @@ -55,13 +81,7 @@ enum SortTitle_Event, RSortTitle_Event, - SortAuthor_Event, - RSortAuthor_Event, - SortGroup_Event, - RSortGroup_Event, - - EnableSelection_Event, - DisableSelection_Event, + Randomize_Event, InvertSelection_Event, DeleteSelection_Event, @@ -70,23 +90,43 @@ enum Repeat_Event, SelectAll_Event, - EnableGroup_Event, - DisableGroup_Event, - - Up_Event, - Down_Event, - Infos_Event, + PopupPlay_Event, + PopupPlayThis_Event, + PopupPreparse_Event, + PopupSort_Event, + PopupDel_Event, + PopupInfo_Event, SearchText_Event, Search_Event, /* controls */ - ListView_Event + TreeCtrl_Event, + + Browse_Event, /* For export playlist */ + + /* custom events */ + UpdateItem_Event, + AppendItem_Event, + RemoveItem_Event, + + MenuDummy_Event = wxID_HIGHEST + 999, + + FirstView_Event = wxID_HIGHEST + 1000, + LastView_Event = wxID_HIGHEST + 1100, + + FirstSD_Event = wxID_HIGHEST + 2000, + LastSD_Event = wxID_HIGHEST + 2100, }; +DEFINE_LOCAL_EVENT_TYPE( wxEVT_PLAYLIST ); + BEGIN_EVENT_TABLE(Playlist, wxFrame) + EVT_SIZE(Playlist::OnSize) + /* Menu events */ EVT_MENU(AddFile_Event, Playlist::OnAddFile) + EVT_MENU(AddDir_Event, Playlist::OnAddDir) EVT_MENU(AddMRL_Event, Playlist::OnAddMRL) EVT_MENU(Close_Event, Playlist::OnClose) EVT_MENU(Open_Event, Playlist::OnOpen) @@ -94,85 +134,103 @@ BEGIN_EVENT_TABLE(Playlist, wxFrame) EVT_MENU(SortTitle_Event, Playlist::OnSort) EVT_MENU(RSortTitle_Event, Playlist::OnSort) - EVT_MENU(SortAuthor_Event, Playlist::OnSort) - EVT_MENU(RSortAuthor_Event, Playlist::OnSort) - EVT_MENU(SortGroup_Event, Playlist::OnSort) - EVT_MENU(RSortGroup_Event, Playlist::OnSort) - EVT_MENU(EnableSelection_Event, Playlist::OnEnableSelection) - EVT_MENU(DisableSelection_Event, Playlist::OnDisableSelection) + EVT_MENU(Randomize_Event, Playlist::OnSort) + EVT_MENU(InvertSelection_Event, Playlist::OnInvertSelection) EVT_MENU(DeleteSelection_Event, Playlist::OnDeleteSelection) EVT_MENU(SelectAll_Event, Playlist::OnSelectAll) - EVT_MENU(Infos_Event, Playlist::OnInfos) - EVT_CHECKBOX(Random_Event, Playlist::OnRandom) - EVT_CHECKBOX(Repeat_Event, Playlist::OnRepeat) - EVT_CHECKBOX(Loop_Event, Playlist::OnLoop) - EVT_MENU(EnableGroup_Event, Playlist::OnEnDis) - EVT_MENU(DisableGroup_Event, Playlist::OnEnDis) + EVT_MENU_OPEN( Playlist::OnMenuOpen ) + EVT_MENU( -1, Playlist::OnMenuEvent ) + + EVT_TOOL(Random_Event, Playlist::OnRandom) + EVT_TOOL(Repeat_Event, Playlist::OnRepeat) + EVT_TOOL(Loop_Event, Playlist::OnLoop) - /* Listview events */ - EVT_LIST_ITEM_ACTIVATED(ListView_Event, Playlist::OnActivateItem) - EVT_LIST_COL_CLICK(ListView_Event, Playlist::OnColSelect) - EVT_LIST_KEY_DOWN(ListView_Event, Playlist::OnKeyDown) + /* Popup events */ + EVT_MENU( PopupPlay_Event, Playlist::OnPopupPlay) + EVT_MENU( PopupPlayThis_Event, Playlist::OnPopupPlay) + EVT_MENU( PopupPreparse_Event, Playlist::OnPopupPreparse) + EVT_MENU( PopupSort_Event, Playlist::OnPopupSort) + EVT_MENU( PopupDel_Event, Playlist::OnPopupDel) + EVT_MENU( PopupInfo_Event, Playlist::OnPopupInfo) + + /* Tree control events */ + EVT_TREE_ITEM_ACTIVATED( TreeCtrl_Event, Playlist::OnActivateItem ) + + EVT_CONTEXT_MENU( Playlist::OnPopup ) /* Button events */ EVT_BUTTON( Search_Event, Playlist::OnSearch) EVT_BUTTON( Save_Event, Playlist::OnSave) - EVT_BUTTON( Infos_Event, Playlist::OnInfos) - - EVT_BUTTON( Up_Event, Playlist::OnUp) - EVT_BUTTON( Down_Event, Playlist::OnDown) EVT_TEXT(SearchText_Event, Playlist::OnSearchTextChange) + /* Custom events */ + EVT_COMMAND(-1, wxEVT_PLAYLIST, Playlist::OnPlaylistEvent) + /* Special events : we don't want to destroy the window when the user * clicks on (X) */ EVT_CLOSE(Playlist::OnClose) END_EVENT_TABLE() - -/* Event Table for the Newgroup class */ -BEGIN_EVENT_TABLE(NewGroup, wxDialog) - EVT_BUTTON( wxID_OK, NewGroup::OnOk) - EVT_BUTTON( wxID_CANCEL, NewGroup::OnCancel) -END_EVENT_TABLE() +/***************************************************************************** + * PlaylistItem class + ****************************************************************************/ +class PlaylistItem : public wxTreeItemData +{ +public: + PlaylistItem( playlist_item_t *_p_item ) : wxTreeItemData() + { + p_item = _p_item; + i_id = p_item->input.i_id; + } +protected: + playlist_item_t *p_item; + int i_id; +friend class Playlist; +}; /***************************************************************************** * Constructor. *****************************************************************************/ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): wxFrame( p_parent, -1, wxU(_("Playlist")), wxDefaultPosition, - wxDefaultSize, wxDEFAULT_FRAME_STYLE ) + wxSize(345,400), wxDEFAULT_FRAME_STYLE ) { + vlc_value_t val; + /* Initializations */ - iteminfo_dialog = NULL; p_intf = _p_intf; - vlc_value_t val; i_update_counter = 0; i_sort_mode = MODE_NONE; b_need_update = VLC_FALSE; - vlc_mutex_init( p_intf, &lock ); SetIcon( *p_intf->p_sys->p_icon ); + p_view_menu = NULL; + p_sd_menu = SDMenu(); + + i_current_view = VIEW_SIMPLE; + b_changed_view = VLC_FALSE; + i_title_sorted = 0; - i_author_sorted = 0; i_group_sorted = 0; + i_duration_sorted = 0; - - var_Create( p_intf, "random", VLC_VAR_BOOL ); - var_Change( p_intf, "random", VLC_VAR_INHERITVALUE, & val, NULL ); - var_Create( p_intf, "loop", VLC_VAR_BOOL ); - var_Create( p_intf, "loop", VLC_VAR_BOOL ); - var_Change( p_intf, "repeat", VLC_VAR_INHERITVALUE, & val, NULL ); - var_Change( p_intf, "repeat", VLC_VAR_INHERITVALUE, & val, NULL ); + var_Create( p_intf, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_intf, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_intf, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );; /* Create our "Manage" menu */ wxMenu *manage_menu = new wxMenu; - manage_menu->Append( AddFile_Event, wxU(_("&Simple Add...")) ); + manage_menu->Append( AddFile_Event, wxU(_("&Simple Add File...")) ); + manage_menu->Append( AddDir_Event, wxU(_("Add &Directory...")) ); manage_menu->Append( AddMRL_Event, wxU(_("&Add MRL...")) ); manage_menu->AppendSeparator(); + manage_menu->Append( MenuDummy_Event, wxU(_("Services discovery")), + p_sd_menu ); + manage_menu->AppendSeparator(); manage_menu->Append( Open_Event, wxU(_("&Open Playlist...")) ); manage_menu->Append( Save_Event, wxU(_("&Save Playlist...")) ); manage_menu->AppendSeparator(); @@ -180,157 +238,135 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): /* Create our "Sort" menu */ wxMenu *sort_menu = new wxMenu; - sort_menu->Append( SortTitle_Event, wxU(_("&Sort by title")) ); + sort_menu->Append( SortTitle_Event, wxU(_("Sort by &title")) ); sort_menu->Append( RSortTitle_Event, wxU(_("&Reverse sort by title")) ); sort_menu->AppendSeparator(); - sort_menu->Append( SortAuthor_Event, wxU(_("&Sort by author")) ); - sort_menu->Append( RSortAuthor_Event, wxU(_("&Reverse sort by author")) ); - sort_menu->AppendSeparator(); - sort_menu->Append( SortGroup_Event, wxU(_("&Sort by group")) ); - sort_menu->Append( RSortGroup_Event, wxU(_("&Reverse sort by group")) ); + sort_menu->Append( Randomize_Event, wxU(_("&Shuffle Playlist")) ); /* Create our "Selection" menu */ wxMenu *selection_menu = new wxMenu; - selection_menu->Append( EnableSelection_Event, wxU(_("&Enable")) ); - selection_menu->Append( DisableSelection_Event, wxU(_("&Disable")) ); - selection_menu->AppendSeparator(); selection_menu->Append( InvertSelection_Event, wxU(_("&Invert")) ); - selection_menu->Append( DeleteSelection_Event, wxU(_("&Delete")) ); + selection_menu->Append( DeleteSelection_Event, wxU(_("D&elete")) ); selection_menu->Append( SelectAll_Event, wxU(_("&Select All")) ); - /* Create our "Group" menu */ - wxMenu *group_menu = new wxMenu; - group_menu->Append( EnableGroup_Event, wxU(_("&Enable all group items")) ); - group_menu->Append( DisableGroup_Event, - wxU(_("&Disable all group items")) ); + /* Create our "View" menu */ + ViewMenu(); /* Append the freshly created menus to the menu bar */ wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE ); menubar->Append( manage_menu, wxU(_("&Manage")) ); menubar->Append( sort_menu, wxU(_("S&ort")) ); menubar->Append( selection_menu, wxU(_("&Selection")) ); - menubar->Append( group_menu, wxU(_("&Groups")) ); + menubar->Append( p_view_menu, wxU(_("&View items") ) ); /* Attach the menu bar to the frame */ SetMenuBar( menubar ); + /* Create the popup menu */ + node_popup = new wxMenu; + node_popup->Append( PopupPlay_Event, wxU(_("Play")) ); + node_popup->Append( PopupPlayThis_Event, wxU(_("Play this branch")) ); + node_popup->Append( PopupPreparse_Event, wxU(_("Preparse")) ); + node_popup->Append( PopupSort_Event, wxU(_("Sort this branch")) ); + node_popup->Append( PopupDel_Event, wxU(_("Delete")) ); + node_popup->Append( PopupInfo_Event, wxU(_("Info")) ); + + item_popup = new wxMenu; + item_popup->Append( PopupPlay_Event, wxU(_("Play")) ); + item_popup->Append( PopupPreparse_Event, wxU(_("Preparse")) ); + item_popup->Append( PopupDel_Event, wxU(_("Delete")) ); + item_popup->Append( PopupInfo_Event, wxU(_("Info")) ); /* Create a panel to put everything in */ wxPanel *playlist_panel = new wxPanel( this, -1 ); playlist_panel->SetAutoLayout( TRUE ); - /* Create the Random checkbox */ - wxCheckBox *random_checkbox = - new wxCheckBox( playlist_panel, Random_Event, wxU(_("Random")) ); - var_Get( p_intf, "random", &val); - vlc_bool_t b_random = val.b_bool; - random_checkbox->SetValue( b_random == VLC_FALSE ? 0 : 1); - - /* Create the Loop Checkbox */ - wxCheckBox *loop_checkbox = - new wxCheckBox( playlist_panel, Loop_Event, wxU(_("Loop")) ); + /* Create the toolbar */ + wxToolBar *toolbar = + CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE ); + + /* Create the random tool */ + toolbar->AddTool( Random_Event, wxT(""), wxBitmap(shuffle_on_xpm), + wxBitmap(shuffle_on_xpm), wxITEM_CHECK, + wxU(_(HELP_SHUFFLE) ) ); + var_Get( p_intf, "random", &val ); + toolbar->ToggleTool( Random_Event, val.b_bool ); + + /* Create the Loop tool */ + toolbar->AddTool( Loop_Event, wxT(""), wxBitmap( loop_xpm), + wxBitmap( loop_xpm), wxITEM_CHECK, + wxU(_(HELP_LOOP ) ) ); var_Get( p_intf, "loop", &val ); - int b_loop = val.b_bool ; - loop_checkbox->SetValue( b_loop ); + toolbar->ToggleTool( Loop_Event, val.b_bool ); /* Create the Repeat one checkbox */ - wxCheckBox *repeat_checkbox = - new wxCheckBox( playlist_panel, Repeat_Event, wxU(_("Repeat one")) ); + toolbar->AddTool( Repeat_Event, wxT(""), wxBitmap( repeat_xpm), + wxBitmap( repeat_xpm), wxITEM_CHECK, + wxU(_(HELP_REPEAT ) ) ); var_Get( p_intf, "repeat", &val ); - int b_repeat = val.b_bool ; - repeat_checkbox->SetValue( b_repeat ); + toolbar->ToggleTool( Repeat_Event, val.b_bool ) ; /* Create the Search Textbox */ - search_text = - new wxTextCtrl( playlist_panel, SearchText_Event, wxT(""), - wxDefaultPosition, wxSize( 140, -1), - wxTE_PROCESS_ENTER); + search_text = new wxTextCtrl( toolbar, SearchText_Event, wxT(""), + wxDefaultPosition, wxSize(100, -1), + wxTE_PROCESS_ENTER); /* Create the search button */ - search_button = - new wxButton( playlist_panel, Search_Event, wxU(_("Search")) ); - - - /* Create the listview */ - /* FIXME: the given size is arbitrary, and prevents us from resizing - * the window to smaller dimensions. But the sizers don't seem to adjust - * themselves to the size of a listview, and with a wxDefaultSize the - * playlist window is ridiculously small */ - listview = new wxListView( playlist_panel, ListView_Event, - wxDefaultPosition, wxSize( 500, 300 ), - wxLC_REPORT | wxSUNKEN_BORDER ); - listview->InsertColumn( 0, wxU(_("Name")) ); - #if 0 - listview->InsertColumn( 1, wxU(_("Duration")) ); - #endif - listview->InsertColumn( 1, wxU(_("Author")) ); - listview->InsertColumn( 2, wxU(_("Group")) ); - listview->SetColumnWidth( 0, 270 ); - listview->SetColumnWidth( 1, 150 ); - listview->SetColumnWidth( 2, 80 ); - - /* Create the Up-Down buttons */ - wxButton *up_button = - new wxButton( playlist_panel, Up_Event, wxU(_("Up") ) ); - - wxButton *down_button = - new wxButton( playlist_panel, Down_Event, wxU(_("Down") ) ); - - /* Create the iteminfo button */ - wxButton *iteminfo_button = - new wxButton( playlist_panel, Infos_Event, wxU(_("Item Infos") ) ); - - /* Place everything in sizers */ - wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); - button_sizer->Add( iteminfo_button, 0, wxALIGN_CENTER|wxLEFT , 5); - button_sizer->Layout(); - - wxBoxSizer *updown_sizer = new wxBoxSizer( wxHORIZONTAL ); - updown_sizer->Add( up_button, 0, wxALIGN_LEFT|wxRIGHT, 3); - updown_sizer->Add( down_button, 0, wxALIGN_LEFT|wxLEFT, 3); - updown_sizer->Layout(); - - wxBoxSizer *checkbox_sizer = new wxBoxSizer( wxHORIZONTAL ); - checkbox_sizer->Add( random_checkbox, 0, - wxEXPAND|wxALIGN_RIGHT, 5); - checkbox_sizer->Add( loop_checkbox, 0, - wxEXPAND|wxALIGN_RIGHT, 5); - checkbox_sizer->Add( repeat_checkbox, 0, - wxEXPAND|wxALIGN_RIGHT, 5); - checkbox_sizer->Layout(); - - wxBoxSizer *search_sizer = new wxBoxSizer( wxHORIZONTAL ); - search_sizer->Add( search_text, 0, wxRIGHT|wxALIGN_CENTER, 3); - search_sizer->Add( search_button, 0, wxLEFT|wxALIGN_CENTER, 3); - search_sizer->Layout(); - - /* The top and bottom sizers */ - wxBoxSizer *top_sizer = new wxBoxSizer( wxHORIZONTAL ); - top_sizer->Add( checkbox_sizer, 0, wxLEFT|wxRIGHT|wxALIGN_LEFT, 4 ); - top_sizer->Add( search_sizer, 0, wxLEFT|wxRIGHT|wxALIGN_RIGHT, 4 ); - top_sizer->Layout(); - - wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL ); - bottom_sizer->Add( updown_sizer, 0, wxEXPAND |wxRIGHT | wxLEFT | wxALIGN_LEFT, 4); - bottom_sizer->Add( button_sizer , 0, wxEXPAND|wxLEFT | wxRIGHT | wxALIGN_RIGHT, 4 ); - bottom_sizer->Layout(); - - wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); + search_button = new wxButton( toolbar , Search_Event, wxU(_("Search")) ); + + toolbar->AddControl( new wxControl( toolbar, -1, wxDefaultPosition, + wxSize(16, 16), wxBORDER_NONE ) ); + toolbar->AddControl( search_text ); + toolbar->AddControl( new wxControl( toolbar, -1, wxDefaultPosition, + wxSize(5, 5), wxBORDER_NONE ) ); + toolbar->AddControl( search_button ); + search_button->SetDefault(); + toolbar->Realize(); + + /* Create the tree */ + treectrl = new wxTreeCtrl( playlist_panel, TreeCtrl_Event, + wxDefaultPosition, wxDefaultSize, + wxTR_HIDE_ROOT | wxTR_LINES_AT_ROOT| + wxTR_NO_LINES | + wxTR_HAS_BUTTONS | wxTR_TWIST_BUTTONS | + wxTR_MULTIPLE | wxTR_EXTENDED ); + + /* Create image list */ + wxImageList *p_images = new wxImageList( 16 , 16, TRUE ); + + /* FIXME: absolutely needs to be in the right order FIXME */ + p_images->Add( wxIcon( type_unknown_xpm ) ); + p_images->Add( wxIcon( type_afile_xpm ) ); + p_images->Add( wxIcon( type_vfile_xpm ) ); + p_images->Add( wxIcon( type_directory_xpm ) ); + p_images->Add( wxIcon( type_disc_xpm ) ); + p_images->Add( wxIcon( type_cdda_xpm ) ); + p_images->Add( wxIcon( type_card_xpm ) ); + p_images->Add( wxIcon( type_net_xpm ) ); + p_images->Add( wxIcon( type_playlist_xpm ) ); + p_images->Add( wxIcon( type_node_xpm ) ); + treectrl->AssignImageList( p_images ); + + treectrl->AddRoot( wxU(_("root" )), -1, -1, NULL ); + + /* Reduce font size */ + wxFont font= treectrl->GetFont(); + font.SetPointSize(8); + treectrl->SetFont( font ); wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL ); - panel_sizer->Add( top_sizer, 0, wxEXPAND | wxALL, 5 ); - panel_sizer->Add( listview, 1, wxEXPAND | wxALL, 5 ); - panel_sizer->Add( bottom_sizer, 0 , wxEXPAND | wxALL, 5); + panel_sizer->Add( treectrl, 1, wxEXPAND | wxALL, 5 ); panel_sizer->Layout(); playlist_panel->SetSizerAndFit( panel_sizer ); - main_sizer->Add( playlist_panel, 1, wxGROW, 0 ); - main_sizer->Layout(); - SetSizerAndFit( main_sizer ); -#if !defined(__WXX11__) + int pi_widths[1] = { -1 }; + statusbar = CreateStatusBar( 1 ); + statusbar->SetStatusWidths( 1, pi_widths ); + +#if wxUSE_DRAG_AND_DROP /* Associate drop targets with the playlist */ - SetDropTarget( new DragAndDrop( p_intf ) ); + SetDropTarget( new DragAndDrop( p_intf, VLC_TRUE ) ); #endif playlist_t *p_playlist = @@ -342,9 +378,22 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): } /* 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 ); + + var_AddCallback( p_playlist, "item-append", ItemAppended, this ); + var_AddCallback( p_playlist, "item-deleted", ItemDeleted, this ); + vlc_object_release( p_playlist ); + /* Update the playlist */ Rebuild(); } @@ -359,450 +408,605 @@ Playlist::~Playlist() return; } - delete iteminfo_dialog; - + var_DelCallback( p_playlist, "item-change", ItemChanged, this ); + var_DelCallback( p_playlist, "playlist-current", PlaylistNext, this ); var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this ); + var_DelCallback( p_playlist, "item-append", ItemAppended, this ); + var_DelCallback( p_playlist, "item-deleted", ItemDeleted, this ); vlc_object_release( p_playlist ); } /********************************************************************** - * Rebuild the playlist + * Update functions **********************************************************************/ -void Playlist::Rebuild() + +/* Update a node */ +void Playlist::UpdateNode( playlist_t *p_playlist, playlist_item_t *p_node, + wxTreeItemId node ) { - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + long cookie; + wxTreeItemId child; + for( int i = 0; i< p_node->i_children ; i++ ) { - return; - } - - int i_focused = listview->GetFocusedItem(); - - /* Clear the list... */ - listview->DeleteAllItems(); - - /* ...and rebuild it */ - vlc_mutex_lock( &p_playlist->object_lock ); - for( int i = 0; i < p_playlist->i_size; i++ ) - { - wxString filename = wxU(p_playlist->pp_items[i]->psz_name); - listview->InsertItem( i, filename ); - listview->SetItem( i, 1, wxU(p_playlist->pp_items[i]->psz_author)); - listview->SetItem( i, 2, - wxU(playlist_FindGroup(p_playlist,p_playlist-> - pp_items[i]->i_group))); - if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE ) + if( i == 0 ) { - wxListItem listitem; - listitem.m_itemId = i; - listitem.SetTextColour( *wxLIGHT_GREY); - listview->SetItem(listitem); + child = treectrl->GetFirstChild( node, cookie); + } + else + { + child = treectrl->GetNextChild( node, cookie ); } - /* FIXME: we should try to find the actual duration... */ - /* While we don't use it, hide it, it's ugly */ - #if 0 - listview->SetItem( i, 1, wxU(_("no info")) ); - #endif - } - 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 ) - { - listview->Focus( i_focused ); - listview->Select( i_focused ); - } - else - { - listview->Focus( p_playlist->i_index ); + if( !child.IsOk() ) + { + /* Not enough children */ + CreateNode( p_playlist, p_node->pp_children[i], node ); + /* Keep the tree pointer up to date */ + child = treectrl->GetNextChild( node, cookie ); + } + else + { + } } + treectrl->SetItemImage( node, p_node->input.i_type ); - vlc_object_release( p_playlist ); } -void Playlist::ShowPlaylist( bool show ) +/* Creates the node p_node as last child of parent */ +void Playlist::CreateNode( playlist_t *p_playlist, playlist_item_t *p_node, + wxTreeItemId parent ) { - if( show ) Rebuild(); - Show( show ); + wxTreeItemId node = + treectrl->AppendItem( parent, wxL2U( p_node->input.psz_name ), + -1,-1, new PlaylistItem( p_node ) ); + treectrl->SetItemImage( node, p_node->input.i_type ); + + UpdateNodeChildren( p_playlist, p_node, node ); } -void Playlist::UpdatePlaylist() +/* Update all children (recursively) of this node */ +void Playlist::UpdateNodeChildren( playlist_t *p_playlist, + playlist_item_t *p_node, + wxTreeItemId node ) { - vlc_bool_t b_need_update = VLC_FALSE; - i_update_counter++; - - /* If the playlist isn't show there's no need to update it */ - if( !IsShown() ) return; - vlc_mutex_lock( &lock ); - if( this->b_need_update ) + for( int i = 0; i< p_node->i_children ; i++ ) { - b_need_update =VLC_TRUE; - this->b_need_update = VLC_FALSE; + /* Append the item */ + if( p_node->pp_children[i]->i_children == -1 ) + { + wxTreeItemId item = + treectrl->AppendItem( node, + wxL2U( p_node->pp_children[i]->input.psz_name ), -1,-1, + new PlaylistItem( p_node->pp_children[i]) ); + + UpdateTreeItem( p_playlist, item ); + + treectrl->SetItemImage( item, + p_node->pp_children[i]->input.i_type ); + } + else + { + CreateNode( p_playlist, p_node->pp_children[i], + node ); + } } - vlc_mutex_unlock( &lock ); +} - if( b_need_update ) +/* Set current item */ +void Playlist::SetCurrentItem( wxTreeItemId item ) +{ + if( item.IsOk() ) { - Rebuild(); + treectrl->SetItemBold( item, true ); + treectrl->EnsureVisible( item ); } +} - /* Updating the playing status every 0.5s is enough */ - if( i_update_counter % 5 ) return; +/* Update an item in the tree */ +void Playlist::UpdateTreeItem( playlist_t *p_playlist, wxTreeItemId item ) +{ + playlist_item_t *p_item = + ((PlaylistItem *)treectrl->GetItemData( item ))->p_item; - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + if( !p_item ) { return; } - /* Update the colour of items */ + wxString msg; + char *psz_author = playlist_ItemGetInfo( p_item, _("Meta-information"), + _("Artist")); + char psz_duration[MSTRTIME_MAX_SIZE]; + mtime_t dur = p_item->input.i_duration; - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_intf->p_sys->i_playing != p_playlist->i_index ) + if( dur != -1 ) + secstotimestr( psz_duration, dur/1000000 ); + else + memcpy( psz_duration, "-:--:--", sizeof("-:--:--") ); + + if( !strcmp( psz_author, "" ) || p_item->input.b_fixed_name == VLC_TRUE ) + { + msg.Printf( wxString( wxU( p_item->input.psz_name ) ) + wxU( " ( ") + + wxString(wxU(psz_duration ) ) + wxU( ")") ); + } + else { - wxListItem listitem; - listitem.m_itemId = p_playlist->i_index; - listitem.SetTextColour( *wxRED ); - listview->SetItem( listitem ); + msg.Printf( wxString(wxU( psz_author )) + wxT(" - ") + + wxString(wxU(p_item->input.psz_name)) + wxU( " ( ") + + wxString(wxU(psz_duration ) ) + wxU( ")") ); + } + treectrl->SetItemText( item , msg ); + treectrl->SetItemImage( item, p_item->input.i_type ); - if( p_intf->p_sys->i_playing != -1 ) - { - listitem.m_itemId = p_intf->p_sys->i_playing; - listitem.SetTextColour( *wxBLACK ); - listview->SetItem( listitem ); - } - p_intf->p_sys->i_playing = p_playlist->i_index; + if( p_playlist->status.p_item == p_item ) + { + SetCurrentItem( item ); + } + else + { + treectrl->SetItemBold( item, false ); } - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); } -/***************************************************************************** - * Private methods. - *****************************************************************************/ -void Playlist::DeleteItem( int item ) +/* Process a AppendItem request */ +void Playlist::AppendItem( wxCommandEvent& event ) { + playlist_add_t *p_add = (playlist_add_t *)event.GetClientData(); + playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + wxTreeItemId item,node; if( p_playlist == NULL ) { + event.Skip(); return; } - playlist_Delete( p_playlist, item ); - listview->DeleteItem( item ); + if( p_add->i_view != i_current_view ) + { + goto update; + } - vlc_object_release( p_playlist ); -} + node = FindItem( treectrl->GetRootItem(), p_add->p_node ); + if( !node.IsOk() ) + { + goto update; + } -void Playlist::OnClose( wxCommandEvent& WXUNUSED(event) ) -{ - Hide(); -} + item = treectrl->AppendItem( node, + wxL2U( p_add->p_item->input.psz_name ), -1,-1, + new PlaylistItem( p_add->p_item ) ); + treectrl->SetItemImage( item, p_add->p_item->input.i_type ); -void Playlist::OnSave( wxCommandEvent& WXUNUSED(event) ) -{ - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + if( item.IsOk() && p_add->p_item->i_children == -1 ) { - return; + UpdateTreeItem( p_playlist, item ); } - wxFileDialog dialog( this, wxU(_("Save playlist")), - wxT(""), wxT(""), wxT("*"), wxSAVE ); - - if( dialog.ShowModal() == wxID_OK ) +update: + int i_count = CountItems( treectrl->GetRootItem()); + if( i_count != p_playlist->i_size ) + { + statusbar->SetStatusText( wxString::Format( wxU(_( + "%i items in playlist (%i not shown)")), + p_playlist->i_size, + p_playlist->i_size - i_count ) ); + if( !b_changed_view ) + { + i_current_view = VIEW_CATEGORY; + b_changed_view = VLC_TRUE; + b_need_update = VLC_TRUE; + } + } + else { - playlist_SaveFile( p_playlist, dialog.GetPath().mb_str() ); + statusbar->SetStatusText( wxString::Format( wxU(_( + "%i items in playlist")), + p_playlist->i_size ), 0 ); } vlc_object_release( p_playlist ); + return; } -void Playlist::OnOpen( wxCommandEvent& WXUNUSED(event) ) +/* Process a updateitem request */ +void Playlist::UpdateItem( int i ) { + if( i < 0 ) return; /* Sanity check */ + playlist_item_t *p_item; + playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( p_playlist == NULL ) { return; } - wxFileDialog dialog( this, wxU(_("Open playlist")), - wxT(""), wxT(""), wxT("*"), wxOPEN ); + p_item = playlist_LockItemGetById( p_playlist, i ); - if( dialog.ShowModal() == wxID_OK ) + wxTreeItemId item = FindItem( treectrl->GetRootItem(), p_item); + + if( item.IsOk() ) { - playlist_LoadFile( p_playlist, dialog.GetPath().mb_str() ); + UpdateTreeItem( p_playlist, item ); } - vlc_object_release( p_playlist ); + vlc_object_release(p_playlist); } -void Playlist::OnAddFile( wxCommandEvent& WXUNUSED(event) ) +void Playlist::RemoveItem( int i ) { - p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_FILE_SIMPLE, 0, 0 ); + if( i <= 0 ) return; /* Sanity check */ -#if 0 - Rebuild(); -#endif + wxTreeItemId item = FindItem( treectrl->GetRootItem(), i ); + + if( item.IsOk() ) + { + treectrl->Delete( item ); + } } -void Playlist::OnAddMRL( wxCommandEvent& WXUNUSED(event) ) -{ - p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_FILE, 0, 0 ); -#if 0 - Rebuild(); -#endif -} +/********************************************************************** + * Search functions (internal + **********************************************************************/ -/******************************************************************** - * Move functions - ********************************************************************/ -void Playlist::OnUp( wxCommandEvent& event) +/* Find a wxItem from a playlist_item */ +wxTreeItemId Playlist::FindItem( wxTreeItemId root, playlist_item_t *p_item ) { - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + long cookie; + PlaylistItem *p_wxcurrent; + wxTreeItemId search; + wxTreeItemId item = treectrl->GetFirstChild( root, cookie ); + wxTreeItemId child; + + p_wxcurrent = (PlaylistItem *)treectrl->GetItemData( root ); + + if( !p_item ) { - return; + wxTreeItemId dummy; + return dummy; } - /* We use the first selected item, so find it */ - long i_item = -1; - i_item = listview->GetNextItem(i_item, - wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); - if( i_item > 0 && i_item < p_playlist->i_size ) + if( p_wxcurrent->p_item == p_item ) { - playlist_Move( p_playlist , i_item, i_item - 1); - if( i_item > 1 ) + return root; + } + + while( item.IsOk() ) + { + p_wxcurrent = (PlaylistItem *)treectrl->GetItemData( item ); + if( p_wxcurrent->p_item == p_item ) { - listview->Focus( i_item - 1 ); + return item; } - else + if( treectrl->ItemHasChildren( item ) ) { - listview->Focus(0); + wxTreeItemId search = FindItem( item, p_item ); + if( search.IsOk() ) + { + return search; + } } + item = treectrl->GetNextChild( root, cookie ); } - vlc_object_release( p_playlist ); - return; + /* Not found */ + wxTreeItemId dummy; + return dummy; } - -void Playlist::OnDown( wxCommandEvent& event) +/* Find a wxItem from a playlist id */ +wxTreeItemId Playlist::FindItem( wxTreeItemId root, int i_id ) { - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + long cookie; + PlaylistItem *p_wxcurrent; + wxTreeItemId search; + wxTreeItemId item = treectrl->GetFirstChild( root, cookie ); + wxTreeItemId child; + + p_wxcurrent = (PlaylistItem *)treectrl->GetItemData( root ); + + if( i_id < 0 ) { - return; + wxTreeItemId dummy; + return dummy; } - /* We use the first selected item, so find it */ - long i_item = -1; - i_item = listview->GetNextItem(i_item, - wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); - if( i_item >= 0 && i_item < p_playlist->i_size - 1 ) + if( !p_wxcurrent ) { - playlist_Move( p_playlist , i_item, i_item + 2 ); - listview->Focus( i_item + 1 ); - } - vlc_object_release( p_playlist ); - return; -} + wxTreeItemId dummy; + return dummy; + } -/******************************************************************** - * Sorting functions - ********************************************************************/ -void Playlist::OnSort( wxCommandEvent& event ) -{ - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + if( p_wxcurrent->i_id == i_id ) { - return; + return root; } - switch( event.GetId() ) + + while( item.IsOk() ) { - case SortTitle_Event: - playlist_SortTitle( p_playlist , 0 ); - break; - case RSortTitle_Event: - playlist_SortTitle( p_playlist , 1 ); - break; - case SortAuthor_Event: - playlist_SortAuthor(p_playlist , 0 ); - break; - case RSortAuthor_Event: - playlist_SortAuthor( p_playlist , 1 ); - break; - case SortGroup_Event: - playlist_SortGroup( p_playlist , 0 ); - break; - case RSortGroup_Event: - playlist_SortGroup( p_playlist , 1 ); - break; + p_wxcurrent = (PlaylistItem *)treectrl->GetItemData( item ); + if( p_wxcurrent->i_id == i_id ) + { + return item; + } + if( treectrl->ItemHasChildren( item ) ) + { + wxTreeItemId search = FindItem( item, i_id ); + if( search.IsOk() ) + { + return search; + } + } + item = treectrl->GetNextChild( root, cookie ); } - vlc_object_release( p_playlist ); - - Rebuild(); - - return; + /* Not found */ + wxTreeItemId dummy; + return dummy; } -void Playlist::OnColSelect( wxListEvent& event ) +int Playlist::CountItems( wxTreeItemId root ) { - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + long cookie; + int count = 0; + wxTreeItemId item = treectrl->GetFirstChild( root, cookie ); + + while( item.IsOk() ) { - return; + if( treectrl->ItemHasChildren( item ) ) + { + count += CountItems( item ); + } + else if( ( (PlaylistItem *)treectrl->GetItemData( item ) )-> + p_item->i_children == -1 ) + count++; + item = treectrl->GetNextChild( root, cookie ); } - switch( event.GetColumn() ) + return count; +} + +/* Find a wxItem from a name (from current) */ +wxTreeItemId Playlist::FindItemByName( wxTreeItemId root, wxString search_string, wxTreeItemId current, vlc_bool_t *pb_current_found ) +{ + long cookie; + wxTreeItemId search; + wxTreeItemId item = treectrl->GetFirstChild( root, cookie ); + wxTreeItemId child; + + while( item.IsOk() ) { - case 0: - if( i_title_sorted != 1 ) - { - playlist_SortTitle( p_playlist, 0 ); - i_title_sorted = 1; - } - else - { - playlist_SortTitle( p_playlist, 1 ); - i_title_sorted = -1; - } - break; - case 1: - if( i_author_sorted != 1 ) - { - playlist_SortAuthor( p_playlist, 0 ); - i_author_sorted = 1; - } - else + if( treectrl->GetItemText( item).Lower().Contains( + search_string.Lower() ) ) + { + if( !current.IsOk() || *pb_current_found == VLC_TRUE ) { - playlist_SortAuthor( p_playlist, 1 ); - i_author_sorted = -1; + return item; } - break; - case 2: - if( i_group_sorted != 1 ) + else if( current.IsOk() && item == current ) { - playlist_SortGroup( p_playlist, 0 ); - i_group_sorted = 1; + *pb_current_found = VLC_TRUE; } - else + } + if( treectrl->ItemHasChildren( item ) ) + { + wxTreeItemId search = FindItemByName( item, search_string, current, + pb_current_found ); + if( search.IsOk() ) { - playlist_SortGroup( p_playlist, 1 ); - i_group_sorted = -1; + return search; } - break; - default: - break; + } + item = treectrl->GetNextChild( root, cookie); } - vlc_object_release( p_playlist ); - - Rebuild(); - - return; + /* Not found */ + wxTreeItemId dummy; + return dummy; } /********************************************************************** - * Search functions + * Rebuild the playlist **********************************************************************/ -void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) ) +void Playlist::Rebuild() { - search_button->SetDefault(); + playlist_view_t *p_view; + playlist_t *p_playlist = + (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) + { + return; + } + /* ...and rebuild it */ + vlc_mutex_lock( &p_playlist->object_lock ); + + p_view = playlist_ViewFind( p_playlist, i_current_view ); /* FIXME */ + + /* HACK we should really get new*/ + msg_Dbg( p_intf, "rebuilding tree for view %i", i_current_view ); + treectrl->DeleteAllItems(); + treectrl->AddRoot( wxU(_("root" )), -1, -1, + new PlaylistItem( p_view->p_root) ); + + wxTreeItemId root = treectrl->GetRootItem(); + UpdateNode( p_playlist, p_view->p_root, root ); + + wxTreeItemId item; + if( p_playlist->status.p_item != NULL ) + { + item = FindItem( root, p_playlist->status.p_item ); + } + else if( p_playlist->status.p_node != NULL ) + { + item = FindItem( root, p_playlist->status.p_node ); + } + else + { + item = root; + } + + if( p_playlist->i_size ) + { + SetCurrentItem( item ); + } + + int i_count = CountItems( treectrl->GetRootItem() ); + + if( i_count < p_playlist->i_size && !b_changed_view ) + { + i_current_view = VIEW_CATEGORY; + b_changed_view = VLC_TRUE; + vlc_mutex_unlock( &p_playlist->object_lock ); + Rebuild(); + vlc_mutex_lock( &p_playlist->object_lock ); + } + else if( i_count != p_playlist->i_size ) + { + statusbar->SetStatusText( wxString::Format( wxU(_( + "%i items in playlist (%i not shown)")), + p_playlist->i_size, + p_playlist->i_size - i_count ) ); + } + else + { + statusbar->SetStatusText( wxString::Format( wxU(_( + "%i items in playlist")), + p_playlist->i_size ), 0 ); + } + + vlc_mutex_unlock( &p_playlist->object_lock ); + + vlc_object_release( p_playlist ); } -void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) ) + + +void Playlist::ShowPlaylist( bool show ) { - wxString search_string= search_text->GetValue(); + if( show ) Rebuild(); + Show( show ); +} - int i_current; - int i_first = 0 ; - int i_item = -1; +/* This function is called on a regular basis */ +void Playlist::UpdatePlaylist() +{ + i_update_counter++; - for( i_current = 0 ; i_current <= listview->GetItemCount() ; i_current++ ) + /* If the playlist isn't show there's no need to update it */ + if( !IsShown() ) return; + + if( this->b_need_update ) { - if( listview->GetItemState( i_current, wxLIST_STATE_SELECTED) - == wxLIST_STATE_SELECTED ) - { - i_first = i_current; - break; - } + this->b_need_update = VLC_FALSE; + Rebuild(); } - for ( i_current = i_first + 1; i_current <= listview->GetItemCount() ; - i_current++ ) + /* Updating the playing status every 0.5s is enough */ + if( i_update_counter % 5 ) return; + + playlist_t *p_playlist = + (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) { - wxListItem listitem; - listitem.SetId( i_current ); - listview->GetItem( listitem ); - if( listitem.m_text.Lower().Contains( search_string.Lower() ) ) - { - i_item = i_current; - break; - } + return; } - for( long item = 0; item < listview->GetItemCount(); item++ ) + + vlc_object_release( p_playlist ); +} + +/***************************************************************************** + * Private methods. + *****************************************************************************/ +void Playlist::DeleteItem( int item_id ) +{ + playlist_t *p_playlist = + (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) { - listview->Select( item, FALSE ); + return; } - wxListItem listitem; - listitem.SetId(i_item); - listitem.m_state = wxLIST_STATE_SELECTED; - listview->Select( i_item, TRUE ); - listview->Focus( i_item ); + playlist_LockDelete( p_playlist, item_id ); + vlc_object_release( p_playlist ); } -/********************************************************************** - * Selection functions - **********************************************************************/ -void Playlist::OnInvertSelection( wxCommandEvent& WXUNUSED(event) ) +void Playlist::DeleteNode( playlist_item_t *p_item ) { - for( long item = 0; item < listview->GetItemCount(); item++ ) + playlist_t *p_playlist = + (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) { - listview->Select( item, ! listview->IsSelected( item ) ); + return; } + + playlist_NodeDelete( p_playlist, p_item, VLC_TRUE ); + + vlc_object_release( p_playlist ); } -void Playlist::OnDeleteSelection( wxCommandEvent& WXUNUSED(event) ) + +void Playlist::OnClose( wxCommandEvent& WXUNUSED(event) ) { - /* Delete from the end to the beginning, to avoid a shift of indices */ - for( long item = listview->GetItemCount() - 1; item >= 0; item-- ) + Hide(); +} + +void Playlist::OnSave( wxCommandEvent& WXUNUSED(event) ) +{ + struct { + char *psz_desc; + char *psz_filter; + char *psz_module; + } formats[] = {{ _("M3U file"), "*.m3u", "export-m3u" }, + { _("PLS file"), "*.pls", "export-pls" }}; + + wxString filter = wxT(""); + + playlist_t * p_playlist = + (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + + if( ! p_playlist ) + { + return; + } + if( p_playlist->i_size == 0 ) + { + wxMessageBox( wxU(_("Playlist is empty") ), wxU(_("Can't save")), + wxICON_WARNING | wxOK, this ); + vlc_object_release( p_playlist ); + return; + } + + for( unsigned int i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) + { + filter.Append( wxU(formats[i].psz_desc) ); + filter.Append( wxT("|") ); + filter.Append( wxU(formats[i].psz_filter) ); + filter.Append( wxT("|") ); + } + wxFileDialog dialog( this, wxU(_("Save playlist")), + wxT(""), wxT(""), filter, wxSAVE ); + + if( dialog.ShowModal() == wxID_OK ) { - if( listview->IsSelected( item ) ) + if( dialog.GetPath().mb_str() ) { - DeleteItem( item ); + playlist_Export( p_playlist, dialog.GetPath().mb_str(), + formats[dialog.GetFilterIndex()].psz_module ); } } - Rebuild(); + vlc_object_release( p_playlist ); + } -void Playlist::OnEnableSelection( wxCommandEvent& WXUNUSED(event) ) +void Playlist::OnOpen( wxCommandEvent& WXUNUSED(event) ) { playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, @@ -812,44 +1016,118 @@ void Playlist::OnEnableSelection( wxCommandEvent& WXUNUSED(event) ) return; } - for( long item = listview->GetItemCount() - 1; item >= 0; item-- ) + wxFileDialog dialog( this, wxU(_("Open playlist")), wxT(""), wxT(""), + wxT("All playlists|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"), wxOPEN ); + + if( dialog.ShowModal() == wxID_OK ) { - if( listview->IsSelected( item ) ) - { - playlist_Enable( p_playlist, item ); - } + playlist_Import( p_playlist, dialog.GetPath().mb_str() ); } - vlc_object_release( p_playlist); - Rebuild(); + + vlc_object_release( p_playlist ); } -void Playlist::OnDisableSelection( wxCommandEvent& WXUNUSED(event) ) +void Playlist::OnAddFile( wxCommandEvent& WXUNUSED(event) ) +{ + p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_FILE_SIMPLE, 0, 0 ); + +} + +void Playlist::OnAddDir( wxCommandEvent& WXUNUSED(event) ) +{ + p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_DIRECTORY, 0, 0 ); + +} + +void Playlist::OnAddMRL( wxCommandEvent& WXUNUSED(event) ) +{ + p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_FILE, 0, 0 ); + +} + +/******************************************************************** + * Sorting functions + ********************************************************************/ +void Playlist::OnSort( wxCommandEvent& event ) { playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + PlaylistItem *p_wxitem; + p_wxitem = (PlaylistItem *)treectrl->GetItemData( treectrl->GetRootItem() ); + if( p_playlist == NULL ) { return; } + vlc_mutex_lock( &p_playlist->object_lock ); + switch( event.GetId() ) + { + case SortTitle_Event: + playlist_RecursiveNodeSort( p_playlist, p_wxitem->p_item, + SORT_TITLE_NODES_FIRST, ORDER_NORMAL ); + break; + case RSortTitle_Event: + playlist_RecursiveNodeSort( p_playlist, p_wxitem->p_item, + SORT_TITLE_NODES_FIRST, ORDER_REVERSE ); + } + vlc_mutex_unlock( &p_playlist->object_lock ); + + vlc_object_release( p_playlist ); + Rebuild(); +} + +/********************************************************************** + * Search functions (user) + **********************************************************************/ +void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) ) +{ + search_button->SetDefault(); +} - for( long item = listview->GetItemCount() - 1; item >= 0; item-- ) +void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) ) +{ + wxString search_string = search_text->GetValue(); + + vlc_bool_t pb_found = VLC_FALSE; + + wxTreeItemId found = + FindItemByName( treectrl->GetRootItem(), search_string, + search_current, &pb_found ); + + if( found.IsOk() ) + { + search_current = found; + treectrl->SelectItem( found, true ); + } + else { - if( listview->IsSelected( item ) ) + wxTreeItemId dummy; + search_current = dummy; + found = FindItemByName( treectrl->GetRootItem(), search_string, + search_current, &pb_found ); + if( found.IsOk() ) { - playlist_Disable( p_playlist, item ); + search_current = found; + treectrl->SelectItem( found, true ); } } - vlc_object_release( p_playlist); +} + +/********************************************************************** + * Selection functions + **********************************************************************/ +void Playlist::OnInvertSelection( wxCommandEvent& WXUNUSED(event) ) +{ +} + +void Playlist::OnDeleteSelection( wxCommandEvent& WXUNUSED(event) ) +{ Rebuild(); } void Playlist::OnSelectAll( wxCommandEvent& WXUNUSED(event) ) { - for( long item = 0; item < listview->GetItemCount(); item++ ) - { - listview->Select( item, TRUE ); - } } /********************************************************************** @@ -866,10 +1144,11 @@ void Playlist::OnRandom( wxCommandEvent& event ) { return; } - var_Set( p_playlist , "random", val); + var_Set( p_playlist, "random", val); vlc_object_release( p_playlist ); } -void Playlist::OnLoop ( wxCommandEvent& event ) + +void Playlist::OnLoop( wxCommandEvent& event ) { vlc_value_t val; val.b_bool = event.IsChecked(); @@ -880,11 +1159,11 @@ void Playlist::OnLoop ( wxCommandEvent& event ) { return; } - var_Set( p_playlist , "loop", val); + var_Set( p_playlist, "loop", val); vlc_object_release( p_playlist ); } -void Playlist::OnRepeat ( wxCommandEvent& event ) +void Playlist::OnRepeat( wxCommandEvent& event ) { vlc_value_t val; val.b_bool = event.IsChecked(); @@ -895,26 +1174,56 @@ void Playlist::OnRepeat ( wxCommandEvent& event ) { return; } - var_Set( p_playlist , "repeat", val); + var_Set( p_playlist, "repeat", val); vlc_object_release( p_playlist ); } +/******************************************************************** + * Event + ********************************************************************/ +void Playlist::OnActivateItem( wxTreeEvent& event ) +{ + playlist_item_t *p_item,*p_node; + playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, + VLC_OBJECT_PLAYLIST,FIND_ANYWHERE ); + PlaylistItem *p_wxitem = (PlaylistItem *)treectrl->GetItemData( + event.GetItem() ); + wxTreeItemId parent = treectrl->GetItemParent( event.GetItem() ); + + PlaylistItem *p_wxparent = (PlaylistItem *)treectrl->GetItemData( parent ); -void Playlist::OnActivateItem( wxListEvent& event ) -{ - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); if( p_playlist == NULL ) { return; } - playlist_Goto( p_playlist, event.GetIndex() ); + + if( p_wxitem->p_item->i_children == -1 ) + { + p_node = p_wxparent->p_item; + p_item = p_wxitem->p_item; + } + else + { + p_node = p_wxitem->p_item; + if( p_wxitem->p_item->i_children > 0 && + p_wxitem->p_item->pp_children[0]->i_children == -1) + { + p_item = p_wxitem->p_item->pp_children[0]; + } + else + { + p_item = NULL; + } + } + + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, i_current_view, + p_node, p_item ); vlc_object_release( p_playlist ); } -void Playlist::OnKeyDown( wxListEvent& event ) + +void Playlist::OnKeyDown( wxTreeEvent& event ) { long keycode = event.GetKeyCode(); /* Delete selected items */ @@ -925,7 +1234,7 @@ void Playlist::OnKeyDown( wxListEvent& event ) } } -void Playlist::OnInfos( wxCommandEvent& WXUNUSED(event) ) +void Playlist::OnEnDis( wxCommandEvent& event ) { playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, @@ -934,150 +1243,416 @@ void Playlist::OnInfos( wxCommandEvent& WXUNUSED(event) ) { return; } + msg_Warn( p_intf, "not implemented" ); + vlc_object_release( p_playlist ); +} + +/********************************************************************** + * Menu + **********************************************************************/ + +void Playlist::OnMenuOpen( wxMenuEvent& event) +{ +#if defined( __WXMSW__ ) +# define GetEventObject GetMenu +#endif - if( iteminfo_dialog == NULL ) + if( event.GetEventObject() == p_view_menu ) { - /* We use the first selected item, so find it */ - long i_item = -1; - i_item = listview->GetNextItem(i_item, - wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); - if( i_item >= 0 && i_item < p_playlist->i_size ) + p_view_menu = ViewMenu(); + } +#if defined( __WXMSW__ ) +# undef GetEventObject +#endif +} + +void Playlist::OnMenuEvent( wxCommandEvent& event ) +{ + playlist_t *p_playlist = + (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) + { + return; + } + + if( event.GetId() < FirstView_Event ) + { + event.Skip(); + vlc_object_release( p_playlist ); + return; + } + else if( event.GetId() < LastView_Event ) + { + + int i_new_view = event.GetId() - FirstView_Event; + + playlist_view_t *p_view = playlist_ViewFind( p_playlist, i_new_view ); + + if( p_view != NULL ) + { + b_changed_view = VLC_TRUE; + i_current_view = i_new_view; + playlist_ViewUpdate( p_playlist, i_new_view ); + Rebuild(); + vlc_object_release( p_playlist ); + return; + } + else if( i_new_view >= VIEW_FIRST_SORTED && + i_new_view <= VIEW_LAST_SORTED ) + { + b_changed_view = VLC_TRUE; + playlist_ViewInsert( p_playlist, i_new_view, "View" ); + playlist_ViewUpdate( p_playlist, i_new_view ); + + i_current_view = i_new_view; + + Rebuild(); + } + } + else if( event.GetId() >= FirstSD_Event && event.GetId() < LastSD_Event ) + { + if( !playlist_IsServicesDiscoveryLoaded( p_playlist, + pp_sds[event.GetId() - FirstSD_Event] ) ) + { + playlist_ServicesDiscoveryAdd( p_playlist, + pp_sds[event.GetId() - FirstSD_Event] ); + } + else { - iteminfo_dialog = new ItemInfoDialog( - p_intf, p_playlist->pp_items[i_item], this ); - if( iteminfo_dialog->ShowModal() == wxID_OK ) - Rebuild(); - delete iteminfo_dialog; - iteminfo_dialog = NULL; + playlist_ServicesDiscoveryRemove( p_playlist, + pp_sds[event.GetId() - FirstSD_Event] ); } } vlc_object_release( p_playlist ); } -void Playlist::OnEnDis( wxCommandEvent& event ) +wxMenu * Playlist::ViewMenu() { playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); if( p_playlist == NULL ) { - return; + return NULL; } - long i_item = -1; - i_item = listview->GetNextItem(i_item, - wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); + if( !p_view_menu ) + { + p_view_menu = new wxMenu; + } + else + { + wxMenuItemList::Node *node = p_view_menu->GetMenuItems().GetFirst(); + for( ; node; ) + { + wxMenuItem *item = node->GetData(); + node = node->GetNext(); + p_view_menu->Delete( item ); + } + } + + /* FIXME : have a list of "should have" views */ + p_view_menu->Append( FirstView_Event + VIEW_CATEGORY, + wxU(_("By category") ) ); + p_view_menu->Append( FirstView_Event + VIEW_SIMPLE, + wxU(_("Manually added") ) ); + p_view_menu->Append( FirstView_Event + VIEW_ALL, + wxU(_("All items, unsorted") ) ); + p_view_menu->Append( FirstView_Event + VIEW_S_AUTHOR, + wxU(_("Sorted by author") ) ); + + vlc_object_release( p_playlist); + + return p_view_menu; +} + +wxMenu *Playlist::SDMenu() +{ - if( i_item >= 0 && i_item < p_playlist->i_size ) + playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, + VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( !p_playlist ) { - switch( event.GetId() ) - { - case EnableGroup_Event: - playlist_EnableGroup( p_playlist , - p_playlist->pp_items[i_item]->i_group ); - break; - case DisableGroup_Event: - playlist_DisableGroup( p_playlist , - p_playlist->pp_items[i_item]->i_group ); - break; - } - Rebuild(); + return NULL; } + p_sd_menu = new wxMenu; + + vlc_list_t *p_list = vlc_list_find( p_playlist, VLC_OBJECT_MODULE, + FIND_ANYWHERE ); + int i_number = 0; + for( int i_index = 0; i_index < p_list->i_count; i_index++ ) + { + module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ; + + if( !strcmp( p_parser->psz_capability, "services_discovery" ) ) + { + p_sd_menu->AppendCheckItem( FirstSD_Event + i_number , + wxU( p_parser->psz_longname ? p_parser->psz_longname : + ( p_parser->psz_shortname ? + p_parser->psz_shortname :p_parser->psz_object_name)) ); + + if( playlist_IsServicesDiscoveryLoaded( p_playlist, + p_parser->psz_object_name ) ) + { + p_sd_menu->Check( FirstSD_Event + i_number, TRUE ); + } + + INSERT_ELEM( (void**)pp_sds, i_number, i_number, + (void*)p_parser->psz_object_name ); + } + } + vlc_list_release( p_list ); vlc_object_release( p_playlist ); + return p_sd_menu; } + /***************************************************************************** - * PlaylistChanged: callback triggered by the intf-change playlist variable - * We don't rebuild the playlist directly here because we don't want the - * caller to block for a too long time. + * Popup management functions *****************************************************************************/ -int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, - vlc_value_t old_val, vlc_value_t new_val, void *param ) +void Playlist::OnPopup( wxContextMenuEvent& event ) { - Playlist *p_playlist_dialog = (Playlist *)param; - vlc_mutex_lock( &p_playlist_dialog->lock ); - p_playlist_dialog->b_need_update = VLC_TRUE; - vlc_mutex_unlock( &p_playlist_dialog->lock ); - return VLC_SUCCESS; + wxPoint pt = event.GetPosition(); + + i_popup_item = treectrl->HitTest( ScreenToClient( pt ) ); + if( i_popup_item.IsOk() ) + { + PlaylistItem *p_wxitem = (PlaylistItem *)treectrl->GetItemData( + i_popup_item ); + PlaylistItem *p_wxparent= (PlaylistItem *) treectrl->GetItemData( + treectrl->GetItemParent( i_popup_item ) ); + p_popup_item = p_wxitem->p_item; + p_popup_parent = p_wxparent->p_item; + treectrl->SelectItem( i_popup_item ); + if( p_popup_item->i_children == -1 ) + Playlist::PopupMenu( item_popup, + ScreenToClient( wxGetMousePosition() ) ); + else + Playlist::PopupMenu( node_popup, + 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( p_popup_item != NULL ) + { + if( p_popup_item->i_children > -1 ) + { + if( event.GetId() == PopupPlay_Event && + p_popup_item->i_children > 0 ) + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + i_current_view, p_popup_item, + p_popup_item->pp_children[0] ); + } + else + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + i_current_view, p_popup_item, NULL ); + } + } + else + { + if( event.GetId() == PopupPlay_Event ) + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + i_current_view, p_popup_parent, + p_popup_item ); + } + } + } + vlc_object_release( p_playlist ); } +void Playlist::OnPopupPreparse( wxMenuEvent& event ) +{ + playlist_t *p_playlist = + (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) + { + return; + } + Preparse( p_playlist ); + vlc_object_release( p_playlist ); +} -/*************************************************************************** - * NewGroup - ***************************************************************************/ -NewGroup::NewGroup( intf_thread_t *_p_intf, wxWindow *_p_parent ): - wxDialog( _p_parent, -1, wxU(_("New Group")), wxDefaultPosition, - wxDefaultSize, wxDEFAULT_FRAME_STYLE ) +void Playlist::Preparse( playlist_t *p_playlist ) { - /* Initializations */ - p_intf = _p_intf; - psz_name = NULL; - SetIcon( *p_intf->p_sys->p_icon ); + if( p_popup_item != NULL ) + { + if( p_popup_item->i_children == -1 ) + { + playlist_PreparseEnqueue( p_playlist, &p_popup_item->input ); + } + else + { + int i = 0; + playlist_item_t *p_parent = p_popup_item; + for( i = 0; i< p_parent->i_children ; i++ ) + { + wxMenuEvent dummy; + i_popup_item = FindItem( treectrl->GetRootItem(), + p_parent->pp_children[i] ); + p_popup_item = p_parent->pp_children[i]; + Preparse( p_playlist ); + } + } + } +} - /* Create a panel to put everything in*/ - wxPanel *panel = new wxPanel( this, -1 ); - panel->SetAutoLayout( TRUE ); +void Playlist::OnPopupDel( wxMenuEvent& event ) +{ + PlaylistItem *p_wxitem; - wxStaticText *group_label = - new wxStaticText( panel , -1, - wxU(_("Enter the name for the new group"))); + p_wxitem = (PlaylistItem *)treectrl->GetItemData( i_popup_item ); - groupname = new wxTextCtrl(panel, -1, wxU(""),wxDefaultPosition, - wxSize(80,27),wxTE_PROCESS_ENTER); + if( p_wxitem->p_item->i_children == -1 ) + { + DeleteItem( p_wxitem->p_item->input.i_id ); + } + else + { + DeleteNode( p_wxitem->p_item ); + } +} - wxButton *ok_button = new wxButton(panel, wxID_OK, wxU(_("OK")) ); - ok_button->SetDefault(); - wxButton *cancel_button = new wxButton( panel, wxID_CANCEL, - wxU(_("Cancel")) ); +void Playlist::OnPopupSort( wxMenuEvent& event ) +{ + PlaylistItem *p_wxitem; - wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); + p_wxitem = (PlaylistItem *)treectrl->GetItemData( i_popup_item ); - button_sizer->Add( ok_button, 0, wxALL, 5 ); - button_sizer->Add( cancel_button, 0, wxALL, 5 ); - button_sizer->Layout(); + if( p_wxitem->p_item->i_children >= 0 ) + { + playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, + VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL ); - panel_sizer->Add( group_label, 0, wxEXPAND | wxALL, 5 ); - panel_sizer->Add( groupname, 0, wxEXPAND | wxALL, 5 ); - panel_sizer->Add( button_sizer, 0, wxEXPAND | wxALL, 5 ); - panel_sizer->Layout(); + if( p_playlist ) + { + vlc_mutex_lock( &p_playlist->object_lock ); + playlist_RecursiveNodeSort( p_playlist, p_wxitem->p_item, + SORT_TITLE_NODES_FIRST, ORDER_NORMAL ); + vlc_mutex_unlock( &p_playlist->object_lock ); + + treectrl->DeleteChildren( i_popup_item ); + UpdateNodeChildren( p_playlist, p_wxitem->p_item, i_popup_item ); + + vlc_object_release( p_playlist ); + } + } +} + +void Playlist::OnPopupInfo( wxMenuEvent& event ) +{ + if( p_popup_item ) + { + iteminfo_dialog = new ItemInfoDialog( p_intf, p_popup_item, this ); + if( iteminfo_dialog->ShowModal() == wxID_OK ) + { + UpdateItem( i_popup_item ); + } + delete iteminfo_dialog; + } +} - panel->SetSizerAndFit( panel_sizer ); - wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); - main_sizer->Add( panel, 1, wxEXPAND, 0 ); - main_sizer->Layout(); - SetSizerAndFit( main_sizer ); +/***************************************************************************** + * Custom events management + *****************************************************************************/ +void Playlist::OnPlaylistEvent( wxCommandEvent& event ) +{ + switch( event.GetId() ) + { + case UpdateItem_Event: + UpdateItem( event.GetInt() ); + break; + case AppendItem_Event: + AppendItem( event ); + break; + case RemoveItem_Event: + RemoveItem( event.GetInt() ); + break; + } } -NewGroup::~NewGroup() +/***************************************************************************** + * PlaylistChanged: callback triggered by the intf-change playlist variable + * We don't rebuild the playlist directly here because we don't want the + * caller to block for a too long time. + *****************************************************************************/ +static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t oval, vlc_value_t nval, void *param ) { + Playlist *p_playlist_dialog = (Playlist *)param; + p_playlist_dialog->b_need_update = VLC_TRUE; + return VLC_SUCCESS; } -void NewGroup::OnOk( wxCommandEvent& event ) +/***************************************************************************** + * Next: callback triggered by the playlist-current playlist variable + *****************************************************************************/ +static int PlaylistNext( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t oval, vlc_value_t nval, void *param ) { - psz_name = strdup( groupname->GetLineText(0).mb_str() ); + Playlist *p_playlist_dialog = (Playlist *)param; - playlist_t * p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + wxCommandEvent event( wxEVT_PLAYLIST, UpdateItem_Event ); + event.SetInt( oval.i_int ); + p_playlist_dialog->AddPendingEvent( event ); + event.SetInt( nval.i_int ); + p_playlist_dialog->AddPendingEvent( event ); - if( p_playlist ) - { - if( !playlist_CreateGroup( p_playlist, psz_name ) ) - { - psz_name = NULL; - } - } + return 0; +} - vlc_object_release( p_playlist ); - EndModal( wxID_OK ); +/***************************************************************************** + * ItemChanged: callback triggered by the item-change playlist variable + *****************************************************************************/ +static 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; + + wxCommandEvent event( wxEVT_PLAYLIST, UpdateItem_Event ); + event.SetInt( new_val.i_int ); + p_playlist_dialog->AddPendingEvent( event ); + + return 0; +} +static int ItemDeleted( 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; + + wxCommandEvent event( wxEVT_PLAYLIST, RemoveItem_Event ); + event.SetInt( new_val.i_int ); + p_playlist_dialog->AddPendingEvent( event ); + + return 0; } -void NewGroup::OnCancel( wxCommandEvent& WXUNUSED(event) ) +static int ItemAppended( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t oval, vlc_value_t nval, void *param ) { - EndModal( wxID_CANCEL ); + Playlist *p_playlist_dialog = (Playlist *)param; + + playlist_add_t *p_add = (playlist_add_t *)malloc(sizeof( playlist_add_t)); + memcpy( p_add, nval.p_address, sizeof( playlist_add_t ) ); + + wxCommandEvent event( wxEVT_PLAYLIST, AppendItem_Event ); + event.SetClientData( (void *)p_add ); + p_playlist_dialog->AddPendingEvent( event ); + + return VLC_SUCCESS; }