--- bookmark.c~	Thu Feb 20 22:15:44 2003
+++ bookmark.c	Thu Feb 20 22:27:46 2003
@@ -189,24 +189,30 @@
         return true;
     }    
 
+#ifdef HAVE_LCD_BITMAP
     /* Prompting user to confirm bookmark creation */
     lcd_clear_display();
     lcd_puts(0,0, str(LANG_AUTO_BOOKMARK_QUERY));
     lcd_puts(0,1, str(LANG_RESUME_CONFIRM_RECORDER));
     lcd_puts(0,2, str(LANG_RESUME_CANCEL_RECORDER));
     lcd_update();
+#else
+    /* Need to enter Player-specific UI code here */
+#endif
 
     while(!done)
     {
         /* Wait for a key to be pushed */
-        key = button_get_w_tmo(HZ/2);;
+        key = button_get(true);;
         switch(key)
         {
-            case BUTTON_UP | BUTTON_REL:
             case BUTTON_DOWN | BUTTON_REL:
-            case BUTTON_RIGHT | BUTTON_REL:
             case BUTTON_ON | BUTTON_REL:
+#ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_OFF | BUTTON_REL:
+            case BUTTON_RIGHT | BUTTON_REL:
+            case BUTTON_UP | BUTTON_REL:
+#endif               
             case BUTTON_LEFT | BUTTON_REL:
                 done = true;
                 break;
@@ -223,10 +229,8 @@
                 status_set_param(true);
 #endif
                 return false;
-                break;                
         }
     }
-
     return true;
 }
 
@@ -434,25 +438,15 @@
         while(!done)
         {
             /* Wait for a key to be pushed */
-            key = button_get_w_tmo(HZ/2);;
+            key = button_get(true);
             switch(key)
             {
-                case BUTTON_UP:
-                case BUTTON_RIGHT:
-                case BUTTON_F1:
-                case BUTTON_F2:
-                case BUTTON_F3:
-                case BUTTON_LEFT:
-                case BUTTON_ON:
-                case BUTTON_OFF:
+                default:
                     return false;
-                    break;
                 case BUTTON_DOWN:
                     return bookmark_load(bookmark_file_name, false);
-                    break;
                 case BUTTON_PLAY:
                     return bookmark_load(bookmark_file_name, true);
-                    break;
                 case SYS_USB_CONNECTED:
                     mpeg_stop();
                     status_set_playmode(STATUS_STOP);
@@ -461,7 +455,6 @@
                     status_set_param(true);
 #endif
                     return true;
-                    break;                    
             }
         }
         return true;
@@ -660,6 +653,7 @@
             lcd_clear_display();
             lcd_stop_scroll();
 
+#ifdef HAVE_LCD_BITMAP
             /* bookmark shuffle and repeat states*/
             switch (repeat_mode)
             {
@@ -673,7 +667,9 @@
             }
             if(playlist_shuffle)
                 statusbar_icon_shuffle();
-
+#else
+            /* Add player-code here */
+#endif
             /* File Name */
             lcd_puts_scroll(0,0,file_name);
 
@@ -708,14 +704,14 @@
         }
 
         /* waiting for the user to click a button */
-        key = button_get_w_tmo(HZ/2);;
+        key = button_get(true);
+#ifdef HAVE_RECORDER_KEYPAD
         switch(key)
         {
             case BUTTON_PLAY:
                 strncpy(select_buf,bookmarks[select_count],
                         max_select_buf_size);
                 return true;
-                break;
             case BUTTON_UP:
                 select_count--;
                 bookmark_change = true;
@@ -726,7 +722,6 @@
                 break;
             case BUTTON_LEFT:
                 return false;
-                break;
             case BUTTON_ON | BUTTON_PLAY:
                 /* this clears out the bookmark */
                 if(bookmark_count > 1)
@@ -751,8 +746,14 @@
                 status_set_param(true);
 #endif
                 return false;
-                break;                
          }
+#else
+        /* ADD PLAYER-CODE HERE */
+
+        /* prevent warnings */
+        (void)select_buf;
+        (void)max_select_buf_size;
+#endif
 
          if(bookmark_count > 1 && bookmark_deleted)
          {