summaryrefslogtreecommitdiffstats
path: root/apps/misc.h
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-07-08 22:31:15 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-07-08 22:31:15 +0000
commit5663e1cd0afc62e212c43c8fb374c791d554fb1b (patch)
tree488e7cc83aaf2ee61184fad46a3b4891a95b0f13 /apps/misc.h
parentf1a5a25dac4c61bf178ee5361998d205bb71b2d1 (diff)
downloadrockbox-5663e1cd0afc62e212c43c8fb374c791d554fb1b.tar.gz
rockbox-5663e1cd0afc62e212c43c8fb374c791d554fb1b.tar.bz2
rockbox-5663e1cd0afc62e212c43c8fb374c791d554fb1b.zip
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
Diffstat (limited to 'apps/misc.h')
-rw-r--r--apps/misc.h22
1 files changed, 19 insertions, 3 deletions
diff --git a/apps/misc.h b/apps/misc.h
index c3c52d13e0..7ea5360db5 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -100,9 +100,6 @@ int clamp_value_wrap(int value, int max, int min);
#endif
#endif
-void beep_play(unsigned int frequency, unsigned int duration,
- unsigned int amplitude);
-
enum current_activity {
ACTIVITY_UNKNOWN = 0,
ACTIVITY_MAINMENU,
@@ -118,6 +115,25 @@ enum current_activity {
ACTIVITY_PITCHSCREEN,
ACTIVITY_OPTIONSELECT
};
+
+#if CONFIG_CODEC == SWCODEC
+void beep_play(unsigned int frequency, unsigned int duration,
+ unsigned int amplitude);
+
+enum system_sound
+{
+ SOUND_KEYCLICK = 0,
+ SOUND_TRACK_SKIP,
+ SOUND_TRACK_NO_MORE,
+};
+
+/* Play a standard sound */
+void system_sound_play(enum system_sound sound);
+
+/* Produce keyclick based upon button and global settings */
+void keyclick_click(int button);
+#endif /* CONFIG_CODEC == SWCODEC */
+
void push_current_activity(enum current_activity screen);
void pop_current_activity(void);
enum current_activity get_current_activity(void);