Changeset 188 for smplayer/trunk/src/playlist.h

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/playlist.h (modified) (19 diffs)

smplayer/trunk/src/playlist.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -30 +30 @@
 #define PLAYLIST_DOWNLOAD
 //#define PLAYLIST_DOUBLE_TOOLBAR
+//#define PLAYLIST_DELETE_FROM_DISK
 
 class PLItem : public QStandardItem {
 public:
-         enum PLItem_Roles { Role_Played = Qt::UserRole + 2, Role_Current = Qt::UserRole + 3 };
+         enum PLItem_Roles { Role_Played = Qt::UserRole + 2, Role_Current = Qt::UserRole + 3, Role_Params = Qt::UserRole + 4,
+                         Role_Video_URL = Qt::UserRole + 5  };
 
         PLItem();
@@ -42 +44 @@
         void setName(const QString name);
         void setDuration(double duration);
+        void setExtraParams(const QStringList & pars);
+        void setVideoURL(const QString & url);
         void setPlayed(bool played);
         void setPosition(int position);
@@ -49 +53 @@
         QString name();
         double duration();
+        QStringList extraParams();
+        QString videoURL();
         bool played();
         int position();
@@ -107 +113 @@
 
 public slots:
-        void addItem(QString filename, QString name, double duration);
+        void addItem(QString filename, QString name, double duration, QStringList params = QStringList(), QString video_url = QString::null);
 
         // Start playing, from item 0 if shuffle is off, or from
@@ -117 +123 @@
         void playNext();
         void playPrev();
+
+        void playNextAuto(); // Called from GUI when a file finished
 
         void resumePlay();
@@ -137 +145 @@
         void addDirectory(QString dir);
 
+#ifdef PLAYLIST_DELETE_FROM_DISK
         void deleteSelectedFileFromDisk();
+#endif
 
         bool maybeSave();
         void load();
-        bool save();
+
+        bool saveCurrentPlaylist();
+        bool save(const QString & filename = QString::null);
 
 #ifdef PLAYLIST_DOWNLOAD
@@ -173 +185 @@
         void setPlayFilesFromStart(bool b) { play_files_from_start = b; };
         void setIgnorePlayerErrors(bool b) { ignore_player_errors = b; };
+        void setStartPlayOnLoad(bool b) { start_play_on_load = b; };
         void setAutomaticallyPlayNext(bool b) { automatically_play_next = b; };
+        void setAutoSort(bool b);
+        void setSortCaseSensitive(bool b);
+        void setFilterCaseSensitive(bool b);
 
         bool directoryRecursion() { return recursive_add_directory; };
@@ -180 +196 @@
         bool playFilesFromStart() { return play_files_from_start; };
         bool ignorePlayerErrors() { return ignore_player_errors; };
+        bool startPlayOnLoad() { return start_play_on_load; };
         bool automaticallyPlayNext() { return automatically_play_next; };
+        bool autoSort();
+        bool sortCaseSensitive();
+        bool filterCaseSensitive();
 
 #ifdef PLAYLIST_DOWNLOAD
@@ -195 +215 @@
 signals:
         void requestToPlayFile(const QString & filename, int seek = -1);
+        void requestToPlayStream(const QString & filename, QStringList params = QStringList());
+
         void requestToAddCurrentFile();
         void playlistEnded();
         void visibilityChanged(bool visible);
         void modifiedChanged(bool);
+        void windowTitleChanged(const QString & title);
 
 protected:
@@ -206 +229 @@
         int chooseRandomItem();
         QString lastDir();
+
+        void setPlaylistFilename(const QString &);
+        QString playlistFilename() { return playlist_filename; };
+
+        void updateWindowTitle();
 
 protected slots:
@@ -216 +244 @@
         void editItem(int row);
 
+        void copyURL();
+        void openFolder();
+
+#ifdef CHROMECAST_SUPPORT
+        void playOnChromecast();
+#else
+        void openURLInWeb();
+#endif
+
         void saveSettings();
         void loadSettings();
@@ -228 +265 @@
         void showLoadingAnimation(bool b);
 #endif
+
+        void setPositionColumnVisible(bool b);
+        void setNameColumnVisible(bool b);
+        void setDurationColumnVisible(bool b);
+        void setFilenameColumnVisible(bool b);
 
 protected:
@@ -245 +287 @@
 protected:
         QString playlist_path;
+        QString playlist_filename;
         QString latest_dir;
 
+        QMenu * file_menu;
         QMenu * add_menu;
         QMenu * remove_menu;
@@ -259 +303 @@
         QToolBar * toolbar2;
 #endif
+
+        QToolButton * file_button;
         QToolButton * add_button;
         QToolButton * remove_button;
@@ -269 +315 @@
 #endif
         MyAction * saveAct;
+        MyAction * saveAsAct;
         MyAction * playAct;
         MyAction * prevAct;
@@ -274 +321 @@
         MyAction * repeatAct;
         MyAction * shuffleAct;
+        MyAction * showSearchAct;
 
         MyAction * moveUpAct;
@@ -287 +335 @@
         MyAction * removeAllAct;
 
+#ifdef PLAYLIST_DELETE_FROM_DISK
         MyAction * deleteSelectedFileFromDiskAct;
+#endif
+
+        MyAction * copyURLAct;
+        MyAction * openFolderAct;
+
+#ifdef CHROMECAST_SUPPORT
+        MyAction * playOnChromecastAct;
+#else
+        MyAction * openURLInWebAct;
+#endif
+
+        MyAction * showPositionColumnAct;
+        MyAction * showNameColumnAct;
+        MyAction * showDurationColumnAct;
+        MyAction * showFilenameColumnAct;
 
         QSettings * set;
@@ -309 +373 @@
         int row_spacing;
 
+        bool start_play_on_load;
         bool automatically_play_next;
         bool ignore_player_errors;