Changeset 176 for smplayer/trunk/src/prefgeneral.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/prefgeneral.h (modified) (5 diffs)

smplayer/trunk/src/prefgeneral.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
@@ -17 +17 @@
 */
 
-#ifndef _PREFGENERAL_H_
-#define _PREFGENERAL_H_
+#ifndef PREFGENERAL_H
+#define PREFGENERAL_H
 
 #include "ui_prefgeneral.h"
@@ -37 +37 @@
 #endif
 
+#if defined(MPV_SUPPORT) && defined(MPLAYER_SUPPORT)
+#define MPLAYER_MPV_SELECTION
+#endif
+
 class PrefGeneral : public PrefWidget, public Ui::PrefGeneral
 {
@@ -70 +74 @@
         void setScreenshotDir( QString path );
         QString screenshotDir();
+
+#ifdef MPV_SUPPORT
+        void setScreenshotFormat(const QString format);
+        QString screenshotFormat();
+#endif
 
         void setVO( QString vo_driver );
@@ -186 +195 @@
 
 protected slots:
+#ifdef MPLAYER_MPV_SELECTION
+        void player_combo_changed(int);
+#endif
         void vo_combo_changed(int);
         void ao_combo_changed(int);