diff options
| -rw-r--r-- | config.c | 6 | ||||
| -rw-r--r-- | config.h | 4 | ||||
| -rw-r--r-- | media_player.c | 9 | ||||
| -rw-r--r-- | media_player.h | 3 |
4 files changed, 12 insertions, 10 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.c,v 1.40 2007-06-12 19:28:37 phintuka Exp $ + * $Id: config.c,v 1.41 2007-06-18 11:43:59 phintuka Exp $ * */ @@ -291,6 +291,7 @@ config_t::config_t() { ffmpeg_pp = 0; ffmpeg_pp_quality = 3; strn0cpy(ffmpeg_pp_mode, "de", sizeof(ffmpeg_pp_mode)); + subtitle_vpos = 0; unsharp = 0; unsharp_luma_matrix_width = 5; @@ -365,11 +366,12 @@ config_t::config_t() { use_x_keyboard = 1; + // video settings + overscan = 0; hue = -1; saturation = -1; contrast = -1; brightness = -1; - overscan = 0; strn0cpy(browse_files_dir, VideoDirectory, sizeof(browse_files_dir)); strn0cpy(browse_music_dir, VideoDirectory, sizeof(browse_music_dir)); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.h,v 1.27 2007-06-12 19:28:37 phintuka Exp $ + * $Id: config.h,v 1.28 2007-06-18 11:43:59 phintuka Exp $ * */ @@ -227,6 +227,7 @@ class config_t { char browse_images_dir[4096]; int cache_implicit_playlists; // used in playlist.c int enable_id3_scanner; // used in playlist.c + int subtitle_vpos; // used in media player. Not saved ! // Audio visualization char audio_visualization[64]; @@ -262,6 +263,7 @@ class config_t { int denoise3d_luma; // Actually a double between 0.0 and 10.0, but handled as a int between 0 and 100 int denoise3d_chroma; // Actually a double between 0.0 and 10.0, but handled as a int between 0 and 100 int denoise3d_time; // Actually a double between 0.0 and 10.0, but handled as a int between 0 and 100 + int volnorm; // enable/disable volnorm post plugin (normalize audio volume) // Remote server settings diff --git a/media_player.c b/media_player.c index 67698c41..37fee945 100644 --- a/media_player.c +++ b/media_player.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: media_player.c,v 1.28 2007-05-14 19:45:56 phintuka Exp $ + * $Id: media_player.c,v 1.29 2007-06-18 11:43:59 phintuka Exp $ * */ @@ -448,7 +448,6 @@ void cPlaylistMenu::Set(bool setCurrentPlaying) cXinelibPlayer *cXinelibPlayerControl::m_Player = NULL; cMutex cXinelibPlayerControl::m_Lock; -int cXinelibPlayerControl::m_SubtitlePos = 0; cXinelibPlayerControl::cXinelibPlayerControl(eMainMenuMode Mode, const char *File) : cControl(OpenPlayer(File)) @@ -708,9 +707,9 @@ eOSState cXinelibPlayerControl::ProcessKey(eKeys Key) case kUser8: m_Player->Control("SEEK -20"); break; case k3: case kUser9: m_Player->Control("SEEK +20"); break; - case k2: m_SubtitlePos -= 10; - case k5: m_SubtitlePos += 5; - m_Player->Control("SUBTITLES %d", m_SubtitlePos); + case k2: xc.subtitle_vpos -= 10; + case k5: xc.subtitle_vpos += 5; + m_Player->Control("SUBTITLES %d", xc.subtitle_vpos); break; case kNext: case kRight: if(m_RandomPlay) { diff --git a/media_player.h b/media_player.h index fb9efc37..850ded1d 100644 --- a/media_player.h +++ b/media_player.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: media_player.h,v 1.11 2007-05-14 19:04:13 phintuka Exp $ + * $Id: media_player.h,v 1.12 2007-06-18 11:43:59 phintuka Exp $ * */ @@ -41,7 +41,6 @@ class cXinelibPlayerControl : public cControl int m_CurrentPos; int m_CurrentLen; bool m_BlinkState; - static int m_SubtitlePos; void MsgReplaying(const char *Title, const char *File); |