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

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

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

smplayer/vendor/current/src/preferences.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
@@ -18 +18 @@
 
 
-#ifndef _PREFERENCES_H_
-#define _PREFERENCES_H_
+#ifndef PREFERENCES_H
+#define PREFERENCES_H
 
 /* Global settings */
@@ -31 +31 @@
 
 #ifdef UPDATE_CHECKER
-#include "updatechecker.h"
+#include "updatecheckerdata.h"
 #endif
 
@@ -48 +48 @@
         enum WheelFunction { DoNothing = 1, Seeking = 2, Volume = 4, Zoom = 8,
                          ChangeSpeed = 16 };
+        enum DragFunction { DragDisabled = 0, MoveWindow = 1, Gestures = 2 };
         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 };
+        enum Streaming { NoStreaming = 0, StreamingAuto = 1, StreamingYT = 2, StreamingYTDL = 3 };
 
         Q_DECLARE_FLAGS(WheelFunctions, WheelFunction);
@@ -80 +82 @@
 
         bool use_screenshot;
+#ifdef MPV_SUPPORT
+        QString screenshot_template;
+        QString screenshot_format;
+#endif
         QString screenshot_directory;
+#ifdef CAPTURE_STREAM
+        QString capture_directory;
+#endif
 
         // SMPlayer will remember all media settings for all videos.
@@ -149 +158 @@
         // Misc
         int osd;
+        double osd_scale; // mpv
+        double subfont_osd_scale; // mplayer
         int osd_delay; //<! Delay in ms to show the OSD.
 
@@ -186 +197 @@
         int HD_height; //!< An HD is a video which height is equal or greater than this.
 
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
         OptionState fast_audio_change; // If activated, not restart mplayer
+#endif
+
 #if !SMART_DVD_CHAPTERS
         bool fast_chapter_change;
@@ -192 +206 @@
 
         int threads; //!< number of threads to use for decoding (-lavdopts threads <1-8>)
+        QString hwdec; //!< hardware video decoding (mpv only)
 
         int cache_for_files;
@@ -200 +215 @@
         int cache_for_tv;
 
-#ifdef YOUTUBE_SUPPORT
-        int yt_quality;
-        QString yt_user_agent;
-        bool yt_use_https_main;
-        bool yt_use_https_vi;
-#endif
-
 
         /* *********
@@ -212 +220 @@
            ********* */
 
-        QString font_file;
-        QString font_name;
-        bool use_fontconfig;
         QString subcp; // -subcp
         bool use_enca;
         QString enca_lang;
-        int font_autoscale; // -subfont-autoscale
         int subfuzziness;
         bool autoload_sub;
 
         bool use_ass_subtitles;
+        bool enable_ass_styles;
         int ass_line_spacing;
 
@@ -231 +236 @@
         bool subtitles_on_screenshots;
 
-        //! Use the new sub_vob, sub_demux and sub_file commands
-        //! instead of sub_select
-        OptionState use_new_sub_commands; 
         OptionState change_sub_scale_should_restart;
 
@@ -248 +250 @@
         //! If false, options requiring freetype won't be used
         bool freetype_support;
-#ifdef Q_OS_WIN
+#ifdef FONTS_HACK
         bool use_windowsfontdir;
 #endif
@@ -299 +301 @@
         bool use_edl_files;
 
+#ifdef MPLAYER_SUPPORT
+        //! If true it will pass to mplayer the -playlist option
+        bool use_playlist_option;
+#endif
+
         //! Preferred connection method: ipv4 or ipv6
         bool prefer_ipv4;
@@ -323 +330 @@
 
         int time_to_kill_mplayer;
+
+#ifdef MPRIS2
+        bool use_mpris2;
+#endif
 
 
@@ -341 +352 @@
 #endif
 
-        bool move_when_dragging; //!< Move the main window when the video area is dragged
+        bool center_window; //!< Center the main window when playback starts
+        bool center_window_if_outside; //!< Center the main window after an autoresize if it's outside of the screen
 
         // Function of mouse buttons:
@@ -355 +367 @@
         bool wheel_function_seeking_reverse;
 
+        int drag_function;
+
         // Configurable seeking
         int seeking1; // By default 10s
@@ -370 +384 @@
         bool relative_seeking;  
 #endif
-        bool precise_seeking; //! Enable precise_seeking (only available with mplayer2)
+        bool precise_seeking; //! Enable precise_seeking (only available with mpv)
 
         bool reset_stop; //! Pressing the stop button resets the position
@@ -440 +454 @@
         QString last_dvb_channel;
         QString last_tv_channel;
-        
+
+
+    /* ********
+       Network
+       ******** */
+
+        // Streaming
+        int streaming_type;
+        #ifdef YOUTUBE_SUPPORT
+        int yt_quality;
+        QString yt_user_agent;
+        bool yt_use_https_main;
+        bool yt_use_https_vi;
+        #endif
+
+        // Proxy
+        bool use_proxy;
+        int proxy_type;
+        QString proxy_host;
+        int proxy_port;
+        QString proxy_username;
+        QString proxy_password;
+
 
     /* ***********
@@ -494 +530 @@
         int mplayer_user_supplied_version;
 
+#ifdef MPLAYER2_SUPPORT
         bool mplayer_is_mplayer2; //! True if the detected version is mplayer2
         QString mplayer2_detected_version;
+#endif