Changeset 128 for smplayer/trunk/src/smplayer.h

Timestamp:

Mar 29, 2012, 4:53:15 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: trunk update to latest svn

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/smplayer.h (modified) (4 diffs)

smplayer/trunk/src/smplayer.h

@@ -27 +27 @@
 class SMPlayer : public QObject
 {
+        Q_OBJECT
+
 public:
         enum ExitCode { ErrorArgument = -3, NoAction = -2, NoRunningInstance = -1, NoError = 0, NoExit = 1 };
@@ -40 +42 @@
         void start();
 
+#ifdef GUI_CHANGE_ON_RUNTIME
+private slots:
+        void changeGUI(QString new_gui);
+#endif
+
 private:
+        BaseGui * createGUI(QString gui_name);
+        void deleteGUI();
 #ifndef PORTABLE_APP
         void createConfigDirectory();
@@ -46 +55 @@
         void showInfo();
 
-        BaseGui * main_window;
+        static BaseGui * main_window;
 
-    QStringList files_to_play;
-    QString subtitle_file;
-    QString actions_list; //!< Actions to be run on startup
+        QStringList files_to_play;
+        QString subtitle_file;
+        QString actions_list; //!< Actions to be run on startup
         QString gui_to_use;
 
@@ -63 +72 @@
         int close_at_end; // -1 = not set, 1 = true, 0 false
         int start_in_fullscreen; // -1 = not set, 1 = true, 0 false
-        bool use_control_server;
+
+#ifdef LOG_SMPLAYER
+        // Output log
+        static QFile output_log;
+        static void myMessageOutput( QtMsgType type, const char *msg );
+        static bool allow_to_send_log_to_gui;
+#endif
 };