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

2 files changed, 14 insertions, 0 deletions

diff --git a/firmware/export/pcm-internal.h b/firmware/export/pcm-internal.h
index d69138f534..bae6a368fa 100644
--- a/firmware/export/pcm-internal.h
+++ b/firmware/export/pcm-internal.h
@@ -22,6 +22,16 @@
 #ifndef PCM_INTERNAL_H
 #define PCM_INTERNAL_H
 
+struct pcm_peaks
+{
+    long period;
+    long tick;
+    uint16_t val[2];
+};
+
+void pcm_do_peak_calculation(struct pcm_peaks *peaks, bool active,
+                             const void *addr, int count);
+
 /** The following are for internal use between pcm.c and target-
     specific portion **/
 
diff --git a/firmware/export/pcm_mixer.h b/firmware/export/pcm_mixer.h
index 9c4e06e0be..be10601ffd 100644
--- a/firmware/export/pcm_mixer.h
+++ b/firmware/export/pcm_mixer.h
@@ -103,6 +103,10 @@ size_t mixer_channel_get_bytes_waiting(enum pcm_mixer_channel channel);
 /* Return pointer to channel's playing audio data and the size remaining */
 void * mixer_channel_get_buffer(enum pcm_mixer_channel channel, int *count);
 
+/* Calculate peak values for channel */
+void mixer_channel_calculate_peaks(enum pcm_mixer_channel channel,
+                                   int *left, int *right);
+
 /* Stop ALL channels and PCM and reset state */
 void mixer_reset(void);