Changeset 127 for smplayer/vendor/current/src/basegui.h

Timestamp:

Mar 29, 2012, 3:09:42 PM (14 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update to latest svn

File:

• smplayer/vendor/current/src/basegui.h (modified) (21 diffs)

smplayer/vendor/current/src/basegui.h

@@ -43 +43 @@
 class VideoEqualizer;
 class AudioEqualizer;
+
+
 class FindSubtitlesWindow;
+
+
+
 class VideoPreview;
-class Playlist;
+#endif
+
 
 class MyAction;
@@ -51 +57 @@
 
 class PreferencesDialog;
-class MyServer;
 
 class Favorites;
@@ -61 +66 @@
     
 public:
-    BaseGui( bool use_server, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+    BaseGui( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
         ~BaseGui();
 
@@ -75 +80 @@
         void runActionsLater(QString actions) { pending_actions_to_run = actions; };
 
+
         //! Saves the line from the smplayer output
         void recordSmplayerLog(QString line);
+
 
 public slots:
@@ -106 +113 @@
         void setInitialSubtitle(const QString & subtitle_file);
 
+
         virtual void showFindSubtitlesDialog();
         virtual void openUploadSubtitlesPage(); //turbos
-
+#endif
+
+#ifdef VIDEOPREVIEW
         virtual void showVideoPreviewDialog();
+
+
         virtual void showTubeBrowser();
 
@@ -118 +130 @@
         virtual void showAudioEqualizer();
         virtual void showAudioEqualizer(bool b);
+
         virtual void showMplayerLog();
+
+
         virtual void showLog();
+
         virtual void showPreferencesDialog();
         virtual void showFilePropertiesDialog();
@@ -227 +243 @@
 
         // Single instance stuff
-        // Another instance request open a file
-        virtual void remoteOpen(QString);
-        virtual void remoteOpenFiles(QStringList);
-        virtual void remoteAddFiles(QStringList);
-        virtual void remoteLoadSubtitle(QString);
-        virtual void remotePlayItem(int);
-        virtual void remoteRemoveItem(int);
-        virtual void remoteMoveItem(int, int);
-        virtual void remoteViewPlaylist(QString*);
-        virtual void remoteViewStatus(QString*);
-        virtual void remoteViewClipInfo(QString*);
-        virtual void remoteSeek(double);
-        virtual void remoteGetChecked(QString, QString*);
-        virtual void remoteGetVolume(int*);
+#ifdef SINGLE_INSTANCE
+        void handleMessageFromOtherInstances(const QString& message);
+#endif
 
         //! Called when core can't parse the mplayer version and there's no
@@ -260 +265 @@
 #endif
 
+
         //! Clears the mplayer log
         void clearMplayerLog();
@@ -268 +274 @@
         //! Saves the mplayer log to a file every time a file is loaded
         void autosaveMplayerLog();
+
 
 signals:
@@ -289 +296 @@
         //! Sent when the user wants to close the main window
         void quitSolicited();
+
+
+
+
 
 protected:
@@ -379 +390 @@
         MyAction * screenshotAct;
         MyAction * screenshotsAct;
+
         MyAction * videoPreviewAct;
+
         MyAction * flipAct;
         MyAction * mirrorAct;
@@ -386 +399 @@
         MyAction * deblockAct;
         MyAction * deringAct;
+
         MyAction * addNoiseAct;
         MyAction * addLetterboxAct;
@@ -419 +433 @@
         MyAction * useForcedSubsOnlyAct;
         MyAction * subVisibilityAct;
+
         MyAction * showFindSubtitlesDialogAct;
         MyAction * openUploadSubtitlesPageAct;//turbos  
+
 
         // Menu Options
@@ -427 +443 @@
         MyAction * showPreferencesAct;
         MyAction * showTubeBrowserAct;
+
         MyAction * showLogMplayerAct;
+
+
         MyAction * showLogSmplayerAct;
+
 
         // Menu Help
@@ -504 +524 @@
         MyAction * denoiseSoftAct;
 
+
+
+
+
+
+
         // Window Size Action Group
         MyActionGroup * sizeGroup;
@@ -627 +653 @@
         QMenu * osd_menu;
         QMenu * deinterlace_menu;
-        //QMenu * denoise_menu;
+        QMenu * denoise_menu;
+        QMenu * unsharp_menu;
         QMenu * videosize_menu;
         QMenu * audiochannels_menu;
@@ -636 +663 @@
         QMenu * videofilter_menu;
         QMenu * audiofilter_menu;
+
         QMenu * logs_menu;
+
         QMenu * zoom_menu;
         QMenu * rotate_menu;
@@ -648 +677 @@
         QMenu * recentfiles_menu;
 
+
         LogWindow * mplayer_log_window;
+
+
         LogWindow * smplayer_log_window;
+
         LogWindow * clhelp_window;
 
@@ -657 +690 @@
         VideoEqualizer * video_equalizer;
         AudioEqualizer * audio_equalizer;
+
         FindSubtitlesWindow * find_subs_dialog;
+
+
         VideoPreview * video_preview;
+
 
         Core * core;
         MplayerWindow *mplayerwindow;
-
-        MyServer * server;
 
         Favorites * favorites;
@@ -677 +712 @@
         int arg_close_on_finish; // -1 = not set, 1 = true, 0 = false
         int arg_start_in_fullscreen; // -1 = not set, 1 = true, 0 = false
-        bool use_control_server;
 
 private:
@@ -696 +730 @@
 #endif
 
+
         QString mplayer_log;
+
+
         QString smplayer_log;
+
 
         bool ignore_show_hide_events;