Index: apps/screens.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screens.c,v
retrieving revision 1.51
diff -u -r1.51 screens.c
--- apps/screens.c	26 Jul 2004 07:39:57 -0000	1.51
+++ apps/screens.c	26 Jul 2004 08:44:53 -0000
@@ -350,48 +350,36 @@
                 mpeg_set_pitch(pitch);
                 break;
 
+            case BUTTON_PLAY:
             case BUTTON_ON | BUTTON_PLAY:
-                mpeg_pause();
+            case BUTTON_ON | BUTTON_PLAY | BUTTON_REPEAT:
                 used = true;
+                if ( mpeg_status() & MPEG_STATUS_PAUSE )
+                    mpeg_resume();
+                else
+                    mpeg_pause();
                 break;
 
-            case BUTTON_PLAY | BUTTON_REL:
-                mpeg_resume();
-                used = true;
-                break;
-
-            case BUTTON_ON | BUTTON_PLAY | BUTTON_REL:
-                mpeg_resume();
-                exit = true;
-                break;
-
+            case BUTTON_RIGHT:
             case BUTTON_ON | BUTTON_RIGHT:
+            case BUTTON_ON | BUTTON_RIGHT | BUTTON_REPEAT:
+                used = true;
                 if ( pitch < 2000 ) {
                     pitch += 20;
                     mpeg_set_pitch(pitch);
                 }
                 break;
 
-            case BUTTON_RIGHT | BUTTON_REL:
-                if ( pitch > 500 ) {
-                    pitch -= 20;
-                    mpeg_set_pitch(pitch);
-                }
-                break;
-
+            case BUTTON_LEFT:
             case BUTTON_ON | BUTTON_LEFT:
+            case BUTTON_ON | BUTTON_LEFT | BUTTON_REPEAT:
+                used = true;
                 if ( pitch > 500 ) {
                     pitch -= 20;
                     mpeg_set_pitch(pitch);
                 }
                 break;
 
-            case BUTTON_LEFT | BUTTON_REL:
-                if ( pitch < 2000 ) {
-                    pitch += 20;
-                    mpeg_set_pitch(pitch);
-                }
-                break;
 
 #ifdef SIMULATOR
             case BUTTON_ON:
@@ -432,9 +420,7 @@
     /* just to stop compiler warning */
     context = context;
     lcd_setfont(FONT_SYSFIXED);
-
-    if(button==BUTTON_F2)
-        lcd_getstringsize("A",&w,&h);
+    lcd_getstringsize("A",&w,&h);
 
     while (!exit) {
         char* ptr=NULL;