diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-25 16:17:41 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-25 16:17:41 +0200 |
| commit | 45ee5ac6dc2159352596ce8e8ec744e0c864d492 (patch) | |
| tree | 55ca90fd4a0d5c0eae188c5919510b6b0d2e3c5d /src/preferences.h | |
| parent | a35c74c509f107094fd81cee8df109b652063969 (diff) | |
Imported Upstream version 14.9.0.6690~ds0
Diffstat (limited to 'src/preferences.h')
| -rw-r--r-- | src/preferences.h | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/preferences.h b/src/preferences.h index 8d3e32d..17045c3 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net> + Copyright (C) 2006-2015 Ricardo Villalba <rvm@users.sourceforge.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -79,6 +79,7 @@ public: QString ao; // audio output bool use_screenshot; + QString screenshot_template; QString screenshot_directory; // SMPlayer will remember all media settings for all videos. @@ -191,6 +192,7 @@ public: #endif int threads; //!< number of threads to use for decoding (-lavdopts threads <1-8>) + QString hwdec; //!< hardware video decoding (mpv only) int cache_for_files; int cache_for_streams; @@ -200,28 +202,27 @@ public: int cache_for_tv; #ifdef YOUTUBE_SUPPORT + bool enable_yt_support; int yt_quality; QString yt_user_agent; bool yt_use_https_main; bool yt_use_https_vi; #endif + bool enable_streaming_sites; /* ********* Subtitles ********* */ - 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; bool use_forced_subs_only; @@ -230,9 +231,6 @@ public: 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; //! If true, loading an external subtitle will be done @@ -439,7 +437,20 @@ public: int initial_tv_deinterlace; QString last_dvb_channel; QString last_tv_channel; - + + + /* ******** + Network + ******** */ + + // Proxy + bool use_proxy; + int proxy_type; + QString proxy_host; + int proxy_port; + QString proxy_username; + QString proxy_password; + /* *********** Directories |