Changeset 188 for smplayer/trunk/src/prefgeneral.h

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/prefgeneral.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 #include "deviceinfo.h"
 #include "preferences.h"
-
-#ifdef Q_OS_WIN
-#define USE_DSOUND_DEVICES 1
-#else
-#define USE_ALSA_DEVICES 1
-#define USE_XV_ADAPTORS 1
-#endif
 
 #ifdef Q_OS_OS2
@@ -134 +127 @@
 #endif
 
+#ifdef ADD_BLACKBORDERS_FS
         void setBlackbordersOnFullscreen(bool b);
         bool blackbordersOnFullscreen();
+#endif
 
         void setAutoq(int n);
@@ -219 +214 @@
         DeviceList alsa_devices;
 #endif
+#if USE_MPV_ALSA_DEVICES
+        DeviceList mpv_alsa_devices;
+#endif
+#if USE_PULSEAUDIO_DEVICES
+        DeviceList pa_devices;
+#endif
 #if USE_XV_ADAPTORS
         DeviceList xv_adaptors;