adjustment for the Ondio: button driver has an Odio part, for now it has a Player layout. Some fixes in the app code were necessary to remove dependencies of LCD, keypad, this wasn't independent everywhere.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5055 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 17 insertions, 11 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 987007c..12ba0c5 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1233,7 +1233,7 @@ static bool view_runtime(void)
         /* Wait for a key to be pushed */
         key = button_get_w_tmo(HZ);
         switch(key) {
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
             case BUTTON_STOP | BUTTON_REL:
 #elif HAVE_RECORDER_KEYPAD
             case BUTTON_OFF | BUTTON_REL:
@@ -1412,7 +1412,7 @@ static bool dbg_disk_info(void)
         /* Wait for a key to be pushed */
         key = button_get_w_tmo(HZ*5);
         switch(key) {
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
             case BUTTON_STOP | BUTTON_REL:
 #else
             case BUTTON_OFF | BUTTON_REL:
diff --git a/apps/main_menu.c b/apps/main_menu.c
index b3c70a2..1d2978e 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -231,7 +231,7 @@ bool show_info(void)
         /* Wait for a key to be pushed */
         key = button_get_w_tmo(HZ*5);
         switch(key) {
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
             case BUTTON_STOP | BUTTON_REL:
 #else
             case BUTTON_LEFT | BUTTON_REL:
@@ -240,7 +240,7 @@ bool show_info(void)
                 done = true;
                 break;
 
-#ifdef HAVE_PLAYER_KEYPAD
+#if defined(HAVE_RECORDER_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
             case BUTTON_LEFT:
             case BUTTON_RIGHT:
                 if (state == 1)
diff --git a/apps/playlist.c b/apps/playlist.c
index e29e2f1..8d4f62d 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -557,7 +557,7 @@ static int add_directory_to_playlist(struct playlist_info* playlist,
     for (i=0; i<num_files; i++)
     {
         /* user abort */
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
         if (button_get(false) == BUTTON_STOP)
 #else
         if (button_get(false) == BUTTON_OFF)
@@ -2009,7 +2009,7 @@ int playlist_insert_playlist(struct playlist_info* playlist, char *filename,
     while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0)
     {
         /* user abort */
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
         if (button_get(false) == BUTTON_STOP)
 #else
         if (button_get(false) == BUTTON_OFF)
@@ -2377,7 +2377,7 @@ int playlist_save(struct playlist_info* playlist, char *filename)
         int seek;
 
         /* user abort */
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
         if (button_get(false) == BUTTON_STOP)
 #else
         if (button_get(false) == BUTTON_OFF)
diff --git a/apps/screens.c b/apps/screens.c
index 1026973..1cf74ac 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -1085,10 +1085,12 @@ bool set_time_screen(const char* string, struct tm *tm)
             case BUTTON_ON:
                 done = true;
                 break;
+#if (BUTTON_ON != BUTTON_OFF)
             case BUTTON_OFF:
                 done = true;
                 tm->tm_year = -1;
                 break;
+#endif
 
             default:
                 if (default_event_handler(button) == SYS_USB_CONNECTED)
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 90d14a6..4d2e2f9 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1266,7 +1266,7 @@ static bool disk_settings_menu(void)
     return result;
 }
 
-#ifdef HAVE_LCD_BITMAP
+#ifdef HAVE_RTC
 static bool time_settings_menu(void)
 {
     int m;
diff --git a/apps/sleeptimer.c b/apps/sleeptimer.c
index a236ed9..4fc7515 100644
--- a/apps/sleeptimer.c
+++ b/apps/sleeptimer.c
@@ -94,7 +94,7 @@ bool sleeptimer_screen(void)
           done = true;
           break;
 
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
         case BUTTON_RIGHT:
 #else
         case BUTTON_UP:
@@ -113,7 +113,7 @@ bool sleeptimer_screen(void)
             set_sleep_timer(newtime);
             break;
                 
-#ifdef HAVE_PLAYER_KEYPAD
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
         case BUTTON_LEFT:
 #else
         case BUTTON_DOWN:
diff --git a/apps/wps.c b/apps/wps.c
index 65b01b1..92b4e00 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -61,7 +61,7 @@ static struct mp3entry* id3 = NULL;
 static struct mp3entry* nid3 = NULL;
 static char current_track_path[MAX_PATH+1];
 
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
+#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
 void player_change_volume(int button)
 {
     bool exit = false;
@@ -577,9 +577,11 @@ static bool menu(void)
                 /* show id3 tags */
 #ifdef BUTTON_ON
             case BUTTON_MENU | BUTTON_ON:
+#ifdef HAVE_LCD_CHARCELLS
                 status_set_param(true);
                 status_set_audio(true);
 #endif
+#endif
 #else
             case BUTTON_F1 | BUTTON_ON:
 #endif
@@ -811,9 +813,11 @@ int wps_show(void)
                     case 0:
                         /* otherwise, exit to browser */
 #else
+#ifdef HAVE_LCD_CHARCELLS
                         status_set_record(false);
                         status_set_audio(false);
 #endif
+#endif
                         lcd_stop_scroll();
 
                         /* set dir browser to current playing song */