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

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/playlist.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 
 
-#ifndef _PLAYLIST_H_
-#define _PLAYLIST_H_
+#ifndef PLAYLIST_H
+#define PLAYLIST_H
 
 #include <QList>
 #include <QStringList>
 #include <QWidget>
+#include <QProcess>
 
 class PlaylistItem {
@@ -119 +120 @@
         // <--
 
+        virtual void deleteSelectedFileFromDisk();
+
         virtual bool maybeSave();
     virtual void load();
@@ -128 +131 @@
         virtual void load_pls(QString file);
         virtual bool save_pls(QString file);
+
+        void loadXSPF(const QString & filename);
+        bool saveXSPF(const QString & filename);
 
         virtual void getMediaInfo();
@@ -138 +144 @@
         void setSavePlaylistOnExit(bool b) { save_playlist_in_config = b; };
         void setPlayFilesFromStart(bool b) { play_files_from_start = b; };
+        void setIgnorePlayerErrors(bool b) { ignore_player_errors = b; };
 
 public:
@@ -144 +151 @@
         bool savePlaylistOnExit() { return save_playlist_in_config; };
         bool playFilesFromStart() { return play_files_from_start; };
+        bool ignorePlayerErrors() { return ignore_player_errors; };
 
         QList<PlaylistItem> playlist(){return pl;};
@@ -183 +191 @@
         virtual void maybeSaveSettings();
 
+        void playerFailed(QProcess::ProcessError);
+        void playerFinishedWithError(int);
+
 protected:
         void createTable();
@@ -236 +247 @@
         MyAction * removeAllAct;
 
+        MyAction * deleteSelectedFileFromDiskAct;
+
 private:
         bool modified;
@@ -244 +257 @@
         bool automatically_get_info;
         bool save_playlist_in_config;
-        bool play_files_from_start; 
+        bool play_files_from_start;
         int row_spacing;
 
         bool automatically_play_next;
+        bool ignore_player_errors;
 };