From 023f6b6efd5407dc77c1253789f61baabb6607d6 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 12 Jul 2013 12:06:38 -0400 Subject: Get rid of some superfluous single-purpose functions in playback. * Remove explicit tracking of elapsed time of previous track. * Remove function to obtain auto skip flag. * Most playback events now carry the extra information instead and pass 'struct track_event *' for data. * Tweak scrobbler to use PLAYBACK_EVENT_TRACK_FINISH, which makes it cleaner and removes the struct mp3entry. Change-Id: I500d2abb4056a32646496efc3617406e36811ec5 --- apps/appevents.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'apps/appevents.h') diff --git a/apps/appevents.h b/apps/appevents.h index 506f00329b..8677dbd522 100644 --- a/apps/appevents.h +++ b/apps/appevents.h @@ -31,21 +31,29 @@ /** Playback events **/ enum { - /* Playback is starting from a stopped state */ + /* Playback is starting from a stopped state + data = NULL */ PLAYBACK_EVENT_START_PLAYBACK = (EVENT_CLASS_PLAYBACK|1), - /* Audio has begun buffering for decoding track (or is already completed) */ + /* Audio has begun buffering for decoding track (or is already completed) + data = &(struct track_event){} */ PLAYBACK_EVENT_TRACK_BUFFER, - /* Handles for current user track are ready (other than audio or codec) */ + /* Handles for current user track are ready (other than audio or codec) + data = &(struct track_event){} */ PLAYBACK_EVENT_CUR_TRACK_READY, - /* Current user track finished */ + /* Current user track finished + data = &(struct track_event){} */ PLAYBACK_EVENT_TRACK_FINISH, - /* A new current user track has begun */ + /* A new current user track has begun + data = &(struct track_event){} */ PLAYBACK_EVENT_TRACK_CHANGE, - /* A manual skip is about to be processed */ + /* A manual skip is about to be processed + data = NULL */ PLAYBACK_EVENT_TRACK_SKIP, - /* Next track medadata was just loaded */ + /* Next track medadata was just loaded + data = &(struct track_event){} */ PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, - /* Voice is playing: data = &(bool){true|false} */ + /* Voice is playing + data = &(bool){true|false} */ PLAYBACK_EVENT_VOICE_PLAYING, }; -- cgit v1.2.3