diff options
-rw-r--r-- | apps/action.h | 2 | ||||
-rw-r--r-- | apps/plugin.c | 25 | ||||
-rw-r--r-- | apps/plugin.h | 27 |
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 @@ | |||
36 | #define LAST_ITEM_IN_LIST__NEXTLIST(a) { a, BUTTON_NONE, BUTTON_NONE } | 36 | #define LAST_ITEM_IN_LIST__NEXTLIST(a) { a, BUTTON_NONE, BUTTON_NONE } |
37 | 37 | ||
38 | #ifndef HAS_BUTTON_HOLD | 38 | #ifndef HAS_BUTTON_HOLD |
39 | #define ALLOW_SOFTLOCK 0x10000000 /* will be stripped.. never needed except in calls to get_action() */ | 39 | #define ALLOW_SOFTLOCK 0x08000000 /* will be stripped.. never needed except in calls to get_action() */ |
40 | #else | 40 | #else |
41 | #define ALLOW_SOFTLOCK 0 | 41 | #define ALLOW_SOFTLOCK 0 |
42 | #endif | 42 | #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 = { | |||
461 | playlist_amount, | 461 | playlist_amount, |
462 | playlist_resume, | 462 | playlist_resume, |
463 | playlist_start, | 463 | playlist_start, |
464 | playlist_add, | ||
465 | playlist_sync, | ||
466 | playlist_remove_all_tracks, | ||
467 | playlist_create, | ||
468 | playlist_insert_track, | ||
469 | playlist_shuffle, | ||
464 | PREFIX(audio_play), | 470 | PREFIX(audio_play), |
465 | audio_stop, | 471 | audio_stop, |
466 | audio_pause, | 472 | audio_pause, |
@@ -516,6 +522,9 @@ static const struct plugin_api rockbox_api = { | |||
516 | /* action handling */ | 522 | /* action handling */ |
517 | get_custom_action, | 523 | get_custom_action, |
518 | get_action, | 524 | get_action, |
525 | #ifdef HAVE_TOUCHSCREEN | ||
526 | action_get_touchscreen_press, | ||
527 | #endif | ||
519 | action_userabort, | 528 | action_userabort, |
520 | 529 | ||
521 | /* power */ | 530 | /* power */ |
@@ -628,6 +637,9 @@ static const struct plugin_api rockbox_api = { | |||
628 | tagcache_retrieve, | 637 | tagcache_retrieve, |
629 | tagcache_search_finish, | 638 | tagcache_search_finish, |
630 | tagcache_get_numeric, | 639 | tagcache_get_numeric, |
640 | #ifdef HAVE_TC_RAMCACHE | ||
641 | tagcache_fill_tags, | ||
642 | #endif | ||
631 | #endif | 643 | #endif |
632 | 644 | ||
633 | #ifdef HAVE_ALBUMART | 645 | #ifdef HAVE_ALBUMART |
@@ -644,19 +656,6 @@ static const struct plugin_api rockbox_api = { | |||
644 | appsversion, | 656 | appsversion, |
645 | /* new stuff at the end, sort into place next time | 657 | /* new stuff at the end, sort into place next time |
646 | the API gets incompatible */ | 658 | the API gets incompatible */ |
647 | |||
648 | #ifdef HAVE_TOUCHSCREEN | ||
649 | action_get_touchscreen_press, | ||
650 | #endif | ||
651 | #if defined(HAVE_TAGCACHE) && defined(HAVE_TC_RAMCACHE) | ||
652 | tagcache_fill_tags, | ||
653 | #endif | ||
654 | playlist_add, | ||
655 | playlist_sync, | ||
656 | playlist_remove_all_tracks, | ||
657 | playlist_create, | ||
658 | playlist_insert_track, | ||
659 | playlist_shuffle, | ||
660 | }; | 659 | }; |
661 | 660 | ||
662 | int plugin_load(const char* plugin, const void* parameter) | 661 | 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 { | |||
587 | int (*playlist_amount)(void); | 587 | int (*playlist_amount)(void); |
588 | int (*playlist_resume)(void); | 588 | int (*playlist_resume)(void); |
589 | void (*playlist_start)(int start_index, int offset); | 589 | void (*playlist_start)(int start_index, int offset); |
590 | int (*playlist_add)(const char *filename); | ||
591 | void (*playlist_sync)(struct playlist_info* playlist); | ||
592 | int (*playlist_remove_all_tracks)(struct playlist_info *playlist); | ||
593 | int (*playlist_create)(const char *dir, const char *file); | ||
594 | int (*playlist_insert_track)(struct playlist_info* playlist, | ||
595 | const char *filename, int position, bool queue, bool sync); | ||
596 | int (*playlist_shuffle)(int random_seed, int start_index); | ||
590 | void (*audio_play)(long offset); | 597 | void (*audio_play)(long offset); |
591 | void (*audio_stop)(void); | 598 | void (*audio_stop)(void); |
592 | void (*audio_pause)(void); | 599 | void (*audio_pause)(void); |
@@ -657,6 +664,9 @@ struct plugin_api { | |||
657 | int (*get_custom_action)(int context,int timeout, | 664 | int (*get_custom_action)(int context,int timeout, |
658 | const struct button_mapping* (*get_context_map)(int)); | 665 | const struct button_mapping* (*get_context_map)(int)); |
659 | int (*get_action)(int context, int timeout); | 666 | int (*get_action)(int context, int timeout); |
667 | #ifdef HAVE_TOUCHSCREEN | ||
668 | int (*action_get_touchscreen_press)(short *x, short *y); | ||
669 | #endif | ||
660 | bool (*action_userabort)(int timeout); | 670 | bool (*action_userabort)(int timeout); |
661 | 671 | ||
662 | /* power */ | 672 | /* power */ |
@@ -789,6 +799,9 @@ struct plugin_api { | |||
789 | int tag, char *buf, long size); | 799 | int tag, char *buf, long size); |
790 | void (*tagcache_search_finish)(struct tagcache_search *tcs); | 800 | void (*tagcache_search_finish)(struct tagcache_search *tcs); |
791 | long (*tagcache_get_numeric)(const struct tagcache_search *tcs, int tag); | 801 | long (*tagcache_get_numeric)(const struct tagcache_search *tcs, int tag); |
802 | #ifdef HAVE_TC_RAMCACHE | ||
803 | bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename); | ||
804 | #endif | ||
792 | #endif | 805 | #endif |
793 | 806 | ||
794 | #ifdef HAVE_ALBUMART | 807 | #ifdef HAVE_ALBUMART |
@@ -806,20 +819,6 @@ struct plugin_api { | |||
806 | const char *appsversion; | 819 | const char *appsversion; |
807 | /* new stuff at the end, sort into place next time | 820 | /* new stuff at the end, sort into place next time |
808 | the API gets incompatible */ | 821 | the API gets incompatible */ |
809 | |||
810 | #ifdef HAVE_TOUCHSCREEN | ||
811 | int (*action_get_touchscreen_press)(short *x, short *y); | ||
812 | #endif | ||
813 | #if defined(HAVE_TAGCACHE) && defined(HAVE_TC_RAMCACHE) | ||
814 | bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename); | ||
815 | #endif | ||
816 | int (*playlist_add)(const char *filename); | ||
817 | void (*playlist_sync)(struct playlist_info* playlist); | ||
818 | int (*playlist_remove_all_tracks)(struct playlist_info *playlist); | ||
819 | int (*playlist_create)(const char *dir, const char *file); | ||
820 | int (*playlist_insert_track)(struct playlist_info* playlist, | ||
821 | const char *filename, int position, bool queue, bool sync); | ||
822 | int (*playlist_shuffle)(int random_seed, int start_index); | ||
823 | }; | 822 | }; |
824 | 823 | ||
825 | /* plugin header */ | 824 | /* plugin header */ |