From 31b712286721dd606940c7b557d03e3f714b9604 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sun, 14 Jul 2013 07:59:39 -0400 Subject: Implement time-based resume and playback start. This complements offset-based resume and playback start funcionality. The implementation is global on both HWCODEC and SWCODEC. Basically, if either the specified elapsed or offset are non-zero, it indicates a mid-track resume. To resume by time only, set elapsed to nonzero and offset to zero. To resume by offset only, set offset to nonzero and elapsed to zero. Which one the codec uses and which has priority is up to the codec; however, using an elapsed time covers more cases: * Codecs not able to use an offset such as VGM or other atomic formats * Starting playback at a nonzero elapsed time from a source that contains no offset, such as a cuesheet The change re-versions pretty much everything from tagcache to nvram. Change-Id: Ic7aebb24e99a03ae99585c5e236eba960d163f38 Reviewed-on: http://gerrit.rockbox.org/516 Reviewed-by: Michael Sevakis Tested: Michael Sevakis --- apps/plugin.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'apps/plugin.h') diff --git a/apps/plugin.h b/apps/plugin.h index 764af4a6b7..ffdfa8fb77 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -160,12 +160,12 @@ 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 226 +#define PLUGIN_API_VERSION 227 /* update this to latest version if a change to the api struct breaks backwards compatibility (and please take the opportunity to sort in any new function which are "waiting" at the end of the function table) */ -#define PLUGIN_MIN_API_VERSION 226 +#define PLUGIN_MIN_API_VERSION 227 /* plugin return codes */ /* internal returns start at 0x100 to make exit(1..255) work */ @@ -723,8 +723,10 @@ struct plugin_api { /* playback control */ int (*playlist_amount)(void); int (*playlist_resume)(void); - void (*playlist_resume_track)(int start_index, unsigned int crc, int offset); - void (*playlist_start)(int start_index, int offset); + void (*playlist_resume_track)(int start_index, unsigned int crc, + unsigned long elapsed, unsigned long offset); + void (*playlist_start)(int start_index, unsigned long elapsed, + unsigned long offset); int (*playlist_add)(const char *filename); void (*playlist_sync)(struct playlist_info* playlist); int (*playlist_remove_all_tracks)(struct playlist_info *playlist); @@ -735,7 +737,7 @@ struct plugin_api { const char *dirname, int position, bool queue, bool recurse); int (*playlist_shuffle)(int random_seed, int start_index); - void (*audio_play)(long offset); + void (*audio_play)(unsigned long elapsed, unsigned long offset); void (*audio_stop)(void); void (*audio_pause)(void); void (*audio_resume)(void); -- cgit v1.2.3