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/recorder/peakmeter.c | |
| parent | 8c954e28b75b47543f69abe2c169d83ad38c26ae (diff) | |
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/recorder/peakmeter.c')
| -rw-r--r-- | apps/recorder/peakmeter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index c13c4c9539..fd8f8d9fbe 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c @@ -44,6 +44,7 @@ #if CONFIG_CODEC == SWCODEC #include "pcm.h" +#include "pcm_mixer.h" #ifdef HAVE_RECORDING #include "pcm_record.h" @@ -620,7 +621,8 @@ void peak_meter_peek(void) /* read current values */ #if CONFIG_CODEC == SWCODEC if (pm_playback) - pcm_calculate_peaks(&pm_cur_left, &pm_cur_right); + mixer_channel_calculate_peaks(PCM_MIXER_CHAN_PLAYBACK, + &pm_cur_left, &pm_cur_right); #ifdef HAVE_RECORDING else pcm_calculate_rec_peaks(&pm_cur_left, &pm_cur_right); |