Have mpegplayer use the mixer (the playback channel, since it's mutually exclusive to audio playback) so the clicks and skip beep can be used according to user settings. Introduce some system sound functions to make easier playing event sounds from various places and convert files calling 'beep_play' to use 'system_sound_play' and 'keyclick_click'. Event sound could be become themeable.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30130 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 11 insertions, 1 deletions

diff --git a/apps/plugin.h b/apps/plugin.h
index 77c8e831d4..e9c0c64a00 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -146,7 +146,7 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 207
+#define PLUGIN_API_VERSION 208
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
@@ -913,6 +913,16 @@ struct plugin_api {
     void * (*mixer_channel_get_buffer)(enum pcm_mixer_channel channel, int *count);
     void (*mixer_channel_calculate_peaks)(enum pcm_mixer_channel channel,
                                           int *left, int *right);
+    void (*mixer_channel_play_data)(enum pcm_mixer_channel channel,
+                                    pcm_play_callback_type get_more,
+                                    unsigned char *start, size_t size);
+    void (*mixer_channel_play_pause)(enum pcm_mixer_channel channel, bool play);
+    void (*mixer_channel_stop)(enum pcm_mixer_channel channel);
+    void (*mixer_channel_set_amplitude)(enum pcm_mixer_channel channel,
+                                        unsigned int amplitude);
+    size_t (*mixer_channel_get_bytes_waiting)(enum pcm_mixer_channel channel);
+    void (*system_sound_play)(enum system_sound sound);
+    void (*keyclick_click)(int button);
 #endif
 };