diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2011-07-02 11:55:38 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2011-07-02 11:55:38 +0000 |
| commit | 22b6def065ab7c2ca030f405577e34104ad20011 (patch) | |
| tree | 6be548bf591d2365077b74679048737fe51792a2 /apps/plugins | |
| parent | 8c954e28b75b47543f69abe2c169d83ad38c26ae (diff) | |
| download | rockbox-22b6def065ab7c2ca030f405577e34104ad20011.zip rockbox-22b6def065ab7c2ca030f405577e34104ad20011.tar.gz rockbox-22b6def065ab7c2ca030f405577e34104ad20011.tar.bz2 rockbox-22b6def065ab7c2ca030f405577e34104ad20011.tar.xz | |
Use playback channel directly for peakmeters and plugins using peak calculation. Also, for now, don't allow mixer playback to overlap recording, even if full duplex works.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30119 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/oscilloscope.c | 3 | ||||
| -rw-r--r-- | apps/plugins/starfield.c | 3 | ||||
| -rw-r--r-- | apps/plugins/vu_meter.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 07bf1da..5eb43fa 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -826,7 +826,8 @@ enum plugin_status plugin_start(const void* parameter) left = rb->mas_codec_readreg(0xC); right = rb->mas_codec_readreg(0xD); #elif (CONFIG_CODEC == SWCODEC) - rb->pcm_calculate_peaks(&left, &right); + rb->mixer_channel_calculate_peaks(PCM_MIXER_CHAN_PLAYBACK, + &left, &right); #endif if (osc.orientation == OSC_HORIZ) anim_horizontal(left, right); diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 5e832aa..e7bbb42 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c @@ -422,7 +422,8 @@ int plugin_main(void) /* Get the peaks. ( Borrowed from vu_meter ) */ #if (CONFIG_CODEC == SWCODEC) int left_peak, right_peak; - rb->pcm_calculate_peaks(&left_peak, &right_peak); + rb->mixer_channel_calculate_peaks(PCM_MIXER_CHAN_PLAYBACK, + &left_peak, &right_peak); #else int left_peak = rb->mas_codec_readreg(0xC); int right_peak = rb->mas_codec_readreg(0xD); diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 5266214..cb1a035 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -660,7 +660,8 @@ void analog_meter(void) { int right_peak = rb->mas_codec_readreg(0xD); #elif (CONFIG_CODEC == SWCODEC) int left_peak, right_peak; - rb->pcm_calculate_peaks(&left_peak, &right_peak); + rb->mixer_channel_calculate_peaks(PCM_MIXER_CHAN_PLAYBACK, + &left_peak, &right_peak); #endif if(vumeter_settings.analog_use_db_scale) { |