X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fskins2%2Fvars%2Fplaytree.cpp;h=3dc32ab8af3d3b8eead399dd4cffcdbebdccd584;hb=cc321882c23496f30bed3fb3cec2975f86a0d784;hp=fc6af1ad867e8592bf76cb1ba22278c820654047;hpb=a005a22e6ea41d55889070cea724b33c718cde8d;p=vlc diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp index fc6af1ad86..3dc32ab8af 100644 --- a/modules/gui/skins2/vars/playtree.cpp +++ b/modules/gui/skins2/vars/playtree.cpp @@ -1,10 +1,11 @@ /***************************************************************************** * playtree.cpp ***************************************************************************** - * Copyright (C) 2005 VideoLAN + * Copyright (C) 2005 the VideoLAN team * $Id$ * * Authors: Antoine Cellerier + * Clément Stenac * * 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 @@ -18,15 +19,20 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include "playtree.hpp" +#include #include "../utils/ustring.hpp" -#include "charset.h" +#include "vlc_charset.h" Playtree::Playtree( intf_thread_t *pIntf ): VarTree( pIntf ) @@ -36,75 +42,79 @@ Playtree::Playtree( intf_thread_t *pIntf ): VarTree( pIntf ) i_items_to_append = 0; - // Try to guess the current charset - char *pCharset; - vlc_current_charset( &pCharset ); - iconvHandle = vlc_iconv_open( "UTF-8", pCharset ); - msg_Dbg( pIntf, "Using character encoding: %s", pCharset ); - free( pCharset ); - - if( iconvHandle == (vlc_iconv_t) - 1 ) - { - msg_Warn( pIntf, "Unable to do requested conversion" ); - } - buildTree(); } Playtree::~Playtree() { - if( iconvHandle != (vlc_iconv_t) - 1 ) vlc_iconv_close( iconvHandle ); } void Playtree::delSelected() { - Iterator it; - for (it = begin(); it != end() ; it = getNextVisibleItem( it ) ) + Iterator it = begin(); + playlist_Lock( getIntf()->p_sys->p_playlist ); + for( it = begin(); it != end(); it = getNextVisibleItem( it ) ) + { + if( (*it).m_selected && !(*it).isReadonly() ) + { + (*it).m_deleted = true; + } + } + /// \todo Do this better (handle item-deleted) + tree_update descr; + descr.i_type = 3; + notify( &descr ); + it = begin(); + while( it != end() ) { - if( (*it).m_selected ) + if( (*it).m_deleted ) { + VarTree::Iterator it2; playlist_item_t *p_item = (playlist_item_t *)(it->m_pData); if( p_item->i_children == -1 ) { - playlist_LockDelete( getIntf()->p_sys->p_playlist, - p_item->input.i_id ); + playlist_DeleteFromInput( getIntf()->p_sys->p_playlist, + p_item->p_input, pl_Locked ); + it2 = getNextVisibleItem( it ) ; + it->parent()->removeChild( it ); + it = it2; } else { - vlc_mutex_lock( &getIntf()->p_sys->p_playlist->object_lock ); playlist_NodeDelete( getIntf()->p_sys->p_playlist, p_item, - VLC_TRUE, VLC_FALSE ); - vlc_mutex_unlock( &getIntf()->p_sys->p_playlist->object_lock ); + true, false ); + it2 = getNextSibling( it ); + it->parent()->removeChild( it ); + it = it2; } } + else + { + it = getNextVisibleItem( it ); + } } - /// \todo Do this better (handle item-deleted) - buildTree(); - tree_update descr; - descr.i_type = 1; - notify( &descr ); + playlist_Unlock( getIntf()->p_sys->p_playlist ); } void Playtree::action( VarTree *pItem ) { - vlc_mutex_lock( &m_pPlaylist->object_lock ); + playlist_Lock( m_pPlaylist ); VarTree::Iterator it; - if( pItem->size() ) + + playlist_item_t *p_item = (playlist_item_t *)pItem->m_pData; + playlist_item_t *p_parent = p_item; + while( p_parent ) + { + if( p_parent == m_pPlaylist->p_root_category ) + break; + p_parent = p_parent->p_parent; + } + + if( p_parent ) { - it = pItem->begin(); - while( it->size() ) it = it->begin(); + playlist_Control( m_pPlaylist, PLAYLIST_VIEWPLAY, pl_Locked, p_parent, p_item ); } - playlist_Control( m_pPlaylist, - PLAYLIST_VIEWPLAY, - m_pPlaylist->status.i_view, - pItem->size() - ? (playlist_item_t *)pItem->m_pData - : (playlist_item_t *)pItem->parent()->m_pData, - pItem->size() - ? (playlist_item_t *)it->m_pData - : (playlist_item_t *)pItem->m_pData - ); - vlc_mutex_unlock( &m_pPlaylist->object_lock ); + playlist_Unlock( m_pPlaylist ); } void Playtree::onChange() @@ -118,23 +128,44 @@ void Playtree::onChange() void Playtree::onUpdateItem( int id ) { Iterator it = findById( id ); + tree_update descr; + descr.b_active_item = false; if( it != end() ) { // Update the item playlist_item_t* pNode = (playlist_item_t*)(it->m_pData); - UString *pName = new UString( getIntf(), pNode->input.psz_name ); + UString *pName = new UString( getIntf(), pNode->p_input->psz_name ); it->m_cString = UStringPtr( pName ); - it->m_playing = m_pPlaylist->status.p_item == pNode; + playlist_Lock( m_pPlaylist ); + it->m_playing = playlist_CurrentPlayingItem( m_pPlaylist ) == pNode; + playlist_Unlock( m_pPlaylist ); + if( it->m_playing ) descr.b_active_item = true; } else { - msg_Warn(getIntf(), "Cannot find node with id %d", id ); + msg_Warn(getIntf(), "cannot find node with id %d", id ); } - tree_update descr; descr.i_type = 0; notify( &descr ); } +/// \todo keep a list of "recently removed" to avoid looking up if we +// already removed it +void Playtree::onDelete( int i_id ) +{ + tree_update descr; + descr.i_id = i_id; + descr.i_type = 3; + Iterator item = findById( i_id ) ; + if( item != end() ) + { + if( item->parent() ) + item->parent()->removeChild( item ); + descr.b_visible = item->parent() ? true : item->parent()->m_expanded; + notify( &descr ); + } +} + void Playtree::onAppend( playlist_add_t *p_add ) { i_items_to_append --; @@ -145,12 +176,20 @@ void Playtree::onAppend( playlist_add_t *p_add ) Iterator item = findById( p_add->i_item ); if( item == end() ) { + playlist_Lock( m_pPlaylist ); playlist_item_t *p_item = playlist_ItemGetById( m_pPlaylist, p_add->i_item ); - if( !p_item ) return; - UString *pName = new UString( getIntf(), p_item->input.psz_name ); + if( !p_item ) + { + playlist_Unlock( m_pPlaylist ); + return; + } + UString *pName = new UString( getIntf(), + p_item->p_input->psz_name ); node->add( p_add->i_item, UStringPtr( pName ), - false,false, false, p_item ); + false,false, false, p_item->i_flags & PLAYLIST_RO_FLAG, + p_item ); + playlist_Unlock( m_pPlaylist ); } } tree_update descr; @@ -166,11 +205,12 @@ void Playtree::buildNode( playlist_item_t *pNode, VarTree &rTree ) for( int i = 0; i < pNode->i_children; i++ ) { UString *pName = new UString( getIntf(), - pNode->pp_children[i]->input.psz_name ); - rTree.add( pNode->pp_children[i]->input.i_id, UStringPtr( pName ), + pNode->pp_children[i]->p_input->psz_name ); + rTree.add( pNode->pp_children[i]->i_id, UStringPtr( pName ), false, - m_pPlaylist->status.p_item == pNode->pp_children[i], - false, pNode->pp_children[i] ); + playlist_CurrentPlayingItem(m_pPlaylist) == pNode->pp_children[i], + false, pNode->pp_children[i]->i_flags & PLAYLIST_RO_FLAG, + pNode->pp_children[i] ); if( pNode->pp_children[i]->i_children ) { buildNode( pNode->pp_children[i], rTree.back() ); @@ -181,23 +221,22 @@ void Playtree::buildNode( playlist_item_t *pNode, VarTree &rTree ) void Playtree::buildTree() { clear(); - vlc_mutex_lock( &m_pPlaylist->object_lock ); + playlist_Lock( m_pPlaylist ); i_items_to_append = 0; - playlist_view_t *p_view; - p_view = playlist_ViewFind( m_pPlaylist, VIEW_CATEGORY ); - /// \todo let the user chose the view - clear(); + /* TODO: Let user choose view - Stick with category ATM */ + /* Set the root's name */ - UString *pName = new UString( getIntf(), p_view->p_root->input.psz_name ); + UString *pName = new UString( getIntf(), + m_pPlaylist->p_root_category->p_input->psz_name ); m_cString = UStringPtr( pName ); - buildNode( p_view->p_root, *this ); + buildNode( m_pPlaylist->p_root_category, *this ); - vlc_mutex_unlock( &m_pPlaylist->object_lock ); + playlist_Unlock( m_pPlaylist ); // What is it ? // checkParents( NULL ); }