#include "dialogs/mediainfo.hpp"
#include <vlc_intf_strings.h>
-#include "pixmaps/type_unknown.xpm"
+#include "pixmaps/types/type_unknown.xpm"
#include <assert.h>
#include <QIcon>
/* Icons initialization */
#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( QPixmap( x ) )
ADD_ICON( UNKNOWN , type_unknown_xpm );
- ADD_ICON( FILE, ":/pixmaps/type_file.png" );
- ADD_ICON( DIRECTORY, ":/pixmaps/type_directory.png" );
- ADD_ICON( DISC, ":/pixmaps/disc_16px.png" );
- ADD_ICON( CDDA, ":/pixmaps/cdda_16px.png" );
- ADD_ICON( CARD, ":/pixmaps/capture-card_16px.png" );
- ADD_ICON( NET, ":/pixmaps/type_net.png" );
- ADD_ICON( PLAYLIST, ":/pixmaps/type_playlist.png" );
- ADD_ICON( NODE, ":/pixmaps/type_node.png" );
+ ADD_ICON( FILE, ":/type_file" );
+ ADD_ICON( DIRECTORY, ":/type_directory" );
+ ADD_ICON( DISC, ":/disc" );
+ ADD_ICON( CDDA, ":/cdda" );
+ ADD_ICON( CARD, ":/capture-card" );
+ ADD_ICON( NET, ":/type_net" );
+ ADD_ICON( PLAYLIST, ":/type_playlist" );
+ ADD_ICON( NODE, ":/type_node" );
#undef ADD_ICON
rebuild( p_root );
PL_LOCK;
playlist_item_t *p_target =
playlist_ItemGetById( p_playlist, targetItem->i_id,
- true );
+ pl_Locked );
playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId,
- true );
+ pl_Locked );
if( !p_target || !p_src )
{
assert( parentItem );
playlist_item_t *p_parent =
playlist_ItemGetById( p_playlist, parentItem->i_id,
- true );
+ pl_Locked );
if( !p_parent )
{
PL_UNLOCK;
assert( item );
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- true);
+ pl_Locked );
activateItem( p_item );
PL_UNLOCK;
}
PL_LOCK;
if( !nodeItem ) goto end;
- p_item = playlist_ItemGetById( p_playlist, p_add->i_item, true );
+ p_item = playlist_ItemGetById( p_playlist, p_add->i_item, pl_Locked );
if( !p_item || p_item->i_flags & PLAYLIST_DBL_FLAG ) goto end;
if( i_depth == DEPTH_SEL && p_item->p_parent &&
p_item->p_parent->i_id != rootItem->i_id )
void PLModel::UpdateNodeChildren( PLItem *root )
{
playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id,
- true );
+ pl_Locked );
UpdateNodeChildren( p_node, root );
}
void PLModel::UpdateTreeItem( PLItem *item, bool signal, bool force )
{
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- true );
+ pl_Locked );
UpdateTreeItem( p_item, item, signal, force );
}
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- true );
+ pl_Locked );
if( !p_item )
{
PL_UNLOCK; return;
}
if( p_item->i_children == -1 )
- playlist_DeleteFromInput( p_playlist, item->i_input_id, true );
+ playlist_DeleteFromInput( p_playlist, item->i_input_id, pl_Locked );
else
playlist_NodeDelete( p_playlist, p_item, true, false );
/* And finally, remove it from the tree */
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
rootItem->i_id,
- true );
+ pl_Locked );
if( p_root )
{
playlist_RecursiveNodeSort( p_playlist, p_root,
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
rootItem->i_id,
- true );
+ pl_Locked );
assert( p_root );
char *psz_name = search_text.toUtf8().data();
playlist_LiveSearchUpdate( p_playlist , p_root, psz_name );
assert( index.isValid() );
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- itemId( index ), true );
+ itemId( index ), pl_Locked );
if( p_item )
{
i_popup_item = p_item->i_id;
PL_LOCK;
{
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item,true );
+ i_popup_item,
+ pl_Locked );
activateItem( p_item );
}
PL_UNLOCK;
{
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
i_popup_item,
- false );
+ pl_Unlocked );
if( p_item )
{
MediaInfoDialog *mid = new MediaInfoDialog( p_intf, p_item->p_input );