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

Fix PF keymap issue caused by conflict between new CONTEXT_PLUGIN and ALLOW_SOFTLOCK, by changing value of ALLOW_SOFTLOCK. Bump min plugin version as value passed to a core function changed, and sort plugin API.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21161 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andrew Mahone 2009-06-01 21:08:49 +00:00
parent fd11471a3f
commit c1c3d05961
3 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/action.h
View file

@ -36,7 +36,7 @@
#define LAST_ITEM_IN_LIST__NEXTLIST(a) { a, BUTTON_NONE, BUTTON_NONE }
#ifndef HAS_BUTTON_HOLD
#define ALLOW_SOFTLOCK 0x10000000 /* will be stripped.. never needed except in calls to get_action() */
#define ALLOW_SOFTLOCK 0x08000000 /* will be stripped.. never needed except in calls to get_action() */
#else
#define ALLOW_SOFTLOCK 0
#endif

25
apps/plugin.c
View file

@ -461,6 +461,12 @@ static const struct plugin_api rockbox_api = {
playlist_amount,
playlist_resume,
playlist_start,
playlist_add,
playlist_sync,
playlist_remove_all_tracks,
playlist_create,
playlist_insert_track,
playlist_shuffle,
PREFIX(audio_play),
audio_stop,
audio_pause,
@ -516,6 +522,9 @@ static const struct plugin_api rockbox_api = {
/* action handling */
get_custom_action,
get_action,
#ifdef HAVE_TOUCHSCREEN
action_get_touchscreen_press,
#endif
action_userabort,
/* power */
@ -628,6 +637,9 @@ static const struct plugin_api rockbox_api = {
tagcache_retrieve,
tagcache_search_finish,
tagcache_get_numeric,
#ifdef HAVE_TC_RAMCACHE
tagcache_fill_tags,
#endif
#endif
#ifdef HAVE_ALBUMART
@ -644,19 +656,6 @@ static const struct plugin_api rockbox_api = {
appsversion,
/* new stuff at the end, sort into place next time
the API gets incompatible */
#ifdef HAVE_TOUCHSCREEN
action_get_touchscreen_press,
#endif
#if defined(HAVE_TAGCACHE) && defined(HAVE_TC_RAMCACHE)
tagcache_fill_tags,
#endif
playlist_add,
playlist_sync,
playlist_remove_all_tracks,
playlist_create,
playlist_insert_track,
playlist_shuffle,
};
int plugin_load(const char* plugin, const void* parameter)

27
apps/plugin.h
View file

@ -587,6 +587,13 @@ struct plugin_api {
int (*playlist_amount)(void);
int (*playlist_resume)(void);
void (*playlist_start)(int start_index, int offset);
int (*playlist_add)(const char *filename);
void (*playlist_sync)(struct playlist_info* playlist);
int (*playlist_remove_all_tracks)(struct playlist_info *playlist);
int (*playlist_create)(const char *dir, const char *file);
int (*playlist_insert_track)(struct playlist_info* playlist,
const char *filename, int position, bool queue, bool sync);
int (*playlist_shuffle)(int random_seed, int start_index);
void (*audio_play)(long offset);
void (*audio_stop)(void);
void (*audio_pause)(void);
@ -657,6 +664,9 @@ struct plugin_api {
int (*get_custom_action)(int context,int timeout,
const struct button_mapping* (*get_context_map)(int));
int (*get_action)(int context, int timeout);
#ifdef HAVE_TOUCHSCREEN
int (*action_get_touchscreen_press)(short *x, short *y);
#endif
bool (*action_userabort)(int timeout);
/* power */
@ -789,6 +799,9 @@ struct plugin_api {
int tag, char *buf, long size);
void (*tagcache_search_finish)(struct tagcache_search *tcs);
long (*tagcache_get_numeric)(const struct tagcache_search *tcs, int tag);
#ifdef HAVE_TC_RAMCACHE
bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename);
#endif
#endif
#ifdef HAVE_ALBUMART
@ -806,20 +819,6 @@ struct plugin_api {
const char *appsversion;
/* new stuff at the end, sort into place next time
the API gets incompatible */
#ifdef HAVE_TOUCHSCREEN
int (*action_get_touchscreen_press)(short *x, short *y);
#endif
#if defined(HAVE_TAGCACHE) && defined(HAVE_TC_RAMCACHE)
bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename);
#endif
int (*playlist_add)(const char *filename);
void (*playlist_sync)(struct playlist_info* playlist);
int (*playlist_remove_all_tracks)(struct playlist_info *playlist);
int (*playlist_create)(const char *dir, const char *file);
int (*playlist_insert_track)(struct playlist_info* playlist,
const char *filename, int position, bool queue, bool sync);
int (*playlist_shuffle)(int random_seed, int start_index);
};
/* plugin header */