diff options
| -rw-r--r-- | config.c | 10 | ||||
| -rw-r--r-- | config.h | 5 | ||||
| -rw-r--r-- | media_player.c | 4 | ||||
| -rw-r--r-- | setup_menu.c | 8 |
4 files changed, 17 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.66 2008-06-11 23:08:44 phintuka Exp $ + * $Id: config.c,v 1.67 2008-07-20 10:44:02 phintuka Exp $ * */ @@ -556,6 +556,7 @@ config_t::config_t() { strn0cpy(browse_images_dir, VideoDirectory, sizeof(browse_images_dir)); cache_implicit_playlists = 1; enable_id3_scanner = 1; + dvd_arrow_keys_control_playback = 1; main_menu_mode = ShowMenu; force_primary_device = 0; @@ -800,10 +801,11 @@ bool config_t::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name, "Playlist.Tracknumber")) playlist_tracknumber = atoi(Value); else if (!strcasecmp(Name, "Playlist.Artist")) playlist_artist = atoi(Value); else if (!strcasecmp(Name, "Playlist.Album")) playlist_album = atoi(Value); + else if (!strcasecmp(Name, "Media.DVD.ArrowKeysControlPlayback")) dvd_arrow_keys_control_playback = atoi(Value); - else if (!strcasecmp(Name, "Advanced.LiveModeSync")) xc.live_mode_sync = atoi(Value); - else if (!strcasecmp(Name, "Advanced.AdjustSCR")) xc.scr_tunning = atoi(Value); - else if (!strcasecmp(Name, "Advanced.SCRSpeed")) xc.scr_hz = atoi(Value); + else if (!strcasecmp(Name, "Advanced.LiveModeSync")) live_mode_sync = atoi(Value); + else if (!strcasecmp(Name, "Advanced.AdjustSCR")) scr_tunning = atoi(Value); + else if (!strcasecmp(Name, "Advanced.SCRSpeed")) scr_hz = atoi(Value); else if (!strcasecmp(Name, "Audio.Equalizer")) sscanf(Value,"%d %d %d %d %d %d %d %d %d %d", @@ -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.48 2008-06-11 23:08:44 phintuka Exp $ + * $Id: config.h,v 1.49 2008-07-20 10:44:02 phintuka Exp $ * */ @@ -272,7 +272,8 @@ class config_t { int subtitle_vpos; // used in media player. Not saved ! int playlist_tracknumber; int playlist_artist; - int playlist_album; + int playlist_album; + int dvd_arrow_keys_control_playback; // Audio visualization char audio_visualization[64]; diff --git a/media_player.c b/media_player.c index 7e48278a..15ad51af 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.58 2008-07-15 08:07:25 phintuka Exp $ + * $Id: media_player.c,v 1.59 2008-07-20 10:44:02 phintuka Exp $ * */ @@ -925,7 +925,7 @@ eOSState cXinelibDvdPlayerControl::ProcessKey(eKeys Key) if (m_DisplayReplay) Show(); - bool MenuDomain = false; + bool MenuDomain = !xc.dvd_arrow_keys_control_playback; if(Key != kNone || m_DisplayReplay) { const char *dt = cXinelibDevice::Instance().GetMetaInfo(miDvdTitleNo); if(dt && !strcmp("0", dt)) diff --git a/setup_menu.c b/setup_menu.c index 47573eb0..48081a34 100644 --- a/setup_menu.c +++ b/setup_menu.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: setup_menu.c,v 1.59 2008-06-11 23:08:44 phintuka Exp $ + * $Id: setup_menu.c,v 1.60 2008-07-20 10:44:02 phintuka Exp $ * */ @@ -1646,7 +1646,9 @@ void cMenuSetupMediaPlayer::Set(void) new cMenuEditBoolItem(tr("Cache metainfo"), &newconfig.cache_implicit_playlists)); - + Add(new cMenuEditBoolItem(tr("Arrow keys control DVD playback"), + &newconfig.dvd_arrow_keys_control_playback)); + if(current<1) current=1; /* first item is not selectable */ SetCurrent(Get(current)); Display(); @@ -1667,6 +1669,8 @@ void cMenuSetupMediaPlayer::Store(void) SetupStore("Playlist.Artist", xc.playlist_artist); SetupStore("Media.CacheImplicitPlaylists", xc.cache_implicit_playlists); SetupStore("Media.EnableID3Scanner", xc.enable_id3_scanner); + SetupStore("Media.DVD.ArrowKeysControlPlayback", xc.dvd_arrow_keys_control_playback); + Setup.Save(); } |