#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 "dialogs_provider.hpp" /* THEDP */
+#include "input_manager.hpp" /* THEMIM */
+#include "dialogs/mediainfo.hpp" /* MediaInfo Dialog */
+#include "dialogs/playlist.hpp" /* Playlist Dialog */
+
+#include <vlc_intf_strings.h> /* I_DIR */
#include "pixmaps/types/type_unknown.xpm"
+#include "sorting.h"
#include <assert.h>
#include <QIcon>
#include <QFont>
#include <QMenu>
-#include <QApplication>
-#include <QSettings>
#include <QUrl>
#include <QFileInfo>
#include <QDesktopServices>
#include <QInputDialog>
-
-#include "sorting.h"
+#include <QSignalMapper>
+#include <QPixmapCache>
#define I_NEW_DIR \
I_DIR_OR_FOLDER( N_("Create Directory"), N_( "Create Folder" ) )
intf_thread_t *_p_intf, /* main Qt p_intf */
playlist_item_t * p_root,
QObject *parent ) /* Basic Qt parent */
- : QAbstractItemModel( parent )
+ : VLCModel( _p_intf, parent )
{
- p_intf = _p_intf;
p_playlist = _p_playlist;
i_cached_id = -1;
i_cached_input_id = -1;
rebuild( p_root );
DCONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
- this, processInputItemUpdate( input_item_t *) );
+ this, processInputItemUpdate( input_item_t *) );
DCONNECT( THEMIM, inputChanged( input_thread_t * ),
- this, processInputItemUpdate( input_thread_t* ) );
+ this, processInputItemUpdate( input_thread_t* ) );
CONNECT( THEMIM, playlistItemAppended( int, int ),
this, processItemAppend( int, int ) );
CONNECT( THEMIM, playlistItemRemoved( int ),
/* Drop operation */
bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &parent )
+ int row, int column, const QModelIndex &parent )
{
bool copy = action == Qt::CopyAction;
if( !copy && action != Qt::MoveAction )
PL_LOCK;
playlist_item_t *p_parent =
- playlist_ItemGetByInput( p_playlist, target->p_input );
+ playlist_ItemGetByInput( p_playlist, target->p_input );
if( !p_parent ) return;
if( pos == -1 ) pos = PLAYLIST_END;
if( item->parentItem == target &&
target->children.indexOf( item ) < new_pos )
- model_pos--;
+ model_pos--;
model_items.append( item );
pp_items[i] = p_item;
}
if( p_parent )
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
- p_parent, p_item );
+ p_parent, p_item );
}
/****************** Base model mandatory implementations *****************/
QString returninfo;
if( metadata == COLUMN_NUMBER )
returninfo = QString::number( index.row() + 1 );
+ else if( metadata == COLUMN_COVER )
+ {
+ QString artUrl;
+ artUrl = InputManager::decodeArtURL( item->inputItem() );
+ if( artUrl.isEmpty() )
+ {
+ for( int i = 0; i < item->childCount(); i++ )
+ {
+ artUrl = InputManager::decodeArtURL( item->child( i )->inputItem() );
+ if( !artUrl.isEmpty() )
+ break;
+ }
+ }
+ return QVariant( artUrl );
+ }
else
{
char *psz = psz_column_meta( item->p_input, metadata );
else if( role == Qt::FontRole )
{
QFont f;
- f.setPointSize( f.pointSize() - 2 );
+ f.setPointSize( f.pointSize() - 1 );
if( isCurrent( index ) )
f.setBold( true );
return QVariant( f );
QModelIndex PLModel::index( const int i_id, const int c )
{
- return index( findById( rootItem, i_id ), c );
+ return index( findById( rootItem, i_id ), c );
}
/* Return the index of a given item */
return lst;
}
-
/************************* Lookups *****************************/
-
PLItem *PLModel::findById( PLItem *root, int i_id ) const
{
return findInner( root, i_id, false );
while ( it != root->children.end() )
{
if( !b_input && (*it)->i_id == i_id )
- return (*it);
+ return (*it);
else if( b_input && (*it)->p_input->i_id == i_id )
- return (*it);
+ return (*it);
if( (*it)->children.size() )
{
PLItem *childFound = findInner( (*it), i_id, b_input );
if( childFound )
- return childFound;
+ return childFound;
}
- it++;
+ ++it;
}
return NULL;
}
-int PLModel::columnToMeta( int _column )
+bool PLModel::canEdit() const
{
- int meta = 1;
- int column = 0;
-
- while( column != _column && meta != COLUMN_END )
- {
- meta <<= 1;
- column++;
- }
+ return (
+ rootItem != NULL &&
+ (
+ rootItem->p_input == p_playlist->p_playing->p_input ||
+ ( p_playlist->p_media_library &&
+ rootItem->p_input == p_playlist->p_media_library->p_input )
+ )
+ );
+}
- return meta;
+QString PLModel::getMeta( const QModelIndex & index, int meta )
+{
+ return index.model()->index( index.row(),
+ columnFromMeta( meta ),
+ index.parent() )
+ .data().toString();
}
-int PLModel::columnFromMeta( int meta_col )
+
+QPixmap PLModel::getArtPixmap( const QModelIndex & index, const QSize & size )
{
- int meta = 1;
- int column = 0;
+ PLItem *item = static_cast<PLItem*>( index.internalPointer() );
+ assert( item );
- while( meta != meta_col && meta != COLUMN_END )
+ if( item == NULL )
+ return NULL;
+
+ QString artUrl = InputManager::decodeArtURL( item->inputItem() );
+
+ /* If empty, take one of the children art URL */
+ if( artUrl.isEmpty() )
{
- meta <<= 1;
- column++;
+ for( int i = 0; i < item->childCount(); i++ )
+ {
+ artUrl = InputManager::decodeArtURL( item->child( i )->inputItem() );
+ if( !artUrl.isEmpty() )
+ break;
+ }
}
- return column;
-}
+ QPixmap artPix;
+ QString key = artUrl + QString("%1%2").arg(size.width()).arg(size.height());
-bool PLModel::canEdit() const
-{
- return (
- rootItem != NULL &&
- (
- rootItem->p_input == p_playlist->p_playing->p_input ||
- (
- p_playlist->p_media_library &&
- rootItem->p_input == p_playlist->p_media_library->p_input
- )
- )
- );
+ /* Lookup in the QPixmapCache */
+ if( !QPixmapCache::find( key, artPix ))
+ {
+ if( artUrl.isEmpty() || !artPix.load( artUrl ) )
+ {
+ key = QString("noart%1%2").arg(size.width()).arg(size.height());
+ if( !QPixmapCache::find( key, artPix ) )
+ {
+ artPix = QPixmap( ":/noart" ).scaled( size,
+ Qt::KeepAspectRatio,
+ Qt::SmoothTransformation );
+ QPixmapCache::insert( key, artPix );
+ }
+ }
+ else
+ {
+ artPix = artPix.scaled( size, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+ QPixmapCache::insert( key, artPix );
+ }
+ }
+
+ return artPix;
}
/************************* Updates handling *****************************/
{
playlist_item_t *p_item = NULL;
PLItem *newItem = NULL;
- input_thread_t *currentInputThread;
int pos;
- PLItem *nodeItem = findById( rootItem, i_parent );
- if( !nodeItem ) return;
+ /* Find the Parent */
+ PLItem *nodeParentItem = findById( rootItem, i_parent );
+ if( !nodeParentItem ) return;
- foreach( const PLItem *existing, nodeItem->children )
- if( existing->i_id == i_item ) return;
+ /* Search for an already matching children */
+ foreach( const PLItem *existing, nodeParentItem->children )
+ if( existing->i_id == i_item ) return;
+ /* Find the child */
PL_LOCK;
p_item = playlist_ItemGetById( p_playlist, i_item );
if( !p_item || p_item->i_flags & PLAYLIST_DBL_FLAG )
for( pos = 0; pos < p_item->p_parent->i_children; pos++ )
if( p_item->p_parent->pp_children[pos] == p_item ) break;
- newItem = new PLItem( p_item, nodeItem );
+ newItem = new PLItem( p_item, nodeParentItem );
PL_UNLOCK;
- beginInsertRows( index( nodeItem, 0 ), pos, pos );
- nodeItem->insertChild( newItem, pos );
+ /* We insert the newItem (children) inside the parent */
+ beginInsertRows( index( nodeParentItem, 0 ), pos, pos );
+ nodeParentItem->insertChild( newItem, pos );
endInsertRows();
if( newItem->p_input == THEMIM->currentInputItem() )
emit currentChanged( index( newItem, 0 ) );
}
-
void PLModel::rebuild()
{
rebuild( NULL );
assert( node );
int count = items.size();
if( !count ) return;
+ printf( "Here I am\n");
beginInsertRows( index( node, 0 ), i_pos, i_pos + count - 1 );
for( int i = 0; i < count; i++ )
{
endRemoveRows( );
beginInsertRows( idx, 0, searchRoot->children.size() - 1 );
- updateChildren( searchRoot );
+ updateChildren( searchRoot ); // The PL_LOCK is needed here
endInsertRows();
PL_UNLOCK;
return false;
}
+ input_item_t *p_input = p_item->p_input;
+ vlc_gc_incref( p_input );
+
i_popup_item = index.isValid() ? p_item->i_id : -1;
i_popup_parent = index.isValid() ?
( p_item->p_parent ? p_item->p_parent->i_id : -1 ) :
qtr(I_POP_STREAM), this, SLOT( popupStream() ) );
menu.addAction( qtr(I_POP_SAVE), this, SLOT( popupSave() ) );
menu.addAction( QIcon( ":/menu/info" ), qtr(I_POP_INFO), this, SLOT( popupInfo() ) );
- menu.addAction( QIcon( ":/type/folder-grey" ),
- qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
+ if( !strncasecmp( p_input->psz_uri, "file://", 7 ) )
+ menu.addAction( QIcon( ":/type/folder-grey" ),
+ qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
menu.addSeparator();
}
if( canEdit() )
}
menu.addMenu( sortingMenu );
}
+ vlc_gc_decref( p_input );
+
if( !menu.isEmpty() )
{
menu.exec( point ); return true;
{
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item );
+ i_popup_item );
if( p_item )
{
- input_item_t *p_input = p_item->p_input;
- char *psz_meta = input_item_GetURI( p_input );
- PL_UNLOCK;
- 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 ) && (
+ input_item_t *p_input = p_item->p_input;
+ char *psz_meta = input_item_GetURI( p_input );
+ PL_UNLOCK;
+ 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( decode_URI( psz_path ) ) );
- QDesktopServices::openUrl(
- QUrl::fromLocalFile( info.absolutePath() ) );
- }
- free( psz_meta );
- }
+ {
+#ifdef WIN32
+ /* Qt openURL doesn't know to open files that starts with a / or \ */
+ if( psz_path[0] == '/' || psz_path[0] == '\\' )
+ psz_path++;
+#endif
+
+ QFileInfo info( qfu( decode_URI( psz_path ) ) );
+ QDesktopServices::openUrl(
+ QUrl::fromLocalFile( info.absolutePath() ) );
+ }
+ free( psz_meta );
+ }
}
else
PL_UNLOCK;
qtr( I_NEW_DIR ), qtr( I_NEW_DIR_NAME ),
QLineEdit::Normal, QString(), &ok);
if( !ok || name.isEmpty() ) return;
+
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
i_popup_parent );
if( p_item )
- {
playlist_NodeCreate( p_playlist, qtu( name ), p_item, PLAYLIST_END, 0, NULL );
- }
PL_UNLOCK;
}
projects / vlc / blobdiff