summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-12-02 01:09:44 -0500
committerMichael Sevakis <jethead71@rockbox.org>2012-12-05 02:03:58 +0100
commit0f8aedbe9492a5226fddd4ad27dae21b8a39e1b4 (patch)
treefa337438065d277926a254af74d3843b060b37eb /firmware/export
parente1ea08417bca57c607df6686472fa0a86f38b6d1 (diff)
downloadrockbox-0f8aedbe9492a5226fddd4ad27dae21b8a39e1b4.tar.gz
rockbox-0f8aedbe9492a5226fddd4ad27dae21b8a39e1b4.zip
Add a true waveform display to the oscilloscope plugin.
* Adds some additional niftyness like a floating popup display that is implemented in an OSD library for use by other plugins. * Speed changes are now gradual for both views and follow a curve derived from some fiddling around to get a nice feel. * Refined a few behavioral things overall. It needs a bit of help from a direct PCM channel callback so it may capture PCM for waveform display. Also need a few other core routines to help out for the OSD. Messes with some keymaps. Some targets need keymaps to access the different views. Some devices can't support the additional view because it requires a large buffer ( > 1 s) for samples. If the plugin buffer is small, they can still use the popup display since the plugin is also much smaller in that case. Slow speed waveform needs some refining so it draws gradually like a real oscilloscope but I'll stick with what it is, for the moment. Change-Id: Ieb5b7922a2238264e9b19a58cb437739194eb036 Reviewed-on: http://gerrit.rockbox.org/245 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/pcm_mixer.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/firmware/export/pcm_mixer.h b/firmware/export/pcm_mixer.h
index 69d2b894df..d424083002 100644
--- a/firmware/export/pcm_mixer.h
+++ b/firmware/export/pcm_mixer.h
@@ -106,7 +106,8 @@ enum channel_status mixer_channel_status(enum pcm_mixer_channel channel);
106size_t mixer_channel_get_bytes_waiting(enum pcm_mixer_channel channel); 106size_t mixer_channel_get_bytes_waiting(enum pcm_mixer_channel channel);
107 107
108/* Return pointer to channel's playing audio data and the size remaining */ 108/* Return pointer to channel's playing audio data and the size remaining */
109const void * mixer_channel_get_buffer(enum pcm_mixer_channel channel, int *count); 109const void * mixer_channel_get_buffer(enum pcm_mixer_channel channel,
110 int *count);
110 111
111/* Calculate peak values for channel */ 112/* Calculate peak values for channel */
112void mixer_channel_calculate_peaks(enum pcm_mixer_channel channel, 113void mixer_channel_calculate_peaks(enum pcm_mixer_channel channel,
@@ -116,6 +117,13 @@ void mixer_channel_calculate_peaks(enum pcm_mixer_channel channel,
116void mixer_adjust_channel_address(enum pcm_mixer_channel channel, 117void mixer_adjust_channel_address(enum pcm_mixer_channel channel,
117 off_t offset); 118 off_t offset);
118 119
120/* Set a hook that is called upon getting a new source buffer for a channel
121 NOTE: Called for each buffer, not each mixer chunk */
122typedef void (*chan_buffer_hook_fn_type)(const void *start, size_t size);
123
124void mixer_channel_set_buffer_hook(enum pcm_mixer_channel channel,
125 chan_buffer_hook_fn_type fn);
126
119/* Stop ALL channels and PCM and reset state */ 127/* Stop ALL channels and PCM and reset state */
120void mixer_reset(void); 128void mixer_reset(void);
121 129