summaryrefslogtreecommitdiff
path: root/apps/shortcuts.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-03-14 23:15:16 +0100
committerThomas Martitz <kugel@rockbox.org>2014-03-14 23:36:30 +0100
commit470989bd708d9a425dbbf2d83b8fcbd0a8d0f488 (patch)
treef3bef37bc0f8ff7da4beddad9903209ced1bc25a /apps/shortcuts.c
parent50f0dd80d660b332a1739e07a630c2cef1b678c6 (diff)
downloadrockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.tar.gz
rockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.zip
events: Rework event subsystem (add_event, send_event) to be more versatile.
add_event_ex is added that takes an extra user_data pointer. This pointer is passed to the callback (add_event and add_event_ex have slightly different callbacks types). All callbacks also get the event id passed. Events added with add_event_ex must be removed with remove_event_ex because the user_data pointer must match in addition to the callback pointer. On the other add_event is simplified to omit the oneshort parameter which was almost always false (still there with add_event_ex). As a side effect the ata_idle_notify callbacks are changed as well, they do not take a data parameter anymore which was always NULL anyway. This commit also adds some documentation to events.h Change-Id: I13e29a0f88ef908f175b376d83550f9e0231f772
Diffstat (limited to 'apps/shortcuts.c')
-rw-r--r--apps/shortcuts.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/shortcuts.c b/apps/shortcuts.c
index ee8454485d..a9ae8248f1 100644
--- a/apps/shortcuts.c
+++ b/apps/shortcuts.c
@@ -184,9 +184,8 @@ static void init_shortcut(struct shortcut* sc)
184 184
185static int first_idx_to_writeback = -1; 185static int first_idx_to_writeback = -1;
186static bool overwrite_shortcuts = false; 186static bool overwrite_shortcuts = false;
187static void shortcuts_ata_idle_callback(void* data) 187static void shortcuts_ata_idle_callback(void)
188{ 188{
189 (void)data;
190 int fd; 189 int fd;
191 char buf[MAX_PATH]; 190 char buf[MAX_PATH];
192 int current_idx = first_idx_to_writeback; 191 int current_idx = first_idx_to_writeback;
@@ -387,7 +386,7 @@ static int shortcut_menu_get_action(int action, struct gui_synclist *lists)
387 gui_synclist_select_item(lists, shortcut_count - 1); 386 gui_synclist_select_item(lists, shortcut_count - 1);
388 first_idx_to_writeback = 0; 387 first_idx_to_writeback = 0;
389 overwrite_shortcuts = true; 388 overwrite_shortcuts = true;
390 shortcuts_ata_idle_callback(NULL); 389 shortcuts_ata_idle_callback();
391 if (shortcut_count == 0) 390 if (shortcut_count == 0)
392 return ACTION_STD_CANCEL; 391 return ACTION_STD_CANCEL;
393 return ACTION_REDRAW; 392 return ACTION_REDRAW;