diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/alpine_cdc.c | 28 | ||||
-rw-r--r-- | apps/plugins/metronome.c | 2 | ||||
-rw-r--r-- | apps/plugins/oscilloscope.c | 4 | ||||
-rw-r--r-- | apps/plugins/splitedit.c | 6 | ||||
-rw-r--r-- | apps/plugins/video.c | 2 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 2 |
6 files changed, 22 insertions, 22 deletions
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index 742e0bc6f5..d944810b31 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -1042,25 +1042,25 @@ void set_position(int seconds) | |||
1042 | /* set to everything flat and 0 dB volume */ | 1042 | /* set to everything flat and 0 dB volume */ |
1043 | void sound_neutral(void) | 1043 | void sound_neutral(void) |
1044 | { /* neutral sound settings */ | 1044 | { /* neutral sound settings */ |
1045 | rb->mpeg_sound_set(SOUND_BASS, 0); | 1045 | rb->sound_set(SOUND_BASS, 0); |
1046 | rb->mpeg_sound_set(SOUND_TREBLE, 0); | 1046 | rb->sound_set(SOUND_TREBLE, 0); |
1047 | rb->mpeg_sound_set(SOUND_BALANCE, 0); | 1047 | rb->sound_set(SOUND_BALANCE, 0); |
1048 | rb->mpeg_sound_set(SOUND_VOLUME, 92); /* 0 dB */ | 1048 | rb->sound_set(SOUND_VOLUME, 92); /* 0 dB */ |
1049 | rb->mpeg_sound_set(SOUND_LOUDNESS, 0); | 1049 | rb->sound_set(SOUND_LOUDNESS, 0); |
1050 | rb->mpeg_sound_set(SOUND_SUPERBASS, 0); | 1050 | rb->sound_set(SOUND_SUPERBASS, 0); |
1051 | rb->mpeg_sound_set(SOUND_AVC, 0); | 1051 | rb->sound_set(SOUND_AVC, 0); |
1052 | } | 1052 | } |
1053 | 1053 | ||
1054 | /* return to user settings */ | 1054 | /* return to user settings */ |
1055 | void sound_normal(void) | 1055 | void sound_normal(void) |
1056 | { /* restore sound settings */ | 1056 | { /* restore sound settings */ |
1057 | rb->mpeg_sound_set(SOUND_BASS, rb->global_settings->bass); | 1057 | rb->sound_set(SOUND_BASS, rb->global_settings->bass); |
1058 | rb->mpeg_sound_set(SOUND_TREBLE, rb->global_settings->treble); | 1058 | rb->sound_set(SOUND_TREBLE, rb->global_settings->treble); |
1059 | rb->mpeg_sound_set(SOUND_BALANCE, rb->global_settings->balance); | 1059 | rb->sound_set(SOUND_BALANCE, rb->global_settings->balance); |
1060 | rb->mpeg_sound_set(SOUND_VOLUME, rb->global_settings->volume); | 1060 | rb->sound_set(SOUND_VOLUME, rb->global_settings->volume); |
1061 | rb->mpeg_sound_set(SOUND_LOUDNESS, rb->global_settings->loudness); | 1061 | rb->sound_set(SOUND_LOUDNESS, rb->global_settings->loudness); |
1062 | rb->mpeg_sound_set(SOUND_SUPERBASS, rb->global_settings->superbass); | 1062 | rb->sound_set(SOUND_SUPERBASS, rb->global_settings->superbass); |
1063 | rb->mpeg_sound_set(SOUND_AVC, rb->global_settings->avc); | 1063 | rb->sound_set(SOUND_AVC, rb->global_settings->avc); |
1064 | } | 1064 | } |
1065 | 1065 | ||
1066 | /* the thread running it all */ | 1066 | /* the thread running it all */ |
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index 98b516f9e8..3793fd9690 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c | |||
@@ -201,7 +201,7 @@ void change_volume(int delta){ | |||
201 | if (vol > 100) vol = 100; | 201 | if (vol > 100) vol = 100; |
202 | else if (vol < 0) vol = 0; | 202 | else if (vol < 0) vol = 0; |
203 | if (vol != rb->global_settings->volume) { | 203 | if (vol != rb->global_settings->volume) { |
204 | rb->mpeg_sound_set(SOUND_VOLUME, vol); | 204 | rb->sound_set(SOUND_VOLUME, vol); |
205 | rb->global_settings->volume = vol; | 205 | rb->global_settings->volume = vol; |
206 | rb->snprintf(buffer, sizeof(buffer), "Vol: %d ", vol); | 206 | rb->snprintf(buffer, sizeof(buffer), "Vol: %d ", vol); |
207 | #ifdef HAVE_LCD_BITMAP | 207 | #ifdef HAVE_LCD_BITMAP |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index caa09a0ed4..868a20547c 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -242,7 +242,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
242 | if (vol < 100) | 242 | if (vol < 100) |
243 | { | 243 | { |
244 | vol++; | 244 | vol++; |
245 | rb->mpeg_sound_set(SOUND_VOLUME, vol); | 245 | rb->sound_set(SOUND_VOLUME, vol); |
246 | rb->global_settings->volume = vol; | 246 | rb->global_settings->volume = vol; |
247 | } | 247 | } |
248 | break; | 248 | break; |
@@ -253,7 +253,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
253 | if (vol > 0) | 253 | if (vol > 0) |
254 | { | 254 | { |
255 | vol--; | 255 | vol--; |
256 | rb->mpeg_sound_set(SOUND_VOLUME, vol); | 256 | rb->sound_set(SOUND_VOLUME, vol); |
257 | rb->global_settings->volume = vol; | 257 | rb->global_settings->volume = vol; |
258 | } | 258 | } |
259 | break; | 259 | break; |
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index d3145b438a..c2cdc8de6e 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -1055,17 +1055,17 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1055 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 1055 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) |
1056 | #if defined(SPLITEDIT_SPEED150) && defined(SPLITEDIT_SPEED100) && defined(SPLITEDIT_SPEED50) | 1056 | #if defined(SPLITEDIT_SPEED150) && defined(SPLITEDIT_SPEED100) && defined(SPLITEDIT_SPEED50) |
1057 | case SPLITEDIT_SPEED150: | 1057 | case SPLITEDIT_SPEED150: |
1058 | rb->mpeg_set_pitch(1500); | 1058 | rb->sound_set_pitch(1500); |
1059 | splitedit_invalidate_osci(); | 1059 | splitedit_invalidate_osci(); |
1060 | break; | 1060 | break; |
1061 | 1061 | ||
1062 | case SPLITEDIT_SPEED100: | 1062 | case SPLITEDIT_SPEED100: |
1063 | rb->mpeg_set_pitch(1000); | 1063 | rb->sound_set_pitch(1000); |
1064 | splitedit_invalidate_osci(); | 1064 | splitedit_invalidate_osci(); |
1065 | break; | 1065 | break; |
1066 | 1066 | ||
1067 | case SPLITEDIT_SPEED50: | 1067 | case SPLITEDIT_SPEED50: |
1068 | rb->mpeg_set_pitch(500); | 1068 | rb->sound_set_pitch(500); |
1069 | splitedit_invalidate_osci(); | 1069 | splitedit_invalidate_osci(); |
1070 | break; | 1070 | break; |
1071 | #endif | 1071 | #endif |
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index 73968d33b3..0257ad26b7 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -278,7 +278,7 @@ void ChangeVolume(int delta) | |||
278 | else if (vol < 0) vol = 0; | 278 | else if (vol < 0) vol = 0; |
279 | if (vol != rb->global_settings->volume) | 279 | if (vol != rb->global_settings->volume) |
280 | { | 280 | { |
281 | rb->mpeg_sound_set(SOUND_VOLUME, vol); | 281 | rb->sound_set(SOUND_VOLUME, vol); |
282 | rb->global_settings->volume = vol; | 282 | rb->global_settings->volume = vol; |
283 | rb->snprintf(gPrint, sizeof(gPrint), "Vol: %d", vol); | 283 | rb->snprintf(gPrint, sizeof(gPrint), "Vol: %d", vol); |
284 | rb->lcd_puts(0, 7, gPrint); | 284 | rb->lcd_puts(0, 7, gPrint); |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 22fc5217d2..afeaa83d90 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -139,7 +139,7 @@ void change_volume(int delta) { | |||
139 | if (vol>100) vol = 100; | 139 | if (vol>100) vol = 100; |
140 | else if (vol < 0) vol = 0; | 140 | else if (vol < 0) vol = 0; |
141 | if (vol != rb->global_settings->volume) { | 141 | if (vol != rb->global_settings->volume) { |
142 | rb->mpeg_sound_set(SOUND_VOLUME, vol); | 142 | rb->sound_set(SOUND_VOLUME, vol); |
143 | rb->global_settings->volume = vol; | 143 | rb->global_settings->volume = vol; |
144 | rb->snprintf(curr_vol, sizeof(curr_vol), "%d", vol); | 144 | rb->snprintf(curr_vol, sizeof(curr_vol), "%d", vol); |
145 | rb->lcd_putsxy(0,0, curr_vol); | 145 | rb->lcd_putsxy(0,0, curr_vol); |