removed unused function and re-enabled button check

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

1 files changed, 1 insertions, 7 deletions

diff --git a/uisimulator/x11/mpegplay.c b/uisimulator/x11/mpegplay.c
index c01ab2487c..0ed3ac89e3 100644
--- a/uisimulator/x11/mpegplay.c
+++ b/uisimulator/x11/mpegplay.c
@@ -192,12 +192,6 @@ void init_oss(int sound, int sound_freq, int channels) {
   }
 }
 
-unsigned short MadFixedToUshort(mad_fixed_t Fixed)
-{
-  Fixed=Fixed>>(MAD_F_FRACBITS-15);
-  return((unsigned short)Fixed);
-}
-
 #define INPUT_BUFFER_SIZE  (5*8192)
 #define OUTPUT_BUFFER_SIZE  8192 /* Must be an integer multiple of 4. */
 int mpeg_play(char* fname)
@@ -240,7 +234,7 @@ int mpeg_play(char* fname)
 
   do
   {
-    //if (button_get()) break; /* Return if a key is pressed */
+    if (button_get()) break; /* Return if a key is pressed */
 
     if(Stream.buffer==NULL || Stream.error==MAD_ERROR_BUFLEN)
     {