#endif
#include "qt4.hpp"
+#include "dialogs_provider.hpp"
#include "components/playlist/playlist_model.hpp"
#include "dialogs/mediainfo.hpp"
+#include "dialogs/playlist.hpp"
#include <vlc_intf_strings.h>
-#include "pixmaps/type_unknown.xpm"
+#include "pixmaps/types/type_unknown.xpm"
#include <assert.h>
#include <QIcon>
#include <QApplication>
#include <QSettings>
+#include "sorting.h"
+
QIcon PLModel::icons[ITEM_TYPE_NUMBER];
static int PlaylistChanged( vlc_object_t *, const char *,
assert( i_depth == DEPTH_SEL || i_depth == DEPTH_PL );
p_intf = _p_intf;
p_playlist = _p_playlist;
- i_items_to_append = 0;
- b_need_update = false;
i_cached_id = -1;
i_cached_input_id = -1;
i_popup_item = i_popup_parent = -1;
/* 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
- addCallbacks();
rebuild( p_root );
}
PLModel::~PLModel()
{
- QSettings settings( "vlc", "vlc-qt-interface" );
- settings.setValue( "qt-pl-showflags", rootItem->i_showflags );
+ getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
delCallbacks();
delete rootItem;
}
if( action == Qt::IgnoreAction )
return true;
- PLItem *targetItem;
- if( target.isValid() )
- targetItem = static_cast<PLItem*>( target.internalPointer() );
- else
- targetItem = rootItem;
+ if( !target.isValid() )
+ /* We don't want to move on an invalid position */
+ return true;
+
+ PLItem *targetItem = static_cast<PLItem*>( target.internalPointer() );
QByteArray encodedData = data->data( "vlc/playlist-item-id" );
QDataStream stream( &encodedData, QIODevice::ReadOnly );
PL_LOCK;
playlist_item_t *p_target =
playlist_ItemGetById( p_playlist, targetItem->i_id,
- VLC_TRUE );
+ pl_Locked );
playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId,
- VLC_TRUE );
+ pl_Locked );
if( !p_target || !p_src )
{
assert( parentItem );
playlist_item_t *p_parent =
playlist_ItemGetById( p_playlist, parentItem->i_id,
- VLC_TRUE );
+ pl_Locked );
if( !p_parent )
{
PL_UNLOCK;
}
for( i = 0 ; i< p_parent->i_children ; i++ )
if( p_parent->pp_children[i] == p_target ) break;
- playlist_TreeMove( p_playlist, p_src, p_parent, i );
+ // Move the item to the element after i
+ playlist_TreeMove( p_playlist, p_src, p_parent, i + 1 );
newParentItem = parentItem;
}
else
i = 0;
newParentItem = targetItem;
}
- /* Remove from source */
- PLItem *srcItem = FindById( rootItem, p_src->i_id );
- // We dropped on the source selector. Ask the dialog to forward
- // to the main view
- if( !srcItem )
- {
- emit shouldRemove( p_src->i_id );
- }
- else
- srcItem->remove( srcItem );
-
- /* Display at new destination */
- PLItem *newItem = new PLItem( p_src, newParentItem, this );
- newParentItem->insertChild( newItem, i, true );
- UpdateTreeItem( p_src, newItem, true );
- if( p_src->i_children != -1 )
- UpdateNodeChildren( newItem );
PL_UNLOCK;
}
+ /*TODO: That's not a good idea to rebuild the playlist */
+ rebuild();
}
return true;
}
assert( item );
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- VLC_TRUE);
+ pl_Locked );
activateItem( p_item );
PL_UNLOCK;
}
p_parent = p_parent->p_parent;
}
if( p_parent )
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE,
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
p_parent, p_item );
}
return parentItem->childCount();
}
+QStringList PLModel::selectedURIs()
+{
+ QStringList lst;
+ for( int i = 0; i < current_selection.size(); i++ )
+ {
+ PL_LOCK;
+ PLItem *item = static_cast<PLItem*>
+ (current_selection[i].internalPointer());
+ if( !item )
+ continue;
+
+ input_item_t *p_item = input_item_GetById( p_playlist,
+ item->i_input_id );
+ if( !p_item )
+ continue;
+
+ char *psz = input_item_GetURI( p_item );
+ if( !psz )
+ continue;
+ else
+ {
+ lst.append( QString( psz ) );
+ free( psz );
+ }
+ PL_UNLOCK;
+ }
+ return lst;
+}
+
/************************* General playlist status ***********************/
bool PLModel::hasRandom()
}
void PLModel::setLoop( bool on )
{
- var_SetBool( p_playlist, "loop", on ? VLC_TRUE:VLC_FALSE );
+ var_SetBool( p_playlist, "loop", on ? true:false );
config_PutInt( p_playlist, "loop", on ? 1: 0 );
}
void PLModel::setRepeat( bool on )
{
- var_SetBool( p_playlist, "repeat", on ? VLC_TRUE:VLC_FALSE );
+ var_SetBool( p_playlist, "repeat", on ? true:false );
config_PutInt( p_playlist, "repeat", on ? 1: 0 );
}
void PLModel::setRandom( bool on )
{
- var_SetBool( p_playlist, "random", on ? VLC_TRUE:VLC_FALSE );
+ var_SetBool( p_playlist, "random", on ? true:false );
config_PutInt( p_playlist, "random", on ? 1: 0 );
}
if( i_input_id <= 0 ) return;
PLItem *item = FindByInput( rootItem, i_input_id );
if( item )
+ {
+ QPL_LOCK;
UpdateTreeItem( item, true );
+ QPL_UNLOCK;
+ }
}
void PLModel::ProcessItemRemoval( int i_id )
{
playlist_item_t *p_item = NULL;
PLItem *newItem = NULL;
- i_items_to_append--;
- if( b_need_update ) return;
PLItem *nodeItem = FindById( rootItem, p_add->i_node );
PL_LOCK;
if( !nodeItem ) goto end;
- p_item = playlist_ItemGetById( p_playlist, p_add->i_item, VLC_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 )
}
if( p_root )
{
- //if( rootItem ) delete rootItem;
- rootItem = new PLItem( p_root, NULL, this );
+ delete rootItem;
+ rootItem = new PLItem( p_root, getSettings(), this );
}
assert( rootItem );
/* Recreate from root */
void PLModel::UpdateNodeChildren( PLItem *root )
{
playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id,
- VLC_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,
- VLC_TRUE );
+ pl_Locked );
UpdateTreeItem( p_item, item, signal, force );
}
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
- VLC_TRUE );
+ pl_Locked );
if( !p_item )
{
PL_UNLOCK; return;
}
if( p_item->i_children == -1 )
- playlist_DeleteFromInput( p_playlist, item->i_input_id, VLC_TRUE );
+ playlist_DeleteFromInput( p_playlist, item->i_input_id, pl_Locked );
else
- playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE );
+ playlist_NodeDelete( p_playlist, p_item, true, false );
/* And finally, remove it from the tree */
item->remove( item );
PL_UNLOCK;
int i_index = -1;
int i_flag = 0;
+ // FIXME: Disable sorting on startup by ignoring
+ // first call of sorting caused by showing dialog
+ // see: standardpanel.cpp:65
+ static bool b_first_time = true;
+ if( b_first_time )
+ {
+ b_first_time = false;
+ return;
+ }
+
#define CHECK_COLUMN( meta ) \
{ \
- if( ( shownFlags() & VLC_META_ENGINE_##meta ) ) \
+ if( ( shownFlags() & meta ) ) \
i_index++; \
if( column == i_index ) \
{ \
- i_flag = VLC_META_ENGINE_##meta; \
+ i_flag = meta; \
goto next; \
} \
}
- CHECK_COLUMN( TITLE );
- CHECK_COLUMN( DURATION );
- CHECK_COLUMN( ARTIST );
- CHECK_COLUMN( GENRE );
- CHECK_COLUMN( COLLECTION );
- CHECK_COLUMN( SEQ_NUM );
- CHECK_COLUMN( DESCRIPTION );
- CHECK_COLUMN( TRACKID );
-#undef CHECK_COLUMN;
+ CHECK_COLUMN( COLUMN_NUMBER );
+ CHECK_COLUMN( COLUMN_TITLE );
+ CHECK_COLUMN( COLUMN_DURATION );
+ CHECK_COLUMN( COLUMN_ARTIST );
+ CHECK_COLUMN( COLUMN_GENRE );
+ CHECK_COLUMN( COLUMN_ALBUM );
+ CHECK_COLUMN( COLUMN_TRACK_NUMBER );
+ CHECK_COLUMN( COLUMN_DESCRIPTION );
+
+#undef CHECK_COLUMN
next:
PL_LOCK;
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
rootItem->i_id,
- VLC_TRUE );
- int i_mode;
- switch( i_flag )
- {
- case VLC_META_ENGINE_TITLE: i_mode = SORT_TITLE_NODES_FIRST;break;
- case VLC_META_ENGINE_DURATION: i_mode = SORT_DURATION; break;
- case VLC_META_ENGINE_ARTIST: i_mode = SORT_ARTIST; break;
- case VLC_META_ENGINE_GENRE: i_mode = SORT_GENRE; break;
- case VLC_META_ENGINE_COLLECTION: i_mode = SORT_ALBUM; break;
- case VLC_META_ENGINE_SEQ_NUM: i_mode = SORT_TRACK_NUMBER; break;
- case VLC_META_ENGINE_DESCRIPTION:i_mode = SORT_DESCRIPTION; break;
- case VLC_META_ENGINE_TRACKID: i_mode = SORT_ID; break;
- default: i_mode = SORT_TITLE_NODES_FIRST;break;
- }
+ pl_Locked );
if( p_root )
{
- playlist_RecursiveNodeSort( p_playlist, p_root, i_mode,
+ playlist_RecursiveNodeSort( p_playlist, p_root,
+ i_column_sorting( i_flag ),
order == Qt::AscendingOrder ?
ORDER_NORMAL : ORDER_REVERSE );
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ p_playlist->b_reset_currently_playing = true;
}
}
PL_UNLOCK;
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
rootItem->i_id,
- VLC_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 ), VLC_TRUE );
+ itemId( index ), pl_Locked );
if( p_item )
{
i_popup_item = p_item->i_id;
menu->addAction( qfu(I_POP_SORT), this, SLOT( popupSort() ) );
menu->addAction( qfu(I_POP_ADD), this, SLOT( popupAdd() ) );
}
-#ifdef WIN32
menu->addSeparator();
menu->addAction( qfu( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
-#endif
menu->popup( point );
}
else
void PLModel::viewchanged( int meta )
{
+ assert( meta );
+ int _meta = meta;
if( rootItem )
{
- int index=0;
- switch( meta )
+ int index=-1;
+ while( _meta )
{
- case VLC_META_ENGINE_TITLE:
- index=0; break;
- case VLC_META_ENGINE_DURATION:
- index=1; break;
- case VLC_META_ENGINE_ARTIST:
- index=2; break;
- case VLC_META_ENGINE_GENRE:
- index=3; break;
- case VLC_META_ENGINE_COPYRIGHT:
- index=4; break;
- case VLC_META_ENGINE_COLLECTION:
- index=5; break;
- case VLC_META_ENGINE_SEQ_NUM:
- index=6; break;
- case VLC_META_ENGINE_DESCRIPTION:
- index=7; break;
- case VLC_META_ENGINE_TRACKID:
- index=8; break;
- default:
- break;
+ index++;
+ _meta >>= 1;
}
+
/* UNUSED emit layoutAboutToBeChanged(); */
index = __MIN( index, rootItem->item_col_strings.count() );
QModelIndex parent = createIndex( 0, 0, rootItem );
else
{
/* Adding columns */
- beginInsertColumns( createIndex( 0, 0, rootItem), index, index+1 );
+ beginInsertColumns( parent, index, index+1 );
rootItem->i_showflags |= meta;
rootItem->updateColumnHeaders();
endInsertColumns();
{
doDelete( current_selection );
}
+
void PLModel::popupPlay()
{
PL_LOCK;
{
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item,VLC_TRUE );
+ i_popup_item,
+ pl_Locked );
activateItem( p_item );
}
PL_UNLOCK;
{
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
i_popup_item,
- VLC_TRUE );
+ pl_Unlocked );
if( p_item )
{
MediaInfoDialog *mid = new MediaInfoDialog( p_intf, p_item->p_input );
+ mid->setParent( PlaylistDialog::getInstance( p_intf ),
+ Qt::Dialog );
mid->show();
}
}
void PLModel::popupStream()
{
- msg_Err( p_playlist, "Stream not implemented" );
+ QStringList mrls = selectedURIs();
+ if( !mrls.isEmpty() )
+ THEDP->streamingDialog( NULL, mrls[0], false );
+
}
void PLModel::popupSave()
{
- msg_Err( p_playlist, "Save not implemented" );
+ QStringList mrls = selectedURIs();
+ if( !mrls.isEmpty() )
+ THEDP->streamingDialog( NULL, mrls[0], true );
}
-#ifdef WIN32
-#include <shellapi.h>
+#include <QUrl>
+#include <QFileInfo>
+#include <QDesktopServices>
void PLModel::popupExplore()
{
- ShellExecute( NULL, "explore", "C:\\", NULL, NULL, SW_SHOWNORMAL );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
+ i_popup_item,
+ pl_Unlocked );
+ if( p_item )
+ {
+ input_item_t *p_input = p_item->p_input;
+ char *psz_meta = input_item_GetURI( p_input );
+ if( psz_meta )
+ {
+ const char *psz_access;
+ const char *psz_demux;
+ char *psz_path;
+ input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_meta );
+
+ if( EMPTY_STR( psz_access ) ||
+ !strncasecmp( psz_access, "file", 4 ) ||
+ !strncasecmp( psz_access, "dire", 4 ) )
+ {
+ QFileInfo info( qfu( psz_meta ) );
+ QDesktopServices::openUrl(
+ QUrl::fromLocalFile( info.absolutePath() ) );
+ }
+ free( psz_meta );
+ }
+ }
}
-#endif
/**********************************************************************
* Playlist callbacks
playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t));
memcpy( p_add, nval.p_address, sizeof( playlist_add_t ) );
- if( ++p_model->i_items_to_append >= 50 )
- {
-// p_model->b_need_update = VLC_TRUE;
-// return VLC_SUCCESS;
- }
PLEvent *event = new PLEvent( p_add );
QApplication::postEvent( p_model, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
projects / vlc / blobdiff