diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/deutsch.lang | 37 | ||||
-rw-r--r-- | apps/lang/english.lang | 31 | ||||
-rw-r--r-- | apps/main.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 22 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/sound_menu.c | 18 |
6 files changed, 74 insertions, 39 deletions
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index 8aa8425c47..1010493231 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang | |||
@@ -1261,22 +1261,22 @@ voice: "LCD-Modus" | |||
1261 | new: "LCD-Modus" | 1261 | new: "LCD-Modus" |
1262 | 1262 | ||
1263 | id: LANG_CHANNEL_STEREO_NARROW_PLAYER | 1263 | id: LANG_CHANNEL_STEREO_NARROW_PLAYER |
1264 | desc: in sound_settings | 1264 | desc: DEPRECATED |
1265 | eng: "St. Narrow" | 1265 | eng: "" |
1266 | voice: "Stereo schmal" | 1266 | voice: "" |
1267 | new: "St. schmal" | 1267 | new: |
1268 | 1268 | ||
1269 | id: LANG_CHANNEL_STEREO_NARROW_RECORDER | 1269 | id: LANG_CHANNEL_STEREO_NARROW_RECORDER |
1270 | desc: in sound_settings | 1270 | desc: DEPRECATED |
1271 | eng: "Stereo Narrow" | 1271 | eng: "" |
1272 | voice: "Stereo schmal" | 1272 | voice: "" |
1273 | new: "Stereo schmal" | 1273 | new: |
1274 | 1274 | ||
1275 | id: LANG_CHANNEL_STEREO_WIDE | 1275 | id: LANG_CHANNEL_STEREO_WIDE |
1276 | desc: in sound_settings | 1276 | desc: DEPRECATED |
1277 | eng: "Stereo Wide" | 1277 | eng: "" |
1278 | voice: "Stereo breit" | 1278 | voice: "" |
1279 | new: "Stereo breit" | 1279 | new: |
1280 | 1280 | ||
1281 | id: LANG_CHANNEL_KARAOKE | 1281 | id: LANG_CHANNEL_KARAOKE |
1282 | desc: in sound_settings | 1282 | desc: in sound_settings |
@@ -2846,3 +2846,16 @@ eng: "" | |||
2846 | voice: " " | 2846 | voice: " " |
2847 | new: | 2847 | new: |
2848 | 2848 | ||
2849 | id: LANG_STEREO_WIDTH | ||
2850 | desc: in sound_settings | ||
2851 | eng: "Stereo width" | ||
2852 | voice: "Stereobasisbreite" | ||
2853 | new: "Stereobasisbreite" | ||
2854 | |||
2855 | id: LANG_CHANNEL_CUSTOM | ||
2856 | desc: in sound_settings | ||
2857 | eng: "Custom" | ||
2858 | voice: "Angepasst" | ||
2859 | new: "Angepasst" | ||
2860 | |||
2861 | |||
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 1f2dd4d9e3..4cc95b8383 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -1274,21 +1274,21 @@ voice: "LCD Mode" | |||
1274 | new: | 1274 | new: |
1275 | 1275 | ||
1276 | id: LANG_CHANNEL_STEREO_NARROW_PLAYER | 1276 | id: LANG_CHANNEL_STEREO_NARROW_PLAYER |
1277 | desc: in sound_settings | 1277 | desc: DEPRECATED |
1278 | eng: "St. Narrow" | 1278 | eng: "" |
1279 | voice: "Stereo Narrow" | 1279 | voice: "" |
1280 | new: | 1280 | new: |
1281 | 1281 | ||
1282 | id: LANG_CHANNEL_STEREO_NARROW_RECORDER | 1282 | id: LANG_CHANNEL_STEREO_NARROW_RECORDER |
1283 | desc: in sound_settings | 1283 | desc: DEPRECATED |
1284 | eng: "Stereo Narrow" | 1284 | eng: "" |
1285 | voice: "Stereo Narrow" | 1285 | voice: "" |
1286 | new: | 1286 | new: |
1287 | 1287 | ||
1288 | id: LANG_CHANNEL_STEREO_WIDE | 1288 | id: LANG_CHANNEL_STEREO_WIDE |
1289 | desc: in sound_settings | 1289 | desc: DEPRECATED |
1290 | eng: "Stereo Wide" | 1290 | eng: "" |
1291 | voice: "Stereo Wide" | 1291 | voice: "" |
1292 | new: | 1292 | new: |
1293 | 1293 | ||
1294 | id: LANG_CHANNEL_KARAOKE | 1294 | id: LANG_CHANNEL_KARAOKE |
@@ -2860,3 +2860,16 @@ eng: "" | |||
2860 | voice: " " | 2860 | voice: " " |
2861 | new: | 2861 | new: |
2862 | 2862 | ||
2863 | id: LANG_STEREO_WIDTH | ||
2864 | desc: in sound_settings | ||
2865 | eng: "Stereo width" | ||
2866 | voice: "Stereo width" | ||
2867 | new: | ||
2868 | |||
2869 | id: LANG_CHANNEL_CUSTOM | ||
2870 | desc: in sound_settings | ||
2871 | eng: "Custom" | ||
2872 | voice: "Custom" | ||
2873 | new: | ||
2874 | |||
2875 | |||
diff --git a/apps/main.c b/apps/main.c index 964a7c8b4f..cc270ba136 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -140,6 +140,7 @@ void init(void) | |||
140 | global_settings.loudness, | 140 | global_settings.loudness, |
141 | global_settings.avc, | 141 | global_settings.avc, |
142 | global_settings.channel_config, | 142 | global_settings.channel_config, |
143 | global_settings.stereo_width, | ||
143 | global_settings.mdb_strength, | 144 | global_settings.mdb_strength, |
144 | global_settings.mdb_harmonics, | 145 | global_settings.mdb_harmonics, |
145 | global_settings.mdb_center, | 146 | global_settings.mdb_center, |
@@ -272,6 +273,7 @@ void init(void) | |||
272 | global_settings.loudness, | 273 | global_settings.loudness, |
273 | global_settings.avc, | 274 | global_settings.avc, |
274 | global_settings.channel_config, | 275 | global_settings.channel_config, |
276 | global_settings.stereo_width, | ||
275 | global_settings.mdb_strength, | 277 | global_settings.mdb_strength, |
276 | global_settings.mdb_harmonics, | 278 | global_settings.mdb_harmonics, |
277 | global_settings.mdb_center, | 279 | global_settings.mdb_center, |
diff --git a/apps/settings.c b/apps/settings.c index d4945d4431..ca1b900ef4 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -71,7 +71,7 @@ const char rec_base_directory[] = REC_BASE_DIR; | |||
71 | 71 | ||
72 | 72 | ||
73 | 73 | ||
74 | #define CONFIG_BLOCK_VERSION 18 | 74 | #define CONFIG_BLOCK_VERSION 19 |
75 | #define CONFIG_BLOCK_SIZE 512 | 75 | #define CONFIG_BLOCK_SIZE 512 |
76 | #define RTC_BLOCK_SIZE 44 | 76 | #define RTC_BLOCK_SIZE 44 |
77 | 77 | ||
@@ -170,8 +170,9 @@ static const struct bit_entry rtc_bits[] = | |||
170 | {3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" }, | 170 | {3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" }, |
171 | {1, S_O(superbass), false, "superbass", off_on }, | 171 | {1, S_O(superbass), false, "superbass", off_on }, |
172 | #endif | 172 | #endif |
173 | {3, S_O(channel_config), 6, "channels", | 173 | {3, S_O(channel_config), 0, "channels", |
174 | "stereo,stereo narrow,mono,mono left,mono right,karaoke,stereo wide" }, | 174 | "stereo,mono,custom,mono left,mono right,karaoke" }, |
175 | {8, S_O(stereo_width), 100, "stereo width", NULL}, | ||
175 | /* playback */ | 176 | /* playback */ |
176 | {2, S_O(resume), RESUME_ASK, "resume", "off,ask,ask once,on" }, | 177 | {2, S_O(resume), RESUME_ASK, "resume", "off,ask,ask once,on" }, |
177 | {1, S_O(playlist_shuffle), false, "shuffle", off_on }, | 178 | {1, S_O(playlist_shuffle), false, "shuffle", off_on }, |
@@ -206,7 +207,7 @@ static const struct bit_entry rtc_bits[] = | |||
206 | #endif | 207 | #endif |
207 | {1, S_O(show_icons), true, "show icons", off_on }, | 208 | {1, S_O(show_icons), true, "show icons", off_on }, |
208 | /* system */ | 209 | /* system */ |
209 | {4, S_O(poweroff), 10, | 210 | {4, S_O(poweroff), 10, |
210 | "idle poweroff", "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60" }, | 211 | "idle poweroff", "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60" }, |
211 | {18, S_O(runtime), 0, NULL, NULL }, | 212 | {18, S_O(runtime), 0, NULL, NULL }, |
212 | {18, S_O(topruntime), 0, NULL, NULL }, | 213 | {18, S_O(topruntime), 0, NULL, NULL }, |
@@ -221,19 +222,20 @@ static const struct bit_entry rtc_bits[] = | |||
221 | #endif | 222 | #endif |
222 | {12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity", | 223 | {12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity", |
223 | NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, | 224 | NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, |
224 | 1000...2000 for Alkaline */ | 225 | 500...1500 for Alkaline */ |
225 | #ifdef HAVE_CHARGING | 226 | #ifdef HAVE_CHARGING |
226 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, | 227 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, |
227 | #endif | 228 | #endif |
228 | 229 | /* tuner */ | |
229 | /* new stuff to be added here */ | ||
230 | /* If values are just added to the end, no need to bump the version. */ | ||
231 | #ifdef CONFIG_TUNER | 230 | #ifdef CONFIG_TUNER |
232 | {1, S_O(fm_force_mono), false, "force fm mono", off_on }, | 231 | {1, S_O(fm_force_mono), false, "force fm mono", off_on }, |
233 | {8, S_O(last_frequency), 0, NULL, NULL }, /* Default: MIN_FREQ */ | 232 | {8, S_O(last_frequency), 0, NULL, NULL }, /* Default: MIN_FREQ */ |
234 | #endif | 233 | #endif |
235 | 234 | ||
236 | /* Current sum of bits: 286 (worst case) */ | 235 | /* new stuff to be added here */ |
236 | /* If values are just added to the end, no need to bump the version. */ | ||
237 | |||
238 | /* Current sum of bits: 259 (worst case) */ | ||
237 | /* Sum of all bit sizes must not grow beyond 288! */ | 239 | /* Sum of all bit sizes must not grow beyond 288! */ |
238 | }; | 240 | }; |
239 | 241 | ||
@@ -716,6 +718,7 @@ void sound_settings_apply(void) | |||
716 | mpeg_sound_set(SOUND_BALANCE, global_settings.balance); | 718 | mpeg_sound_set(SOUND_BALANCE, global_settings.balance); |
717 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 719 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
718 | mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config); | 720 | mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config); |
721 | mpeg_sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); | ||
719 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 722 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) |
720 | mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness); | 723 | mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness); |
721 | mpeg_sound_set(SOUND_AVC, global_settings.avc); | 724 | mpeg_sound_set(SOUND_AVC, global_settings.avc); |
@@ -1261,6 +1264,7 @@ void settings_reset(void) { | |||
1261 | global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS); | 1264 | global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS); |
1262 | global_settings.avc = mpeg_sound_default(SOUND_AVC); | 1265 | global_settings.avc = mpeg_sound_default(SOUND_AVC); |
1263 | global_settings.channel_config = mpeg_sound_default(SOUND_CHANNELS); | 1266 | global_settings.channel_config = mpeg_sound_default(SOUND_CHANNELS); |
1267 | global_settings.stereo_width = mpeg_sound_default(SOUND_STEREO_WIDTH); | ||
1264 | global_settings.mdb_strength = mpeg_sound_default(SOUND_MDB_STRENGTH); | 1268 | global_settings.mdb_strength = mpeg_sound_default(SOUND_MDB_STRENGTH); |
1265 | global_settings.mdb_harmonics = mpeg_sound_default(SOUND_MDB_HARMONICS); | 1269 | global_settings.mdb_harmonics = mpeg_sound_default(SOUND_MDB_HARMONICS); |
1266 | global_settings.mdb_center = mpeg_sound_default(SOUND_MDB_CENTER); | 1270 | global_settings.mdb_center = mpeg_sound_default(SOUND_MDB_CENTER); |
diff --git a/apps/settings.h b/apps/settings.h index 8d92aa9ad1..88bc71804a 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -129,7 +129,8 @@ struct user_settings | |||
129 | int treble; /* treble eq: 0-100 0=low 100=high */ | 129 | int treble; /* treble eq: 0-100 0=low 100=high */ |
130 | int loudness; /* loudness eq: 0-100 0=off 100=max */ | 130 | int loudness; /* loudness eq: 0-100 0=off 100=max */ |
131 | int avc; /* auto volume correct: 0=off, 1=20ms, 2=2s 3=4s 4=8s */ | 131 | int avc; /* auto volume correct: 0=off, 1=20ms, 2=2s 3=4s 4=8s */ |
132 | int channel_config; /* Stereo, Mono, Mono left, Mono right */ | 132 | int channel_config; /* Stereo, Mono, Custom, Mono left, Mono right, Karaoke */ |
133 | int stereo_width; /* 0-255% */ | ||
133 | int mdb_strength; /* 0-127dB */ | 134 | int mdb_strength; /* 0-127dB */ |
134 | int mdb_harmonics; /* 0-100% */ | 135 | int mdb_harmonics; /* 0-100% */ |
135 | int mdb_center; /* 20-300Hz */ | 136 | int mdb_center; /* 20-300Hz */ |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index de5b8c0a8c..6e5b74bfa3 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -385,19 +385,20 @@ static bool chanconf(void) | |||
385 | { | 385 | { |
386 | static const struct opt_items names[] = { | 386 | static const struct opt_items names[] = { |
387 | { STR(LANG_CHANNEL_STEREO) }, | 387 | { STR(LANG_CHANNEL_STEREO) }, |
388 | #ifdef HAVE_LCD_CHARCELLS | ||
389 | { STR(LANG_CHANNEL_STEREO_NARROW_PLAYER) }, | ||
390 | #else | ||
391 | { STR(LANG_CHANNEL_STEREO_NARROW_RECORDER) }, | ||
392 | #endif | ||
393 | { STR(LANG_CHANNEL_MONO) }, | 388 | { STR(LANG_CHANNEL_MONO) }, |
389 | { STR(LANG_CHANNEL_CUSTOM) }, | ||
394 | { STR(LANG_CHANNEL_LEFT) }, | 390 | { STR(LANG_CHANNEL_LEFT) }, |
395 | { STR(LANG_CHANNEL_RIGHT) }, | 391 | { STR(LANG_CHANNEL_RIGHT) }, |
396 | { STR(LANG_CHANNEL_KARAOKE) }, | 392 | { STR(LANG_CHANNEL_KARAOKE) } |
397 | { STR(LANG_CHANNEL_STEREO_WIDE) } | ||
398 | }; | 393 | }; |
399 | return set_option(str(LANG_CHANNEL), &global_settings.channel_config, INT, | 394 | return set_option(str(LANG_CHANNEL), &global_settings.channel_config, INT, |
400 | names, 7, set_chanconf ); | 395 | names, 6, set_chanconf ); |
396 | } | ||
397 | |||
398 | static bool stereo_width(void) | ||
399 | { | ||
400 | return set_sound(str(LANG_STEREO_WIDTH), &global_settings.stereo_width, | ||
401 | SOUND_STEREO_WIDTH); | ||
401 | } | 402 | } |
402 | 403 | ||
403 | bool sound_menu(void) | 404 | bool sound_menu(void) |
@@ -410,6 +411,7 @@ bool sound_menu(void) | |||
410 | { ID2P(LANG_TREBLE), treble }, | 411 | { ID2P(LANG_TREBLE), treble }, |
411 | { ID2P(LANG_BALANCE), balance }, | 412 | { ID2P(LANG_BALANCE), balance }, |
412 | { ID2P(LANG_CHANNEL_MENU), chanconf }, | 413 | { ID2P(LANG_CHANNEL_MENU), chanconf }, |
414 | { ID2P(LANG_STEREO_WIDTH), stereo_width }, | ||
413 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 415 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) |
414 | { ID2P(LANG_LOUDNESS), loudness }, | 416 | { ID2P(LANG_LOUDNESS), loudness }, |
415 | { ID2P(LANG_AUTOVOL), avc }, | 417 | { ID2P(LANG_AUTOVOL), avc }, |