diff options
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/mpeg.c | 86 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.suo | bin | 13312 -> 13312 bytes | |||
-rw-r--r-- | uisimulator/win32/uisw32.vcproj | 17 |
3 files changed, 93 insertions, 10 deletions
diff --git a/uisimulator/win32/mpeg.c b/uisimulator/win32/mpeg.c index b16dbb40dc..11fa98c02b 100644 --- a/uisimulator/win32/mpeg.c +++ b/uisimulator/win32/mpeg.c | |||
@@ -21,6 +21,67 @@ | |||
21 | the target */ | 21 | the target */ |
22 | 22 | ||
23 | #include "debug.h" | 23 | #include "debug.h" |
24 | #include "mpeg.h" | ||
25 | |||
26 | static char *units[] = | ||
27 | { | ||
28 | "%", /* Volume */ | ||
29 | "%", /* Bass */ | ||
30 | "%" /* Treble */ | ||
31 | }; | ||
32 | |||
33 | static int numdecimals[] = | ||
34 | { | ||
35 | 0, /* Volume */ | ||
36 | 0, /* Bass */ | ||
37 | 0 /* Treble */ | ||
38 | }; | ||
39 | |||
40 | static int minval[] = | ||
41 | { | ||
42 | 0, /* Volume */ | ||
43 | 0, /* Bass */ | ||
44 | 0 /* Treble */ | ||
45 | }; | ||
46 | |||
47 | static int maxval[] = | ||
48 | { | ||
49 | 50, /* Volume */ | ||
50 | 50, /* Bass */ | ||
51 | 50 /* Treble */ | ||
52 | }; | ||
53 | |||
54 | static int defaultval[] = | ||
55 | { | ||
56 | 70/2, /* Volume */ | ||
57 | 50/2, /* Bass */ | ||
58 | 50/2 /* Treble */ | ||
59 | }; | ||
60 | |||
61 | char *mpeg_sound_unit(int setting) | ||
62 | { | ||
63 | return units[setting]; | ||
64 | } | ||
65 | |||
66 | int mpeg_sound_numdecimals(int setting) | ||
67 | { | ||
68 | return numdecimals[setting]; | ||
69 | } | ||
70 | |||
71 | int mpeg_sound_min(int setting) | ||
72 | { | ||
73 | return minval[setting]; | ||
74 | } | ||
75 | |||
76 | int mpeg_sound_max(int setting) | ||
77 | { | ||
78 | return maxval[setting]; | ||
79 | } | ||
80 | |||
81 | int mpeg_sound_default(int setting) | ||
82 | { | ||
83 | return defaultval[setting]; | ||
84 | } | ||
24 | 85 | ||
25 | void mpeg_volume(void) | 86 | void mpeg_volume(void) |
26 | { | 87 | { |
@@ -59,6 +120,10 @@ struct mp3entry* mpeg_current_track(void) | |||
59 | return 0; | 120 | return 0; |
60 | } | 121 | } |
61 | 122 | ||
123 | void mpeg_sound_set(int setting, int value) | ||
124 | { | ||
125 | } | ||
126 | |||
62 | #ifndef MPEGPLAY | 127 | #ifndef MPEGPLAY |
63 | void mpeg_play(char *tune) | 128 | void mpeg_play(char *tune) |
64 | { | 129 | { |
@@ -66,4 +131,25 @@ void mpeg_play(char *tune) | |||
66 | tune); | 131 | tune); |
67 | } | 132 | } |
68 | 133 | ||
134 | int mpeg_val2phys(int setting, int value) | ||
135 | { | ||
136 | int result = 0; | ||
137 | |||
138 | switch(setting) | ||
139 | { | ||
140 | case SOUND_VOLUME: | ||
141 | result = value * 2; | ||
142 | break; | ||
143 | |||
144 | case SOUND_BASS: | ||
145 | result = value * 2; | ||
146 | break; | ||
147 | |||
148 | case SOUND_TREBLE: | ||
149 | result = value * 2; | ||
150 | break; | ||
151 | } | ||
152 | return result; | ||
153 | } | ||
154 | |||
69 | #endif | 155 | #endif |
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo index d9f11105d1..a60bb1e9aa 100644 --- a/uisimulator/win32/uisw32.suo +++ b/uisimulator/win32/uisw32.suo | |||
Binary files differ | |||
diff --git a/uisimulator/win32/uisw32.vcproj b/uisimulator/win32/uisw32.vcproj index b4ae9dd107..ff157bd5d5 100644 --- a/uisimulator/win32/uisw32.vcproj +++ b/uisimulator/win32/uisw32.vcproj | |||
@@ -179,7 +179,13 @@ | |||
179 | RelativePath="panic-win32.c"> | 179 | RelativePath="panic-win32.c"> |
180 | </File> | 180 | </File> |
181 | <File | 181 | <File |
182 | RelativePath="..\..\apps\play.c"> | 182 | RelativePath="..\..\apps\playlist.c"> |
183 | </File> | ||
184 | <File | ||
185 | RelativePath="..\..\apps\screensavers_menu.c"> | ||
186 | </File> | ||
187 | <File | ||
188 | RelativePath="..\..\apps\settings.c"> | ||
183 | <FileConfiguration | 189 | <FileConfiguration |
184 | Name="Debug|Win32"> | 190 | Name="Debug|Win32"> |
185 | <Tool | 191 | <Tool |
@@ -194,15 +200,6 @@ | |||
194 | </FileConfiguration> | 200 | </FileConfiguration> |
195 | </File> | 201 | </File> |
196 | <File | 202 | <File |
197 | RelativePath="..\..\apps\playlist.c"> | ||
198 | </File> | ||
199 | <File | ||
200 | RelativePath="..\..\apps\screensavers_menu.c"> | ||
201 | </File> | ||
202 | <File | ||
203 | RelativePath="..\..\firmware\settings.c"> | ||
204 | </File> | ||
205 | <File | ||
206 | RelativePath="..\..\apps\settings_menu.c"> | 203 | RelativePath="..\..\apps\settings_menu.c"> |
207 | </File> | 204 | </File> |
208 | <File | 205 | <File |