/*****************************************************************************
* playtree.cpp
*****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea@videolan.org>
+ * Clément Stenac <zorglub@videolan.org>
*
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include "playtree.hpp"
+#include <vlc_playlist.h>
#include "../utils/ustring.hpp"
-#include "charset.h"
+#include "vlc_charset.h"
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 = begin();
- vlc_mutex_lock( &getIntf()->p_sys->p_playlist->object_lock );
+ vlc_object_lock( getIntf()->p_sys->p_playlist );
for( it = begin(); it != end(); it = getNextVisibleItem( it ) )
{
if( (*it).m_selected && !(*it).isReadonly() )
playlist_item_t *p_item = (playlist_item_t *)(it->m_pData);
if( p_item->i_children == -1 )
{
- playlist_Delete( getIntf()->p_sys->p_playlist,
- p_item->input.i_id );
+ playlist_DeleteFromInput( getIntf()->p_sys->p_playlist,
+ p_item->p_input->i_id, true );
it2 = getNextVisibleItem( it ) ;
it->parent()->removeChild( it );
it = it2;
else
{
playlist_NodeDelete( getIntf()->p_sys->p_playlist, p_item,
- VLC_TRUE, VLC_FALSE );
+ true, false );
it2 = getNextSibling( it );
it->parent()->removeChild( it );
it = it2;
it = getNextVisibleItem( it );
}
}
- vlc_mutex_unlock( &getIntf()->p_sys->p_playlist->object_lock );
+ vlc_object_unlock( getIntf()->p_sys->p_playlist );
}
void Playtree::action( VarTree *pItem )
{
- vlc_mutex_lock( &m_pPlaylist->object_lock );
+ vlc_object_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 )
{
- it = pItem->begin();
- while( it->size() ) it = it->begin();
+ if( p_parent == m_pPlaylist->p_root_category )
+ break;
+ p_parent = p_parent->p_parent;
}
- 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 );
+
+ if( p_parent )
+ {
+ playlist_Control( m_pPlaylist, PLAYLIST_VIEWPLAY, pl_Locked, p_parent, p_item );
+ }
+ vlc_object_unlock( m_pPlaylist );
}
void Playtree::onChange()
{
// 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;
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 );
}
descr.i_type = 0;
notify( &descr );
if( item == end() )
{
playlist_item_t *p_item = playlist_ItemGetById(
- m_pPlaylist, p_add->i_item );
+ m_pPlaylist, p_add->i_item, false );
if( !p_item ) return;
- UString *pName = new UString( getIntf(), p_item->input.psz_name );
+ UString *pName = new UString( getIntf(),
+ p_item->p_input->psz_name );
node->add( p_add->i_item, UStringPtr( pName ),
false,false, false, p_item->i_flags & PLAYLIST_RO_FLAG,
p_item );
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]->p_input->i_id, UStringPtr( pName ),
false,
m_pPlaylist->status.p_item == pNode->pp_children[i],
false, pNode->pp_children[i]->i_flags & PLAYLIST_RO_FLAG,
void Playtree::buildTree()
{
clear();
- vlc_mutex_lock( &m_pPlaylist->object_lock );
+ vlc_object_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 );
+ vlc_object_unlock( m_pPlaylist );
// What is it ?
// checkParents( NULL );
}
projects / vlc / blobdiff