[vlc-commits] modules: Remove references to the old media library
Hugo Beauzée-Luyssen
git at videolan.org
Tue Jul 17 23:53:52 CEST 2018
vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Jun 7 15:19:43 2018 +0200| [06a21a644322c2562dab945029076079531a6595] | committer: Hugo Beauzée-Luyssen
modules: Remove references to the old media library
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06a21a644322c2562dab945029076079531a6595
---
modules/gui/macosx/VLCCoreInteraction.m | 2 +-
modules/gui/macosx/VLCMainWindow.m | 30 ++----------------
modules/gui/macosx/VLCPLModel.h | 1 -
modules/gui/macosx/VLCPLModel.m | 5 +--
modules/gui/macosx/VLCPlaylist.m | 4 ---
modules/gui/ncurses.c | 2 +-
modules/gui/qt/components/playlist/playlist.cpp | 6 ++--
.../gui/qt/components/playlist/playlist_model.cpp | 8 ++---
.../gui/qt/components/playlist/playlist_model.hpp | 1 -
modules/gui/qt/components/playlist/selector.cpp | 17 ++--------
modules/gui/qt/components/playlist/selector.hpp | 1 -
modules/gui/qt/components/playlist/sorting.h | 22 -------------
.../gui/qt/components/playlist/standardpanel.cpp | 2 +-
modules/gui/qt/dialogs/open.cpp | 11 +++----
modules/gui/qt/dialogs/open.hpp | 5 ++-
modules/gui/qt/dialogs_provider.cpp | 37 ++++++----------------
modules/gui/qt/dialogs_provider.hpp | 2 --
modules/gui/qt/main_interface.cpp | 7 ++--
modules/gui/qt/main_interface.hpp | 3 +-
modules/gui/qt/recents.cpp | 11 +++----
modules/gui/qt/recents.hpp | 4 +--
modules/gui/skins2/vars/playtree.cpp | 6 ----
modules/lua/libs/playlist.c | 3 --
23 files changed, 38 insertions(+), 152 deletions(-)
diff --git a/modules/gui/macosx/VLCCoreInteraction.m b/modules/gui/macosx/VLCCoreInteraction.m
index 904183594d..ce66f8df23 100644
--- a/modules/gui/macosx/VLCCoreInteraction.m
+++ b/modules/gui/macosx/VLCCoreInteraction.m
@@ -147,7 +147,7 @@ static int BossCallback(vlc_object_t *p_this, const char *psz_var,
} else {
PLRootType root = [[[[VLCMain sharedInstance] playlist] model] currentRootType];
- if ([[[VLCMain sharedInstance] playlist] isSelectionEmpty] && (root == ROOT_TYPE_PLAYLIST || root == ROOT_TYPE_MEDIALIBRARY))
+ if ([[[VLCMain sharedInstance] playlist] isSelectionEmpty] && (root == ROOT_TYPE_PLAYLIST))
[[[VLCMain sharedInstance] open] openFileGeneric];
else
[[[VLCMain sharedInstance] playlist] playItem:nil];
diff --git a/modules/gui/macosx/VLCMainWindow.m b/modules/gui/macosx/VLCMainWindow.m
index 24ce676d29..c49af65e18 100644
--- a/modules/gui/macosx/VLCMainWindow.m
+++ b/modules/gui/macosx/VLCMainWindow.m
@@ -277,8 +277,6 @@ static const float f_min_window_height = 307.;
SideBarItem *libraryItem = [SideBarItem itemWithTitle:_NS("LIBRARY") identifier:@"library"];
SideBarItem *playlistItem = [SideBarItem itemWithTitle:_NS("Playlist") identifier:@"playlist"];
[playlistItem setIcon: imageFromRes(@"sidebar-playlist")];
- SideBarItem *medialibraryItem = [SideBarItem itemWithTitle:_NS("Media Library") identifier:@"medialibrary"];
- [medialibraryItem setIcon: imageFromRes(@"sidebar-playlist")];
SideBarItem *mycompItem = [SideBarItem itemWithTitle:_NS("MY COMPUTER") identifier:@"mycomputer"];
SideBarItem *devicesItem = [SideBarItem itemWithTitle:_NS("DEVICES") identifier:@"devices"];
SideBarItem *lanItem = [SideBarItem itemWithTitle:_NS("LOCAL NETWORK") identifier:@"localnetwork"];
@@ -343,7 +341,7 @@ static const float f_min_window_height = 307.;
free(ppsz_longnames);
free(p_categories);
- [libraryItem setChildren: [NSArray arrayWithObjects:playlistItem, medialibraryItem, nil]];
+ [libraryItem setChildren: [NSArray arrayWithObjects:playlistItem, nil]];
[o_sidebaritems addObject: libraryItem];
if ([mycompItem hasChildren])
[o_sidebaritems addObject: mycompItem];
@@ -823,8 +821,6 @@ static const float f_min_window_height = 307.;
PL_LOCK;
if (root == ROOT_TYPE_PLAYLIST)
[_categoryLabel setStringValue: [_NS("Playlist") stringByAppendingString:[self _playbackDurationOfNode:p_playlist->p_playing]]];
- else if (root == ROOT_TYPE_MEDIALIBRARY)
- [_categoryLabel setStringValue: [_NS("Media Library") stringByAppendingString:[self _playbackDurationOfNode:p_playlist->p_media_library]]];
PL_UNLOCK;
}
@@ -901,7 +897,7 @@ static const float f_min_window_height = 307.;
- (BOOL)sourceList:(PXSourceList*)aSourceList itemHasBadge:(id)item
{
- if ([[item identifier] isEqualToString: @"playlist"] || [[item identifier] isEqualToString: @"medialibrary"])
+ if ([[item identifier] isEqualToString: @"playlist"])
return YES;
return [item hasBadge];
@@ -920,14 +916,6 @@ static const float f_min_window_height = 307.;
return i_playlist_size;
}
- if ([[item identifier] isEqualToString: @"medialibrary"]) {
- PL_LOCK;
- if (p_playlist->p_media_library)
- i_playlist_size = p_playlist->p_media_library->i_children;
- PL_UNLOCK;
-
- return i_playlist_size;
- }
return [item badgeValue];
}
@@ -1014,16 +1002,6 @@ static const float f_min_window_height = 307.;
[self _updatePlaylistTitle];
- } else if ([[item identifier] isEqualToString:@"medialibrary"]) {
- if (p_playlist->p_media_library) {
-
- PL_LOCK;
- [[[[VLCMain sharedInstance] playlist] model] changeRootItem:p_playlist->p_media_library];
-
- PL_UNLOCK;
-
- [self _updatePlaylistTitle];
- }
} else {
PL_LOCK;
const char *title = [[item title] UTF8String];
@@ -1057,7 +1035,7 @@ static const float f_min_window_height = 307.;
- (NSDragOperation)sourceList:(PXSourceList *)aSourceList validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
{
- if ([[item identifier] isEqualToString:@"playlist"] || [[item identifier] isEqualToString:@"medialibrary"]) {
+ if ([[item identifier] isEqualToString:@"playlist"]) {
NSPasteboard *o_pasteboard = [info draggingPasteboard];
if ([[o_pasteboard types] containsObject: VLCPLItemPasteboadType] || [[o_pasteboard types] containsObject: NSFilenamesPboardType])
return NSDragOperationGeneric;
@@ -1074,8 +1052,6 @@ static const float f_min_window_height = 307.;
if ([[item identifier] isEqualToString:@"playlist"])
p_node = p_playlist->p_playing;
- else
- p_node = p_playlist->p_media_library;
if ([[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"]) {
NSArray * array = [[[VLCMain sharedInstance] playlist] draggedItems];
diff --git a/modules/gui/macosx/VLCPLModel.h b/modules/gui/macosx/VLCPLModel.h
index 13688a7d04..8545b68ba8 100644
--- a/modules/gui/macosx/VLCPLModel.h
+++ b/modules/gui/macosx/VLCPLModel.h
@@ -43,7 +43,6 @@
typedef enum {
ROOT_TYPE_PLAYLIST,
- ROOT_TYPE_MEDIALIBRARY,
ROOT_TYPE_OTHER
} PLRootType;
diff --git a/modules/gui/macosx/VLCPLModel.m b/modules/gui/macosx/VLCPLModel.m
index 898d434148..baf898efd1 100644
--- a/modules/gui/macosx/VLCPLModel.m
+++ b/modules/gui/macosx/VLCPLModel.m
@@ -185,16 +185,13 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
int i_root_id = [_rootItem plItemId];
if (i_root_id == p_playlist->p_playing->i_id)
return ROOT_TYPE_PLAYLIST;
- if (p_playlist->p_media_library && i_root_id == p_playlist->p_media_library->i_id)
- return ROOT_TYPE_MEDIALIBRARY;
return ROOT_TYPE_OTHER;
}
- (BOOL)editAllowed
{
- return [self currentRootType] == ROOT_TYPE_MEDIALIBRARY ||
- [self currentRootType] == ROOT_TYPE_PLAYLIST;
+ return [self currentRootType] == ROOT_TYPE_PLAYLIST;
}
- (void)deleteSelectedItem
diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m
index d959303f11..696e3ab0b2 100644
--- a/modules/gui/macosx/VLCPlaylist.m
+++ b/modules/gui/macosx/VLCPlaylist.m
@@ -589,10 +589,6 @@
int i_plItemId = -1;
- // add items directly to media library if this is the current root
- if ([[self model] currentRootType] == ROOT_TYPE_MEDIALIBRARY)
- i_plItemId = [[[self model] rootItem] plItemId];
-
BOOL b_autoplay = var_InheritBool(getIntf(), "macosx-autoplay");
[self addPlaylistItems:array withParentItemId:i_plItemId atPos:-1 startPlayback:b_autoplay];
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index c5c4822fe2..a1aa39a4f5 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -1298,7 +1298,7 @@ static void AddItem(intf_thread_t *intf, const char *path)
node = playlist_CurrentPlayingItem(playlist);
while (node != NULL) {
- if (node == playlist->p_playing || node == playlist->p_media_library)
+ if (node == playlist->p_playing)
break;
node = node->p_parent;
}
diff --git a/modules/gui/qt/components/playlist/playlist.cpp b/modules/gui/qt/components/playlist/playlist.cpp
index d2849a252b..a90bd060ac 100644
--- a/modules/gui/qt/components/playlist/playlist.cpp
+++ b/modules/gui/qt/components/playlist/playlist.cpp
@@ -178,12 +178,10 @@ PlaylistWidget::~PlaylistWidget()
void PlaylistWidget::dropEvent( QDropEvent *event )
{
- if( !( selector->getCurrentItemCategory() == IS_PL ||
- selector->getCurrentItemCategory() == IS_ML ) ) return;
+ if( selector->getCurrentItemCategory() != IS_PL ) return;
if( p_intf->p_sys->p_mi )
- p_intf->p_sys->p_mi->dropEventPlay( event, false,
- (selector->getCurrentItemCategory() == IS_PL) );
+ p_intf->p_sys->p_mi->dropEventPlay( event, false );
}
void PlaylistWidget::dragEnterEvent( QDragEnterEvent *event )
{
diff --git a/modules/gui/qt/components/playlist/playlist_model.cpp b/modules/gui/qt/components/playlist/playlist_model.cpp
index 99e4c8f942..9003acd505 100644
--- a/modules/gui/qt/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt/components/playlist/playlist_model.cpp
@@ -584,10 +584,6 @@ PLModel::pl_nodetype PLModel::getPLRootType() const
if( plitem->id() == p_playlist->p_playing->i_id )
return ROOTTYPE_CURRENT_PLAYING;
- if( p_playlist->p_media_library &&
- plitem->id() == p_playlist->p_media_library->i_id )
- return ROOTTYPE_MEDIA_LIBRARY;
-
return ROOTTYPE_OTHER;
}
@@ -1002,14 +998,14 @@ bool PLModel::action( QAction *action, const QModelIndexList &indexes )
case ACTION_ENQUEUEFILE:
foreach( const QString &uri, a.uris )
Open::openMRL( p_intf, uri.toLatin1().constData(),
- false, getPLRootType() == ROOTTYPE_CURRENT_PLAYING );
+ false );
return true;
case ACTION_ENQUEUEDIR:
if( a.uris.isEmpty() ) break;
Open::openMRL( p_intf, a.uris.first().toLatin1().constData(),
- false, getPLRootType() == ROOTTYPE_CURRENT_PLAYING );
+ false );
return true;
diff --git a/modules/gui/qt/components/playlist/playlist_model.hpp b/modules/gui/qt/components/playlist/playlist_model.hpp
index a82ec5c2c6..92fe4e0f9c 100644
--- a/modules/gui/qt/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt/components/playlist/playlist_model.hpp
@@ -147,7 +147,6 @@ private:
enum pl_nodetype
{
ROOTTYPE_CURRENT_PLAYING,
- ROOTTYPE_MEDIA_LIBRARY,
ROOTTYPE_OTHER
};
pl_nodetype getPLRootType() const;
diff --git a/modules/gui/qt/components/playlist/selector.cpp b/modules/gui/qt/components/playlist/selector.cpp
index a2f81995ac..df8e2559ab 100644
--- a/modules/gui/qt/components/playlist/selector.cpp
+++ b/modules/gui/qt/components/playlist/selector.cpp
@@ -230,15 +230,6 @@ void PLSelector::createItems()
playlistItem->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/playlist.svg" ) );
setCurrentItem( playlistItem->treeItem() );
- /* ML */
- if( THEPL->p_media_library )
- {
- PLSelItem *ml = putPLData( addItem( PL_ITEM_TYPE, N_("Media Library"), true ),
- THEPL->p_media_library );
- ml->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_ML ) );
- ml->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/library.svg" ) );
- }
-
/* SD nodes */
QTreeWidgetItem *mycomp = addItem( CATEGORY_TYPE, N_("My Computer"), false, true )->treeItem();
QTreeWidgetItem *devices = addItem( CATEGORY_TYPE, N_("Devices"), false, true )->treeItem();
@@ -464,9 +455,7 @@ bool PLSelector::dropMimeData ( QTreeWidgetItem * parent, int,
if( type == QVariant() ) return false;
int i_truth = parent->data( 0, SPECIAL_ROLE ).toInt();
- if( i_truth != IS_PL && i_truth != IS_ML ) return false;
-
- bool to_pl = ( i_truth == IS_PL );
+ if( i_truth != IS_PL ) return false;
const PlMimeData *plMimeData = qobject_cast<const PlMimeData*>( data );
if( !plMimeData ) return false;
@@ -480,9 +469,7 @@ bool PLSelector::dropMimeData ( QTreeWidgetItem * parent, int,
playlist_item_t *p_item = playlist_ItemGetByInput( THEPL, p_input );
if( !p_item ) continue;
- playlist_NodeAddCopy( THEPL, p_item,
- to_pl ? THEPL->p_playing : THEPL->p_media_library,
- PLAYLIST_END );
+ playlist_NodeAddCopy( THEPL, p_item, THEPL->p_playing, PLAYLIST_END );
}
playlist_Unlock( THEPL );
diff --git a/modules/gui/qt/components/playlist/selector.hpp b/modules/gui/qt/components/playlist/selector.hpp
index b7d629af91..a85084f022 100644
--- a/modules/gui/qt/components/playlist/selector.hpp
+++ b/modules/gui/qt/components/playlist/selector.hpp
@@ -49,7 +49,6 @@ enum SelectorItemType {
enum SpecialData {
IS_PODCAST = 1,
IS_PL,
- IS_ML
};
enum {
diff --git a/modules/gui/qt/components/playlist/sorting.h b/modules/gui/qt/components/playlist/sorting.h
index f870e218b2..12a924a254 100644
--- a/modules/gui/qt/components/playlist/sorting.h
+++ b/modules/gui/qt/components/playlist/sorting.h
@@ -136,26 +136,4 @@ static inline int i_column_sorting( uint32_t i_column )
}
}
-/* Return the media library query select type */
-static inline ml_select_e meta_to_mlmeta( uint32_t i_column )
-{
- switch( i_column )
- {
- case COLUMN_NUMBER: return ML_ID;
- case COLUMN_TITLE: return ML_TITLE;
- case COLUMN_DURATION: return ML_DURATION;
- case COLUMN_ARTIST: return ML_ARTIST;
- case COLUMN_GENRE: return ML_GENRE;
- case COLUMN_ALBUM: return ML_ALBUM;
- case COLUMN_TRACK_NUMBER: return ML_TRACK_NUMBER;
- case COLUMN_DESCRIPTION: return ML_EXTRA;
- case COLUMN_URI: return ML_URI;
- case COLUMN_RATING: return ML_VOTE;
- case COLUMN_COVER: return ML_COVER;
- case COLUMN_DISC_NUMBER: return ML_DISC_NUMBER;
- case COLUMN_DATE: return ML_YEAR;
- default: abort();
- }
-}
-
#endif
diff --git a/modules/gui/qt/components/playlist/standardpanel.cpp b/modules/gui/qt/components/playlist/standardpanel.cpp
index d3d658c1f4..70073b6a1b 100644
--- a/modules/gui/qt/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt/components/playlist/standardpanel.cpp
@@ -383,7 +383,7 @@ void StandardPLPanel::popupAction( QAction *action )
break;
case VLCModelSubInterface::ACTION_ENQUEUEGENERIC:
- dialog = OpenDialog::getInstance( this, p_intf, false, SELECT, true, true );
+ dialog = OpenDialog::getInstance( this, p_intf, false, SELECT, true );
dialog->showTab( OPEN_FILE_TAB );
dialog->exec(); /* make it modal */
a.uris = dialog->getMRLs();
diff --git a/modules/gui/qt/dialogs/open.cpp b/modules/gui/qt/dialogs/open.cpp
index 6bde576599..fe6da61cba 100644
--- a/modules/gui/qt/dialogs/open.cpp
+++ b/modules/gui/qt/dialogs/open.cpp
@@ -40,12 +40,12 @@
OpenDialog *OpenDialog::instance = NULL;
OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
- bool b_rawInstance, int _action_flag, bool b_selectMode, bool _b_pl )
+ bool b_rawInstance, int _action_flag, bool b_selectMode )
{
/* Creation */
if( !instance )
instance = new OpenDialog( parent, p_intf, b_selectMode,
- _action_flag, _b_pl );
+ _action_flag );
else if( !b_rawInstance )
{
/* Request the instance but change small details:
@@ -55,7 +55,6 @@ OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
if the call is correct */
instance->setWindowModality( Qt::WindowModal );
instance->i_action_flag = _action_flag;
- instance->b_pl = _b_pl;
instance->setMenuAction();
}
return instance;
@@ -64,11 +63,9 @@ OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
OpenDialog::OpenDialog( QWidget *parent,
intf_thread_t *_p_intf,
bool b_selectMode,
- int _action_flag,
- bool _b_pl) : QVLCDialog( parent, _p_intf )
+ int _action_flag ) : QVLCDialog( parent, _p_intf )
{
i_action_flag = _action_flag;
- b_pl =_b_pl;
if( b_selectMode ) /* Select mode */
i_action_flag = SELECT;
@@ -382,7 +379,7 @@ void OpenDialog::enqueue( bool b_enqueue )
QStringList optionsList = getOptions().split( " :" );
/* Switch between enqueuing and starting the item */
- Open::openMRLwithOptions( p_intf, itemsMRL[i], &optionsList, b_start, b_pl );
+ Open::openMRLwithOptions( p_intf, itemsMRL[i], &optionsList, b_start );
}
}
diff --git a/modules/gui/qt/dialogs/open.hpp b/modules/gui/qt/dialogs/open.hpp
index 325e010a78..a4f623b1b5 100644
--- a/modules/gui/qt/dialogs/open.hpp
+++ b/modules/gui/qt/dialogs/open.hpp
@@ -60,7 +60,7 @@ class OpenDialog : public QVLCDialog
public:
static OpenDialog * getInstance( QWidget *parent, intf_thread_t *p_intf,
bool b_rawInstance = false, int _action_flag = 0,
- bool b_selectMode = false, bool b_pl = true );
+ bool b_selectMode = false );
static void killInstance()
{
@@ -83,7 +83,7 @@ public slots:
private:
OpenDialog( QWidget *parent, intf_thread_t *, bool b_selectMode,
- int _action_flag = 0, bool b_pl = true );
+ int _action_flag = 0 );
virtual ~OpenDialog();
static OpenDialog *instance;
@@ -100,7 +100,6 @@ private:
CaptureOpenPanel *captureOpenPanel;
int i_action_flag;
- bool b_pl;
QStringList SeparateEntries( const QString& );
QPushButton *cancelButton, *selectButton;
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index a6e9d240c5..27212bd769 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -453,13 +453,6 @@ void DialogsProvider::PLAppendDialog( int tab )
OPEN_AND_ENQUEUE )->showTab( tab );
}
-void DialogsProvider::MLAppendDialog( int tab )
-{
- OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false,
- OPEN_AND_ENQUEUE, false, false )
- ->showTab( tab );
-}
-
/**
* Simple open
***/
@@ -502,29 +495,19 @@ QStringList DialogsProvider::showSimpleOpen( const QString& help,
return res;
}
-/**
- * Open a file,
- * pl helps you to choose from playlist or media library,
- * go to start or enqueue
- **/
-void DialogsProvider::addFromSimple( bool pl, bool go)
+void DialogsProvider::simpleOpenDialog()
{
QStringList urls = DialogsProvider::showSimpleOpen();
- bool first = go;
+ bool first = true;
urls.sort();
foreach( const QString &url, urls )
{
- Open::openMRL( p_intf, url, first, pl);
+ Open::openMRL( p_intf, url, first );
first = false;
}
}
-void DialogsProvider::simpleOpenDialog()
-{
- addFromSimple( true, true ); /* Playlist and Go */
-}
-
/* Url & Clipboard */
/**
* Open a MRL.
@@ -558,11 +541,11 @@ void DialogsProvider::openUrlDialog()
* pl helps you to choose from playlist or media library,
* go to start or enqueue
**/
-static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
+static void openDirectory( intf_thread_t *p_intf, bool go )
{
QString uri = DialogsProvider::getDirectoryDialog( p_intf );
if( !uri.isEmpty() )
- Open::openMRL( p_intf, uri, go, pl );
+ Open::openMRL( p_intf, uri, go );
}
QString DialogsProvider::getDirectoryDialog( intf_thread_t *p_intf )
@@ -600,12 +583,12 @@ QString DialogsProvider::getDirectoryDialog( intf_thread_t *p_intf )
void DialogsProvider::PLOpenDir()
{
- openDirectory( p_intf, true, true );
+ openDirectory( p_intf, true );
}
void DialogsProvider::PLAppendDir()
{
- openDirectory( p_intf, true, false );
+ openDirectory( p_intf, false );
}
/****************
@@ -694,8 +677,8 @@ void DialogsProvider::savePlayingToPlaylist()
if ( psz_selected_module )
{
- playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
- true, psz_selected_module );
+ playlist_Export( THEPL, qtu( toNativeSeparators( file ) ), true,
+ psz_selected_module );
getSettings()->setValue( "last-playlist-ext", psz_last_playlist_ext );
}
}
@@ -765,7 +748,7 @@ void DialogsProvider::streamingDialog( QWidget *parent,
QString title = "Converting " + mrls[i];
/* Add each file to convert to our playlist, making sure to not attempt to start playing it.*/
- Open::openMRLwithOptions( p_intf, mrls[i], &optionsCopy, false, true, qtu( title ) );
+ Open::openMRLwithOptions( p_intf, mrls[i], &optionsCopy, false, qtu( title ) );
}
/* Start the playlist from the beginning */
diff --git a/modules/gui/qt/dialogs_provider.hpp b/modules/gui/qt/dialogs_provider.hpp
index 8105c7f13d..413d5398a6 100644
--- a/modules/gui/qt/dialogs_provider.hpp
+++ b/modules/gui/qt/dialogs_provider.hpp
@@ -119,7 +119,6 @@ private:
bool b_isDying;
void openDialog( int );
- void addFromSimple( bool, bool );
public slots:
void playlistDialog();
@@ -159,7 +158,6 @@ public slots:
void openCaptureDialog();
void PLAppendDialog( int tab = OPEN_FILE_TAB );
- void MLAppendDialog( int tab = OPEN_FILE_TAB );
void PLOpenDir();
void PLAppendDir();
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 0cb322bbcf..f9f38530be 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -1530,10 +1530,9 @@ void MainInterface::dropEvent(QDropEvent *event)
* Event called if something is dropped onto a VLC window
* \param event the event in question
* \param b_play whether to play the file immediately
- * \param b_playlist true to add to playlist, false to add to media library
* \return nothing
*/
-void MainInterface::dropEventPlay( QDropEvent *event, bool b_play, bool b_playlist )
+void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
{
if( event->possibleActions() & ( Qt::CopyAction | Qt::MoveAction | Qt::LinkAction ) )
event->setDropAction( Qt::CopyAction );
@@ -1578,7 +1577,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play, bool b_playli
#endif
if( mrl.length() > 0 )
{
- Open::openMRL( p_intf, mrl, first, b_playlist );
+ Open::openMRL( p_intf, mrl, first );
first = false;
}
}
@@ -1591,7 +1590,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play, bool b_playli
QUrl(mimeData->text()).isValid() )
{
QString mrl = toURI( mimeData->text() );
- Open::openMRL( p_intf, mrl, first, b_playlist );
+ Open::openMRL( p_intf, mrl, first );
}
event->accept();
}
diff --git a/modules/gui/qt/main_interface.hpp b/modules/gui/qt/main_interface.hpp
index 1094c24406..b61585d599 100644
--- a/modules/gui/qt/main_interface.hpp
+++ b/modules/gui/qt/main_interface.hpp
@@ -99,8 +99,7 @@ public:
StandardPLPanel* getPlaylistView();
protected:
- void dropEventPlay( QDropEvent* event, bool b_play ) { dropEventPlay(event, b_play, true); }
- void dropEventPlay( QDropEvent *, bool, bool );
+ void dropEventPlay( QDropEvent* event, bool b_play );
void changeEvent( QEvent * ) Q_DECL_OVERRIDE;
void dropEvent( QDropEvent *) Q_DECL_OVERRIDE;
void dragEnterEvent( QDragEnterEvent * ) Q_DECL_OVERRIDE;
diff --git a/modules/gui/qt/recents.cpp b/modules/gui/qt/recents.cpp
index 7bfadf1ca9..5aa190ed31 100644
--- a/modules/gui/qt/recents.cpp
+++ b/modules/gui/qt/recents.cpp
@@ -182,17 +182,15 @@ void RecentsMRL::setTime( const QString &mrl, const int64_t time )
int Open::openMRL( intf_thread_t *p_intf,
const QString &mrl,
- bool b_start,
- bool b_playlist)
+ bool b_start )
{
- return openMRLwithOptions( p_intf, mrl, NULL, b_start, b_playlist );
+ return openMRLwithOptions( p_intf, mrl, NULL, b_start );
}
int Open::openMRLwithOptions( intf_thread_t* p_intf,
const QString &mrl,
QStringList *options,
bool b_start,
- bool b_playlist,
const char *title)
{
/* Options */
@@ -213,11 +211,10 @@ int Open::openMRLwithOptions( intf_thread_t* p_intf,
/* Add to playlist */
int i_ret = playlist_AddExt( THEPL, qtu(mrl), title, b_start,
- i_options, ppsz_options, VLC_INPUT_OPTION_TRUSTED,
- b_playlist );
+ i_options, ppsz_options, VLC_INPUT_OPTION_TRUSTED, true );
/* Add to recent items, only if played */
- if( i_ret == VLC_SUCCESS && b_start && b_playlist )
+ if( i_ret == VLC_SUCCESS && b_start )
RecentsMRL::getInstance( p_intf )->addRecent( mrl );
/* Free options */
diff --git a/modules/gui/qt/recents.hpp b/modules/gui/qt/recents.hpp
index 1543055249..a86d78f76e 100644
--- a/modules/gui/qt/recents.hpp
+++ b/modules/gui/qt/recents.hpp
@@ -40,14 +40,12 @@ class Open
public:
static int openMRL( intf_thread_t*,
const QString &,
- bool b_start = true,
- bool b_playlist = true);
+ bool b_start = true);
static int openMRLwithOptions( intf_thread_t*,
const QString &,
QStringList *options,
bool b_start = true,
- bool b_playlist = true,
const char* title = NULL);
};
diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index c0d2fda468..e6ceabc48d 100644
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -296,12 +296,6 @@ void Playtree::insertItems( VarTree& elem, const std::list<std::string>& files,
i_pos = 0;
p_elem->setExpanded( true );
}
- else if( p_elem->getId() == m_pPlaylist->p_media_library->i_id )
- {
- p_node = m_pPlaylist->p_media_library;
- i_pos = 0;
- p_elem->setExpanded( true );
- }
else if( p_elem->size() && p_elem->isExpanded() )
{
p_node = playlist_ItemGetById( m_pPlaylist, p_elem->getId() );
diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c
index 0becc434c5..895447334e 100644
--- a/modules/lua/libs/playlist.c
+++ b/modules/lua/libs/playlist.c
@@ -291,9 +291,6 @@ static int vlclua_playlist_get( lua_State *L )
if( !strcasecmp( psz_what, "normal" )
|| !strcasecmp( psz_what, "playlist" ) )
p_item = p_playlist->p_playing;
- else if( !strcasecmp( psz_what, "ml" )
- || !strcasecmp( psz_what, "media library" ) )
- p_item = p_playlist->p_media_library;
else if( !strcasecmp( psz_what, "root" ) )
p_item = &p_playlist->root;
else
More information about the vlc-commits
mailing list