summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-05-31 15:08:07 +0000
committerThomas Martitz <kugel@rockbox.org>2009-05-31 15:08:07 +0000
commit2ccbff32e17e841727420ece24b39aee7d31ca86 (patch)
tree188d6d8345af7f33f19294fe88d77cc12b0d6adb /apps
parent46881eef20772267b6f1f354e470b070ab43cdeb (diff)
downloadrockbox-2ccbff32e17e841727420ece24b39aee7d31ca86.tar.gz
rockbox-2ccbff32e17e841727420ece24b39aee7d31ca86.tar.bz2
rockbox-2ccbff32e17e841727420ece24b39aee7d31ca86.zip
Attach the playback control menu to pictureflow's main menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21145 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/pictureflow/pictureflow.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 2ceef7c9cb..96f79792ca 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -32,6 +32,7 @@
#include "lib/grey.h"
#include "lib/feature_wrappers.h"
#include "lib/buflib.h"
+#include "lib/playback_control.h"
PLUGIN_HEADER
@@ -2129,18 +2130,21 @@ int main_menu(void)
#endif
MENUITEM_STRINGLIST(main_menu,"PictureFlow Main Menu",NULL,
- "Settings", "Return", "Quit");
+ "Playback Control", "Settings", "Return", "Quit");
while (1) {
switch (rb->do_menu(&main_menu,&selection, NULL, false)) {
- case 0:
+ case 0: /* Playback Control */
+ playback_control(NULL);
+ break;
+ case 1:
result = settings_menu();
if ( result != 0 ) return result;
break;
- case 1:
+ case 2:
return 0;
- case 2:
+ case 3:
return -1;
case MENU_ATTACHED_USB: