Changeset 118 for smplayer/vendor/current/src/prefgeneral.h

Timestamp:

Dec 22, 2011, 6:27:52 PM (14 years ago)

Author:

Silvan Scherrer

Message:

smplayer vendor udate

File:

• smplayer/vendor/current/src/prefgeneral.h (modified) (6 diffs)

smplayer/vendor/current/src/prefgeneral.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -33 +33 @@
 #endif
 
+#ifdef Q_OS_OS2
+#define MPLAYER_KAI_VERSION 30994
+#endif
+
 class PrefGeneral : public PrefWidget, public Ui::PrefGeneral
 {
@@ -107 +111 @@
         bool startInFullscreen();
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         void setAvoidScreensaver(bool b);
         bool avoidScreensaver();
@@ -118 +122 @@
 #endif
 
-#ifndef Q_OS_WIN
-        void setDisableFiltersWithVdpau(bool b);
-        bool disableFiltersWithVdpau();
-#endif
-
         void setBlackbordersOnFullscreen(bool b);
         bool blackbordersOnFullscreen();
@@ -186 +185 @@
         void vo_combo_changed(int);
         void ao_combo_changed(int);
+
+#ifndef Q_OS_WIN
+        void on_vdpau_button_clicked();
+#endif
 
 protected:
@@ -207 +210 @@
 private:
         bool filesettings_method_changed;
+
+#ifndef Q_OS_WIN
+        struct Preferences::VDPAU_settings vdpau;
+#endif
+
 };