win32 simulator up-to-date

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

3 files changed, 93 insertions, 10 deletions

diff --git a/uisimulator/win32/mpeg.c b/uisimulator/win32/mpeg.c
index b16dbb4..11fa98c 100644
--- a/uisimulator/win32/mpeg.c
+++ b/uisimulator/win32/mpeg.c
@@ -21,6 +21,67 @@
    the target */
 
 #include "debug.h"
+#include "mpeg.h"
+
+static char *units[] =
+{
+    "%",    /* Volume */
+    "%",    /* Bass */
+    "%"     /* Treble */
+};
+
+static int numdecimals[] =
+{
+    0,    /* Volume */
+    0,    /* Bass */
+    0     /* Treble */
+};
+
+static int minval[] =
+{
+    0,    /* Volume */
+    0,    /* Bass */
+    0     /* Treble */
+};
+
+static int maxval[] =
+{
+    50,    /* Volume */
+    50,    /* Bass */
+    50     /* Treble */
+};
+
+static int defaultval[] =
+{
+    70/2,    /* Volume */
+    50/2,    /* Bass */
+    50/2     /* Treble */
+};
+
+char *mpeg_sound_unit(int setting)
+{
+    return units[setting];
+}
+
+int mpeg_sound_numdecimals(int setting)
+{
+    return numdecimals[setting];
+}
+
+int mpeg_sound_min(int setting)
+{
+    return minval[setting];
+}
+
+int mpeg_sound_max(int setting)
+{
+    return maxval[setting];
+}
+
+int mpeg_sound_default(int setting)
+{
+    return defaultval[setting];
+}
 
 void mpeg_volume(void)
 {
@@ -59,6 +120,10 @@ struct mp3entry* mpeg_current_track(void)
     return 0;
 }
 
+void mpeg_sound_set(int setting, int value)
+{
+}
+
 #ifndef MPEGPLAY
 void mpeg_play(char *tune)
 {
@@ -66,4 +131,25 @@ void mpeg_play(char *tune)
          tune);
 }
 
+int mpeg_val2phys(int setting, int value)
+{
+    int result = 0;
+    
+    switch(setting)
+    {
+        case SOUND_VOLUME:
+            result = value * 2;
+            break;
+        
+        case SOUND_BASS:
+            result = value * 2;
+            break;
+        
+        case SOUND_TREBLE:
+            result = value * 2;
+            break;
+    }
+    return result;
+}
+
 #endif
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo
index d9f1110..a60bb1e 100644
--- a/uisimulator/win32/uisw32.suo
+++ b/uisimulator/win32/uisw32.suo
diff --git a/uisimulator/win32/uisw32.vcproj b/uisimulator/win32/uisw32.vcproj
index b4ae9dd..ff157bd 100644
--- a/uisimulator/win32/uisw32.vcproj
+++ b/uisimulator/win32/uisw32.vcproj
@@ -179,7 +179,13 @@
 				RelativePath="panic-win32.c">
 			</File>
 			<File
-				RelativePath="..\..\apps\play.c">
+				RelativePath="..\..\apps\playlist.c">
+			</File>
+			<File
+				RelativePath="..\..\apps\screensavers_menu.c">
+			</File>
+			<File
+				RelativePath="..\..\apps\settings.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -194,15 +200,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apps\playlist.c">
-			</File>
-			<File
-				RelativePath="..\..\apps\screensavers_menu.c">
-			</File>
-			<File
-				RelativePath="..\..\firmware\settings.c">
-			</File>
-			<File
 				RelativePath="..\..\apps\settings_menu.c">
 			</File>
 			<File