diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-06-09 09:47:00 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-06-09 09:47:00 +0000 |
commit | 6271b2b9104e060f8e25c780f3cbb010cbcba827 (patch) | |
tree | 4c52d92b49946083e5a08c5c20e202dd767cda03 /apps | |
parent | 614f0a333a6263def7e6cd053abfc222dae2ced5 (diff) | |
download | rockbox-6271b2b9104e060f8e25c780f3cbb010cbcba827.tar.gz rockbox-6271b2b9104e060f8e25c780f3cbb010cbcba827.zip |
Added Crossfade setting for iRiver
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6636 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 6 | ||||
-rw-r--r-- | apps/settings.c | 12 | ||||
-rw-r--r-- | apps/settings.h | 4 | ||||
-rw-r--r-- | apps/settings_menu.c | 18 |
4 files changed, 39 insertions, 1 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 423215c830..2c54a9c77b 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3087,3 +3087,9 @@ desc: in info menu; name for external disk with multivolume (Ondio; keep short! | |||
3087 | eng: "MMC:" | 3087 | eng: "MMC:" |
3088 | voice: "Multimedia card" | 3088 | voice: "Multimedia card" |
3089 | new: | 3089 | new: |
3090 | |||
3091 | id: LANG_CROSSFADE | ||
3092 | desc: in playback settings | ||
3093 | eng: "Crossfade" | ||
3094 | voice: "Crossfade" | ||
3095 | new: | ||
diff --git a/apps/settings.c b/apps/settings.c index 03b2dc5113..312a40e9f9 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -72,7 +72,9 @@ struct user_settings global_settings; | |||
72 | #ifdef HAVE_RECORDING | 72 | #ifdef HAVE_RECORDING |
73 | const char rec_base_directory[] = REC_BASE_DIR; | 73 | const char rec_base_directory[] = REC_BASE_DIR; |
74 | #endif | 74 | #endif |
75 | 75 | #if CONFIG_HWCODEC == MASNONE | |
76 | #include "pcm_playback.h" | ||
77 | #endif | ||
76 | 78 | ||
77 | #define CONFIG_BLOCK_VERSION 21 | 79 | #define CONFIG_BLOCK_VERSION 21 |
78 | #define CONFIG_BLOCK_SIZE 512 | 80 | #define CONFIG_BLOCK_SIZE 512 |
@@ -382,6 +384,10 @@ static const struct bit_entry hd_bits[] = | |||
382 | {4, S_O(rec_trigger_mode ), 1, "trigger mode", "off,no rearm,rearm"}, | 384 | {4, S_O(rec_trigger_mode ), 1, "trigger mode", "off,no rearm,rearm"}, |
383 | #endif | 385 | #endif |
384 | 386 | ||
387 | #if CONFIG_HWCODEC == MASNONE | ||
388 | {1, S_O(crossfade), false, "crossfade", off_on}, | ||
389 | #endif | ||
390 | |||
385 | /* new stuff to be added at the end */ | 391 | /* new stuff to be added at the end */ |
386 | 392 | ||
387 | /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ | 393 | /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ |
@@ -812,6 +818,10 @@ void settings_apply(void) | |||
812 | lang_load(buf); | 818 | lang_load(buf); |
813 | talk_init(); /* use voice of same language */ | 819 | talk_init(); /* use voice of same language */ |
814 | } | 820 | } |
821 | |||
822 | #if CONFIG_HWCODEC == MASNONE && !defined(SIMULATOR) | ||
823 | pcm_crossfade_enable(global_settings.crossfade); | ||
824 | #endif | ||
815 | } | 825 | } |
816 | 826 | ||
817 | 827 | ||
diff --git a/apps/settings.h b/apps/settings.h index 853dc41628..325009eddb 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -152,6 +152,10 @@ struct user_settings | |||
152 | bool mdb_enable; /* true/false */ | 152 | bool mdb_enable; /* true/false */ |
153 | bool superbass; /* true/false */ | 153 | bool superbass; /* true/false */ |
154 | 154 | ||
155 | #if CONFIG_HWCODEC == MASNONE | ||
156 | bool crossfade; | ||
157 | #endif | ||
158 | |||
155 | int rec_quality; /* 0-7 */ | 159 | int rec_quality; /* 0-7 */ |
156 | int rec_source; /* 0=mic, 1=line, 2=S/PDIF */ | 160 | int rec_source; /* 0=mic, 1=line, 2=S/PDIF */ |
157 | int rec_frequency; /* 0 = 44.1kHz | 161 | int rec_frequency; /* 0 = 44.1kHz |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index e4002615dd..9826058202 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -60,6 +60,10 @@ void dac_line_in(bool enable); | |||
60 | #include "lcd-remote.h" | 60 | #include "lcd-remote.h" |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #if CONFIG_HWCODEC == MASNONE | ||
64 | #include "pcm_playback.h" | ||
65 | #endif | ||
66 | |||
63 | #ifdef HAVE_CHARGING | 67 | #ifdef HAVE_CHARGING |
64 | static bool car_adapter_mode(void) | 68 | static bool car_adapter_mode(void) |
65 | { | 69 | { |
@@ -1055,6 +1059,17 @@ static bool id3_order(void) | |||
1055 | mpeg_id3_options); | 1059 | mpeg_id3_options); |
1056 | } | 1060 | } |
1057 | 1061 | ||
1062 | #if CONFIG_HWCODEC == MASNONE | ||
1063 | static bool crossfade(void) | ||
1064 | { | ||
1065 | bool rc = set_bool( str(LANG_CROSSFADE), &global_settings.crossfade ); | ||
1066 | #ifndef SIMULATOR | ||
1067 | pcm_crossfade_enable(global_settings.crossfade); | ||
1068 | #endif | ||
1069 | return rc; | ||
1070 | } | ||
1071 | #endif | ||
1072 | |||
1058 | static bool playback_settings_menu(void) | 1073 | static bool playback_settings_menu(void) |
1059 | { | 1074 | { |
1060 | int m; | 1075 | int m; |
@@ -1068,6 +1083,9 @@ static bool playback_settings_menu(void) | |||
1068 | { ID2P(LANG_WIND_MENU), ff_rewind_settings_menu }, | 1083 | { ID2P(LANG_WIND_MENU), ff_rewind_settings_menu }, |
1069 | { ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin }, | 1084 | { ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin }, |
1070 | { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, | 1085 | { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, |
1086 | #if CONFIG_HWCODEC == MASNONE | ||
1087 | { ID2P(LANG_CROSSFADE), crossfade }, | ||
1088 | #endif | ||
1071 | { ID2P(LANG_ID3_ORDER), id3_order }, | 1089 | { ID2P(LANG_ID3_ORDER), id3_order }, |
1072 | }; | 1090 | }; |
1073 | 1091 | ||