Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Workaround an occasional problem where album art or cuesheets might not be ready by the time the track change event is send which can result in the WPS not immediately being aware that the handles are ready. A better solution will be sought that hopefully doesn't require the additional event.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29923 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-05-25 08:35:31 +00:00
parent 2e3162f039
commit caf907eef1
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/appevents.h
View file

@ -31,11 +31,19 @@
/** Playback events **/
enum {
/* Playback is starting from a stopped state */
PLAYBACK_EVENT_START_PLAYBACK = (EVENT_CLASS_PLAYBACK|1),
/* Audio has begun buffering for decoding track (or is already completed) */
PLAYBACK_EVENT_TRACK_BUFFER,
/* Handles for current user track are ready (other than audio or codec) */
PLAYBACK_EVENT_CUR_TRACK_READY,
/* Current user track finished */
PLAYBACK_EVENT_TRACK_FINISH,
/* A new current user track has begun */
PLAYBACK_EVENT_TRACK_CHANGE,
/* A manual skip is about to be processed */
PLAYBACK_EVENT_TRACK_SKIP,
/* Next track medadata was just loaded */
PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE,
};

5
apps/gui/wps.c
View file

@ -1203,6 +1203,11 @@ static void wps_state_init(void)
/* add the WPS track event callbacks */
add_event(PLAYBACK_EVENT_TRACK_CHANGE, false, track_changed_callback);
add_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, false, nextid3available_callback);
#if CONFIG_CODEC == SWCODEC
/* Use the same callback as ..._TRACK_CHANGE for when remaining handles have
finished */
add_event(PLAYBACK_EVENT_CUR_TRACK_READY, false, track_changed_callback);
#endif
#ifdef AUDIO_FAST_SKIP_PREVIEW
add_event(PLAYBACK_EVENT_TRACK_SKIP, false, track_skip_callback);
#endif

11
apps/playback.c
View file

@ -1716,6 +1716,17 @@ static int audio_finish_load_track(struct track_info *info)
}
#endif
/* All handles available to external routines are ready - audio and codec
information is private */
if (info == track_list_user_current(0))
{
/* Send only when the track handles could not all be opened ahead of
time for the user's current track - otherwise everything is ready
by the time PLAYBACK_EVENT_TRACK_CHANGE is sent */
send_event(PLAYBACK_EVENT_CUR_TRACK_READY, id3_get(PLAYING_ID3));
}
#ifdef HAVE_CODEC_BUFFERING
/* Try to buffer a codec for the track */
if (info != cur_info && !audio_buffer_codec(info, track_id3))