Changeset 163 for smplayer/vendor/current/src/preferences.h

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

• smplayer/vendor/current/src/preferences.h (modified) (12 diffs)

smplayer/vendor/current/src/preferences.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -50 +50 @@
         enum OptionState { Detect = -1, Disabled = 0, Enabled = 1 };
         enum H264LoopFilter { LoopDisabled = 0, LoopEnabled = 1, LoopDisabledOnHD = 2 };
+        enum AutoAddToPlaylistFilter { NoFiles = 0, VideoFiles = 1, AudioFiles = 2, MultimediaFiles = 3, ConsecutiveFiles = 4 };
 
         Q_DECLARE_FLAGS(WheelFunctions, WheelFunction);
@@ -98 +99 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+        #ifdef SCREENSAVER_OFF
         bool turn_screensaver_off;
+        #endif
+        #ifdef AVOID_SCREENSAVER
         bool avoid_screensaver;
+        #endif
 #else
         bool disable_screensaver;
@@ -127 +132 @@
         bool mute;
 
+        // Global equalizer
+        bool global_audio_equalizer;
+        AudioEqualizerList audio_equalizer;
+
         bool autosync;
         int autosync_factor;
@@ -134 +143 @@
         double mc_value;
 
+        // When playing a mp4 file, it will use a m4a file for audio if a there's a file with same name but extension m4a
+        bool autoload_m4a;
+        int min_step; //<! Step to increase of decrease the controls for color, contrast, brightness and so on
+
         // Misc
         int osd;
@@ -147 +160 @@
         QString dvd_device;
         QString cdrom_device;
+#ifdef BLURAY_SUPPORT
+        QString bluray_device;
+#endif
 
 #ifdef Q_OS_WIN
@@ -230 +246 @@
         //! If false, options requiring freetype won't be used
         bool freetype_support;
+#ifdef Q_OS_WIN
+        bool use_windowsfontdir;
+#endif
 
 
@@ -249 +268 @@
 
         bool use_idx; //!< Use -idx
+        bool use_lavf_demuxer;
 
         // Let the user pass options to mplayer
@@ -330 +350 @@
         int wheel_function;
 
-        QFlags<WheelFunctions> wheel_function_cycle;
-
+        WheelFunctions wheel_function_cycle;
         bool wheel_function_seeking_reverse;
 
@@ -353 +372 @@
         bool reset_stop; //! Pressing the stop button resets the position
 
+        //! If true, the left click in the video is delayed some ms
+        //! to check if the user double clicked
+        bool delay_left_click;
+
         QString language;
         QString iconset;
@@ -396 +419 @@
 
         bool auto_add_to_playlist; //!< Add files to open to playlist
-        bool add_to_playlist_consecutive_files;
+        AutoAddToPlaylistFilter media_to_add_to_playlist;
 
 #if LOGO_ANIMATION
@@ -485 +508 @@
         bool floating_control_animated;
         bool floating_display_in_compact_mode;
-#ifndef Q_OS_WIN
-        bool bypass_window_manager;
-#endif
+        int floating_activation_area;
+        int floating_hide_delay;