toolbar->Realize();
/* Create teh source selector */
- source_sel = new wxListCtrl( playlist_panel, Source_Event,
- wxDefaultPosition, wxDefaultSize,
- wxLC_AUTOARRANGE|wxLC_SINGLE_SEL );
+ source_sel = new wxListView( playlist_panel, Source_Event,
+ wxDefaultPosition, wxDefaultSize,
+ wxLC_AUTOARRANGE|wxLC_SINGLE_SEL );
/* Create the tree */
treectrl = new wxTreeCtrl( playlist_panel, TreeCtrl_Event,
wxString msg;
wxString duration = wxU( "" );
- char *psz_author;
+ char *psz_artist;
if( p_item->p_input->p_meta )
{
- psz_author= p_item->p_input->p_meta->psz_artist ?
+ psz_artist= p_item->p_input->p_meta->psz_artist ?
strdup( p_item->p_input->p_meta->psz_artist ) :
strdup("");
}
else
- psz_author = strdup( "" );
+ psz_artist = strdup( "" );
char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = p_item->p_input->i_duration;
wxU( " )" ) );
}
- if( !strcmp( psz_author, "" ) || p_item->p_input->b_fixed_name == VLC_TRUE )
+ if( !strcmp( psz_artist, "" ) || p_item->p_input->b_fixed_name == VLC_TRUE )
{
msg = wxString( wxU( p_item->p_input->psz_name ) ) + duration;
}
else
{
- msg = wxString(wxU( psz_author )) + wxT(" - ") +
+ msg = wxString(wxU( psz_artist )) + wxT(" - ") +
wxString(wxU(p_item->p_input->psz_name)) + duration;
}
- free( psz_author );
+ free( psz_artist );
treectrl->SetItemText( item , msg );
treectrl->SetItemImage( item, p_item->p_input->i_type );
wxString filter = wxT("");
- if( p_playlist->i_size == 0 )
+ if( playlist_IsEmpty( p_playlist ) )
{
wxMessageBox( wxU(_("Playlist is empty") ), wxU(_("Can't save")),
wxICON_WARNING | wxOK, this );
if( dialog.ShowModal() == wxID_OK )
{
- playlist_Import( p_playlist, dialog.GetPath().mb_str() );
+ playlist_Import( p_playlist, dialog.GetPath().mb_str(),
+ /*FIXME: where do we want to insert ? */
+ p_playlist->p_local_category, VLC_TRUE );
}
}
if( !dest_tree_item.IsOk() ) return;
- /* check that we're not trying to move a node into one of it's children */
+ /* check that we're not trying to move a node into one of its children */
wxTreeItemId parent = dest_tree_item;
while( parent != treectrl->GetRootItem() )
{
{
/* This is a leaf. Append right after it
* We thus need to find the parrent node and the position of the
- * leaf in it's children list */
+ * leaf in its children list */
wxTreeItemId parent = p->treectrl->GetItemParent( item );
PlaylistItem *p_parent =
(PlaylistItem *)p->treectrl->GetItemData( parent );
/* Put the items in the playlist node */
for( size_t i = 0; i < filenames.GetCount(); i++ )
{
- const char *psz_utf8 = wxDnDFromLocale( filenames[i] );
+ char *psz_utf8 = wxDnDFromLocale( filenames[i] );
input_item_t *p_input = input_ItemNew( p->p_playlist,
psz_utf8, psz_utf8 );
playlist_NodeAddInput( p->p_playlist, p_input,
switch( event.GetId() )
{
case UpdateItem_Event:
- fprintf( stderr,"Update input item id %i\n", event.GetInt() );
UpdateItem( event.GetInt() );
break;
case AppendItem_Event:
- fprintf( stderr,"Append item id %i\n",
- ((playlist_add_t*)event.GetClientData())->i_item );
AppendItem( event );
break;
case RemoveItem_Event:
- fprintf( stderr,"Remove item id %i\n", event.GetInt() );
RemoveItem( event.GetInt() );
break;
}