summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Louden <paulthenerd@gmail.com>2007-11-21 05:49:00 +0000
committerPaul Louden <paulthenerd@gmail.com>2007-11-21 05:49:00 +0000
commitad97b0437ffa2d4307c468290e981b32447cd070 (patch)
tree600b5be6da28af3408eb87ca994ccd8b0a40d2f2
parentcdb0721e1ad4001c774ee19f20bcbee8727b47dc (diff)
downloadrockbox-ad97b0437ffa2d4307c468290e981b32447cd070.zip
rockbox-ad97b0437ffa2d4307c468290e981b32447cd070.tar.gz
rockbox-ad97b0437ffa2d4307c468290e981b32447cd070.tar.bz2
rockbox-ad97b0437ffa2d4307c468290e981b32447cd070.tar.xz
Allow use of either A or Select to pause in mpegplayer. This means you
can pause it the same way you pause music, but I've not removed the old button since mpegplayer currently has plenty of buttons, and not many functions. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15734 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index aed96d6..2ef1ea7 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -136,6 +136,7 @@ PLUGIN_IRAM_DECLARE
#define MPEG_MENU BUTTON_MENU
#define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_SELECT
+#define MPEG_PAUSE2 BUTTON_A
#define MPEG_VOLDOWN BUTTON_LEFT
#define MPEG_VOLUP BUTTON_RIGHT
#define MPEG_VOLDOWN2 BUTTON_VOL_DOWN
@@ -1144,6 +1145,7 @@ static int button_loop(void)
break;
case MPEG_PAUSE:
+ case MPEG_PAUSE2:
settings.resume_time = (int)(get_stream_time()/CLOCK_RATE/
30-start_pts_time);
save_settings();
@@ -1162,7 +1164,7 @@ static int button_loop(void)
audio_str.status = STREAM_STOPPED;
goto quit;
}
- } while (button != MPEG_PAUSE);
+ } while (button != MPEG_PAUSE && button != MPEG_PAUSE2);
str_send_msg(&video_str, STREAM_PLAY, 0);
audio_str.status = STREAM_PLAYING;