summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-06-01 21:08:49 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-06-01 21:08:49 +0000
commitc1c3d05961388114779c6fd8316ab1d081a3b4b1 (patch)
treeabd18c238922d61233346d107eae087f5283bd2d /apps
parentfd11471a3f9bfbb5f5bdf22866e861bae56ad8ea (diff)
downloadrockbox-c1c3d05961388114779c6fd8316ab1d081a3b4b1.tar.gz
rockbox-c1c3d05961388114779c6fd8316ab1d081a3b4b1.tar.bz2
rockbox-c1c3d05961388114779c6fd8316ab1d081a3b4b1.zip
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.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21161 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/action.h2
-rw-r--r--apps/plugin.c25
-rw-r--r--apps/plugin.h27
3 files changed, 26 insertions, 28 deletions
diff --git a/apps/action.h b/apps/action.h
index 616fad57e9..61c214c609 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -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
diff --git a/apps/plugin.c b/apps/plugin.c
index eba2c28b33..c4e5a0bb0f 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -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)
diff --git a/apps/plugin.h b/apps/plugin.h
index 6c2c903308..105be0bfe2 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -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 */