* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: playlist.cpp,v 1.22 2003/10/06 16:23:30 zorglub Exp $
+ * $Id: playlist.cpp,v 1.23 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
*
/* menu items */
AddFile_Event = 1,
AddMRL_Event,
- Sort_Event,
- RSort_Event,
Close_Event,
Open_Event,
Save_Event,
+ SortTitle_Event,
+ RSortTitle_Event,
+ SortAuthor_Event,
+ RSortAuthor_Event,
+ SortGroup_Event,
+ RSortGroup_Event,
+
EnableSelection_Event,
DisableSelection_Event,
Repeat_Event,
SelectAll_Event,
- En_Dis_Event,
+ EnableGroup_Event,
+ DisableGroup_Event,
+ Up_Event,
+ Down_Event,
Infos_Event,
SearchText_Event,
/* Menu events */
EVT_MENU(AddFile_Event, Playlist::OnAddFile)
EVT_MENU(AddMRL_Event, Playlist::OnAddMRL)
- EVT_MENU(Sort_Event, Playlist::OnSort)
- EVT_MENU(RSort_Event, Playlist::OnRSort)
EVT_MENU(Close_Event, Playlist::OnClose)
EVT_MENU(Open_Event, Playlist::OnOpen)
EVT_MENU(Save_Event, Playlist::OnSave)
+
+ 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(InvertSelection_Event, Playlist::OnInvertSelection)
EVT_CHECKBOX(Repeat_Event, Playlist::OnRepeat)
EVT_CHECKBOX(Loop_Event, Playlist::OnLoop)
+ EVT_MENU(EnableGroup_Event, Playlist::OnEnDis)
+ EVT_MENU(DisableGroup_Event, Playlist::OnEnDis)
+
/* Listview events */
EVT_LIST_ITEM_ACTIVATED(ListView_Event, Playlist::OnActivateItem)
EVT_LIST_KEY_DOWN(ListView_Event, Playlist::OnKeyDown)
/* Button events */
EVT_BUTTON( Search_Event, Playlist::OnSearch)
- EVT_BUTTON( En_Dis_Event, Playlist::OnEnDis)
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)
/* Special events : we don't want to destroy the window when the user
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()
+
/*****************************************************************************
* Constructor.
*****************************************************************************/
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 );
wxMenu *manage_menu = new wxMenu;
manage_menu->Append( AddFile_Event, wxU(_("&Simple Add...")) );
manage_menu->Append( AddMRL_Event, wxU(_("&Add MRL...")) );
- manage_menu->Append( Sort_Event, wxU(_("&Sort")) );
- manage_menu->Append( RSort_Event, wxU(_("&Reverse Sort")) );
+ manage_menu->AppendSeparator();
manage_menu->Append( Open_Event, wxU(_("&Open Playlist...")) );
manage_menu->Append( Save_Event, wxU(_("&Save Playlist...")) );
manage_menu->AppendSeparator();
manage_menu->Append( Close_Event, wxU(_("&Close")) );
+ /* Create our "Sort" menu */
+ wxMenu *sort_menu = new wxMenu;
+ 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")) );
+
/* Create our "Selection" menu */
wxMenu *selection_menu = new wxMenu;
selection_menu->Append( EnableSelection_Event, wxU(_("&Enable")) );
selection_menu->Append( DeleteSelection_Event, wxU(_("&Delete")) );
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")) );
+
/* 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")) );
/* Attach the menu bar to the frame */
SetMenuBar( menubar );
+
/* Create a panel to put everything in */
wxPanel *playlist_panel = new wxPanel( this, -1 );
playlist_panel->SetAutoLayout( TRUE );
- /* 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( 305, 300 ),
- wxLC_REPORT | wxSUNKEN_BORDER );
- listview->InsertColumn( 0, wxU(_("Url")) );
- #if 0
- listview->InsertColumn( 1, wxU(_("Duration")) );
- #endif
- listview->SetColumnWidth( 0, 300 );
- #if 0
- listview->SetColumnWidth( 1, 100 );
- #endif
-
/* 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")) );
-
var_Get( p_intf, "loop", &val );
int b_loop = val.b_bool ;
loop_checkbox->SetValue( b_loop );
/* Create the Repeat one checkbox */
wxCheckBox *repeat_checkbox =
new wxCheckBox( playlist_panel, Repeat_Event, wxU(_("Repeat one")) );
-
var_Get( p_intf, "repeat", &val );
int b_repeat = val.b_bool ;
repeat_checkbox->SetValue( b_repeat );
search_button =
new wxButton( playlist_panel, Search_Event, wxU(_("Search")) );
- wxButton *en_dis_button =
- new wxButton( playlist_panel, En_Dis_Event, wxU(_("Enable/Disable Group") ) );
+ /* 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( en_dis_button, 0, wxALIGN_CENTER|wxRIGHT, 5);
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( repeat_checkbox, 0,
wxEXPAND|wxALIGN_RIGHT, 5);
-
checkbox_sizer->Layout();
wxBoxSizer *search_sizer = new wxBoxSizer( wxHORIZONTAL );
- search_sizer->Add( search_text, 0, wxALL|wxALIGN_CENTER, 5);
- search_sizer->Add( search_button, 0, wxALL|wxALIGN_CENTER, 5);
-
+ search_sizer->Add( search_text, 0, wxRIGHT|wxALIGN_CENTER, 3);
+ search_sizer->Add( search_button, 0, wxLEFT|wxALIGN_CENTER, 3);
search_sizer->Layout();
- wxBoxSizer *bottom_sizer = new wxBoxSizer( wxVERTICAL );
- bottom_sizer->Add( checkbox_sizer, 0, wxALL|wxALIGN_CENTER, 5 );
- bottom_sizer->Add( button_sizer , 0, wxALL|wxALIGN_CENTER, 5 );
+ /* 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 );
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( search_sizer, 0, wxALIGN_CENTRE );
- panel_sizer->Add( bottom_sizer, 0 , wxALIGN_CENTRE);
+ panel_sizer->Add( bottom_sizer, 0 , wxEXPAND | wxALL, 5);
panel_sizer->Layout();
playlist_panel->SetSizerAndFit( panel_sizer );
return;
}
- /* We want to be noticed of playlit changes */
+ /* We want to be noticed of playlist changes */
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
vlc_object_release( p_playlist );
vlc_object_release( p_playlist );
}
+/**********************************************************************
+ * Rebuild the playlist
+ **********************************************************************/
void Playlist::Rebuild()
{
playlist_t *p_playlist =
return;
}
+ int i_focused = listview->GetFocusedItem();
+
/* Clear the list... */
listview->DeleteAllItems();
{
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 )
{
wxListItem listitem;
listitem.SetTextColour( *wxRED );
listview->SetItem( listitem );
- listview->Focus( p_playlist->i_index );
+ if( i_focused )
+ {
+ listview->Focus( i_focused );
+ listview->Select( i_focused );
+ }
+ else
+ {
+ listview->Focus( p_playlist->i_index );
+ }
vlc_object_release( p_playlist );
}
vlc_mutex_lock( &lock );
if( this->b_need_update )
{
- b_need_update = VLC_TRUE;
+ b_need_update =VLC_TRUE;
this->b_need_update = VLC_FALSE;
}
vlc_mutex_unlock( &lock );
- if( b_need_update ) Rebuild();
+ if( b_need_update )
+ {
+ Rebuild();
+ }
/* Updating the playing status every 0.5s is enough */
if( i_update_counter % 5 ) return;
}
/* Update the colour of items */
+
vlc_mutex_lock( &p_playlist->object_lock );
if( p_intf->p_sys->i_playing != p_playlist->i_index )
{
p_intf->p_sys->i_playing = p_playlist->i_index;
}
vlc_mutex_unlock( &p_playlist->object_lock );
-
vlc_object_release( p_playlist );
}
#endif
}
-void Playlist::OnSort( wxCommandEvent& WXUNUSED(event) )
+/********************************************************************
+ * Move functions
+ ********************************************************************/
+void Playlist::OnUp( wxCommandEvent& event)
{
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
return;
}
- playlist_Sort( p_playlist , 0 );
-
+ /* 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 )
+ {
+ playlist_Move( p_playlist , i_item, i_item - 1);
+ if( i_item > 1 )
+ {
+ listview->Focus( i_item - 1 );
+ }
+ else
+ {
+ listview->Focus(0);
+ }
+ }
vlc_object_release( p_playlist );
-
- Rebuild();
-
return;
}
-void Playlist::OnRSort( wxCommandEvent& WXUNUSED(event) )
+void Playlist::OnDown( wxCommandEvent& event)
{
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
return;
}
- playlist_Sort( p_playlist , 1 );
+ /* 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 )
+ {
+ playlist_Move( p_playlist , i_item, i_item + 2 );
+ listview->Focus( i_item + 1 );
+ }
+ vlc_object_release( p_playlist );
+ return;
+}
+/********************************************************************
+ * 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 )
+ {
+ return;
+ }
+ switch( event.GetId() )
+ {
+ 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;
+ }
vlc_object_release( p_playlist );
Rebuild();
return;
}
+/**********************************************************************
+ * Search functions
+ **********************************************************************/
void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) )
{
search_button->SetDefault();
int i_first = 0 ;
int i_item = -1;
- for( i_current = 0 ; i_current <= listview->GetItemCount() ; i_current++ )
+ for( i_current = 0 ; i_current <= listview->GetItemCount() ; i_current++ )
{
if( listview->GetItemState( i_current, wxLIST_STATE_SELECTED)
== wxLIST_STATE_SELECTED )
}
}
- for ( i_current = i_first + 1; i_current <= listview->GetItemCount() ;
+ for ( i_current = i_first + 1; i_current <= listview->GetItemCount() ;
i_current++ )
{
wxListItem listitem;
{
listview->Select( item, FALSE );
}
-
+
wxListItem listitem;
listitem.SetId(i_item);
listitem.m_state = wxLIST_STATE_SELECTED;
}
+/**********************************************************************
+ * Selection functions
+ **********************************************************************/
void Playlist::OnInvertSelection( wxCommandEvent& WXUNUSED(event) )
{
for( long item = 0; item < listview->GetItemCount(); item++ )
Rebuild();
}
+void Playlist::OnSelectAll( wxCommandEvent& WXUNUSED(event) )
+{
+ for( long item = 0; item < listview->GetItemCount(); item++ )
+ {
+ listview->Select( item, TRUE );
+ }
+}
+
+/**********************************************************************
+ * Playlist mode functions
+ **********************************************************************/
void Playlist::OnRandom( wxCommandEvent& event )
{
vlc_value_t val;
vlc_object_release( p_playlist );
}
-void Playlist::OnSelectAll( wxCommandEvent& WXUNUSED(event) )
-{
- for( long item = 0; item < listview->GetItemCount(); item++ )
- {
- listview->Select( item, TRUE );
- }
-}
+
void Playlist::OnActivateItem( wxListEvent& event )
{
vlc_object_release( p_playlist );
}
-
-void Playlist::OnEnDis( wxCommandEvent& WXUNUSED(event) )
+void Playlist::OnEnDis( wxCommandEvent& event )
{
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
if( i_item >= 0 && i_item < p_playlist->i_size )
{
- if( p_playlist->pp_items[i_item]->b_enabled == VLC_TRUE)
- playlist_DisableGroup( p_playlist ,
+ switch( event.GetId() )
+ {
+ case EnableGroup_Event:
+ playlist_EnableGroup( p_playlist ,
p_playlist->pp_items[i_item]->i_group );
- else
- playlist_EnableGroup( p_playlist ,
+ break;
+ case DisableGroup_Event:
+ playlist_DisableGroup( p_playlist ,
p_playlist->pp_items[i_item]->i_group );
+ break;
+ }
Rebuild();
}
vlc_object_release( p_playlist );
}
+
/*****************************************************************************
* PlaylistChanged: callback triggered by the intf-change playlist variable
* We don't rebuild the playlist directly here because we don't want the
vlc_mutex_unlock( &p_playlist_dialog->lock );
return VLC_SUCCESS;
}
+
+
+/***************************************************************************
+ * NewGroup
+ ***************************************************************************/
+NewGroup::NewGroup( intf_thread_t *_p_intf, wxWindow *_p_parent ):
+ wxDialog( _p_parent, -1, wxU(_("New Group")), wxDefaultPosition,
+ wxDefaultSize, wxDEFAULT_FRAME_STYLE )
+{
+ /* Initializations */
+ p_intf = _p_intf;
+ psz_name = NULL;
+ SetIcon( *p_intf->p_sys->p_icon );
+
+ /* Create a panel to put everything in*/
+ wxPanel *panel = new wxPanel( this, -1 );
+ panel->SetAutoLayout( TRUE );
+
+ wxStaticText *group_label =
+ new wxStaticText( panel , -1,
+ wxU(_("Enter the name for the new group")));
+
+ groupname = new wxTextCtrl(panel, -1, wxU(""),wxDefaultPosition,
+ wxSize(80,27),wxTE_PROCESS_ENTER);
+
+ wxButton *ok_button = new wxButton(panel, wxID_OK, wxU(_("OK")) );
+ ok_button->SetDefault();
+ wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
+ wxU(_("Cancel")) );
+
+ wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+ button_sizer->Add( ok_button, 0, wxALL, 5 );
+ button_sizer->Add( cancel_button, 0, wxALL, 5 );
+ button_sizer->Layout();
+
+ 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();
+
+ panel->SetSizerAndFit( panel_sizer );
+
+ wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
+ main_sizer->Add( panel, 1, wxEXPAND, 0 );
+ main_sizer->Layout();
+ SetSizerAndFit( main_sizer );
+}
+
+NewGroup::~NewGroup()
+{
+}
+
+void NewGroup::OnOk( wxCommandEvent& event )
+{
+ psz_name = strdup( groupname->GetLineText(0).mb_str() );
+
+ playlist_t * p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist )
+ {
+ if( !playlist_CreateGroup( p_playlist, psz_name ) )
+ {
+ psz_name = NULL;
+ }
+ }
+
+ vlc_object_release( p_playlist );
+ EndModal( wxID_OK );
+}
+
+void NewGroup::OnCancel( wxCommandEvent& WXUNUSED(event) )
+{
+ EndModal( wxID_CANCEL );
+}
projects / vlc / blobdiff