PLSelector *_p_selector,
PLModel *_p_model,
MLModel *_p_plmodel)
- : QWidget( _parent ), p_intf( _p_intf ),
- p_selector( _p_selector ), model( _p_model ),
- mlmodel( _p_plmodel)
+ : QWidget( _parent ),
+ model( _p_model ),
+ mlmodel( _p_plmodel),
+ p_intf( _p_intf ),
+ p_selector( _p_selector )
{
viewStack = new QStackedLayout( this );
viewStack->setSpacing( 0 ); viewStack->setMargin( 0 );
int i_savedViewMode = getSettings()->value( "Playlist/view-mode", TREE_VIEW ).toInt();
showView( i_savedViewMode );
- DCONNECT( THEMIM, leafBecameParent( input_item_t *),
- this, browseInto( input_item_t * ) );
+ DCONNECT( THEMIM, leafBecameParent( int ),
+ this, browseInto( int ) );
- CONNECT( model, currentChanged( const QModelIndex& ),
+ CONNECT( model, currentIndexChanged( const QModelIndex& ),
this, handleExpansion( const QModelIndex& ) );
- CONNECT( model, rootChanged(), this, browseInto() );
+ CONNECT( model, rootIndexChanged(), this, browseInto() );
- setRoot( p_root, false );
+ setRootItem( p_root, false );
}
StandardPLPanel::~StandardPLPanel()
getSettings()->beginGroup("Playlist");
if( treeView )
getSettings()->setValue( "headerStateV2", treeView->header()->saveState() );
- if( currentView == treeView )
- getSettings()->setValue( "view-mode", TREE_VIEW );
- else if( currentView == listView )
- getSettings()->setValue( "view-mode", LIST_VIEW );
- else if( currentView == iconView )
- getSettings()->setValue( "view-mode", ICON_VIEW );
- else if( currentView == picFlowView )
- getSettings()->setValue( "view-mode", PICTUREFLOW_VIEW );
+ getSettings()->setValue( "view-mode", currentViewIndex() );
getSettings()->endGroup();
}
QVLCMenu::PopupMenu( p_intf, true );
}
-void StandardPLPanel::popupSelectColumn( QPoint pos )
+void StandardPLPanel::popupSelectColumn( QPoint )
{
QMenu menu;
assert( treeView );
/* Set the root of the new Playlist */
/* This activated by the selector selection */
-void StandardPLPanel::setRoot( playlist_item_t *p_item, bool b )
+void StandardPLPanel::setRootItem( playlist_item_t *p_item, bool b )
{
#ifdef MEDIA_LIBRARY
if( b )
currentView->setModel( mlmodel );
}
else
+#else
+ Q_UNUSED( b );
#endif
{
msg_Dbg( p_intf, "Normal PL/ML or SD" );
e->accept();
}
-bool StandardPLPanel::eventFilter ( QObject * watched, QEvent * event )
+bool StandardPLPanel::eventFilter ( QObject *, QEvent * event )
{
if (event->type() == QEvent::KeyPress)
{
mod = model;
if( currentView->model() != mod )
currentView->setModel( mod );
+#else
+ Q_UNUSED( b_ml );
+ if( currentView->model() != model )
+ currentView->setModel( model );
#endif
}
gotoPlayingItem();
}
-const int StandardPLPanel::currentViewIndex()
+int StandardPLPanel::currentViewIndex() const
{
if( currentView == treeView )
return TREE_VIEW;
else if( currentView == treeView )
showView( LIST_VIEW );
else if( currentView == listView )
+#ifndef NDEBUG
showView( PICTUREFLOW_VIEW );
else if( currentView == picFlowView )
+#endif
showView( ICON_VIEW );
else
assert( 0 );
}
}
-void StandardPLPanel::browseInto( input_item_t *p_input )
+void StandardPLPanel::browseInto( int i_id )
{
- if( p_input->i_id != lastActivatedId ) return;
-
- playlist_Lock( THEPL );
-
- playlist_item_t *p_item = playlist_ItemGetByInput( THEPL, p_input );
- if( !p_item )
- {
- playlist_Unlock( THEPL );
- return;
- }
+ if( i_id != lastActivatedId ) return;
- QModelIndex index = model->index( p_item->i_id, 0 );
+ QModelIndex index = model->index( i_id, 0 );
playlist_Unlock( THEPL );
if( currentView == treeView )