diff options
author | Maia Kozheva <sikon@ubuntu.com> | 2012-04-09 13:30:23 +0700 |
---|---|---|
committer | Maia Kozheva <sikon@ubuntu.com> | 2012-04-09 13:30:23 +0700 |
commit | 69d32924ffbfe2bb05d881a23af13b6070b9a9bd (patch) | |
tree | 15d9f808ef672e21bcf2da9b6c9fc8e48e157eff /src/preferences.h | |
parent | 65a64d260e05c7bf8d3bdf82e796637dc820e574 (diff) |
Imported Upstream version 0.8.0
Diffstat (limited to 'src/preferences.h')
-rw-r--r-- | src/preferences.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/preferences.h b/src/preferences.h index 4c72946..8d7b977 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -59,6 +59,7 @@ public: #endif double monitor_aspect_double(); + void setupScreenshotFolder(); @@ -176,7 +177,7 @@ public: int cache_for_audiocds; int cache_for_tv; -#if YOUTUBE_SUPPORT +#ifdef YOUTUBE_SUPPORT int yt_quality; #endif @@ -247,16 +248,17 @@ public: QString mplayer_additional_audio_filters; // Logs +#ifdef LOG_MPLAYER bool log_mplayer; + bool verbose_log; + bool autosave_mplayer_log; + QString mplayer_log_saveto; +#endif +#ifdef LOG_SMPLAYER bool log_smplayer; QString log_filter; - bool verbose_log; bool save_smplayer_log; - - //mplayer log autosaving - bool autosave_mplayer_log; - QString mplayer_log_saveto; - //mplayer log autosaving end +#endif #if REPAINT_BACKGROUND_OPTION //! If true, mplayerlayer erases its background @@ -452,11 +454,9 @@ public: /* ********* Instances ********* */ - +#ifdef SINGLE_INSTANCE bool use_single_instance; - int connection_port; // Manual port - bool use_autoport; - int autoport; // Port automatically chosen by Qt +#endif /* **************** |