7 files changed, 21 insertions, 117 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 3911223d2d..e5df04a460 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -8191,29 +8191,27 @@
 </phrase>
 <phrase>
   id: LANG_SETTINGS_SAVE_FAILED
-  desc: displayed if save settings has failed
+  desc: DEPRECATED
   user:
   <source>
-    *: "Save Failed"
+    *: ""
   </source>
   <dest>
-    *: "Save Failed"
+    *: ""
   </dest>
   <voice>
-    *: "Save Failed"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_SETTINGS_PARTITION
-  desc: if save settings has failed
+  desc: DEPRECATED
   user:
   <source>
-    *: "No partition?"
-    player: "Partition?"
+    *: ""
   </source>
   <dest>
-    *: "No partition?"
-    player: "Partition?"
+    *: ""
   </dest>
   <voice>
     *: ""
diff --git a/apps/main.c b/apps/main.c
index 598597520f..5dd92e5e02 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include "ata.h"
-#include "ata_idle_notify.h"
 #include "disk.h"
 #include "fat.h"
 #include "lcd.h"
@@ -428,7 +427,6 @@ static void init(void)
     }
 #endif
 
-    ata_idle_notify_init();
     rc = ata_init();
     if(rc)
     {
diff --git a/apps/playback.c b/apps/playback.c
index b36f68f135..ee1787e612 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -245,13 +245,6 @@ static bool skipped_during_pause = false; /* Do we need to clear the PCM buffer
  */
 static bool codec_requested_stop = false;
 
-struct playback_event {
-    enum PLAYBACK_EVENT_TYPE type;
-    void (*callback)(void *data);
-};
-
-struct playback_event events[PLAYBACK_MAX_EVENTS];
-
 static size_t buffer_margin  = 0; /* Buffer margin aka anti-skip buffer (A/C-) */
 
 /* Multiple threads */
@@ -1447,51 +1440,6 @@ static void codec_thread(void)
 
 /* --- Audio thread --- */
 
-void playback_add_event(enum PLAYBACK_EVENT_TYPE type, void (*handler))
-{
-    int i;
-    
-    /* Try to find a free slot. */
-    for (i = 0; i < PLAYBACK_MAX_EVENTS; i++)
-    {
-        if (events[i].callback == NULL)
-        {
-            events[i].type = type;
-            events[i].callback = handler;
-            return;
-        }
-    }
-    
-    panicf("playback event line full");
-}
-
-void playback_remove_event(enum PLAYBACK_EVENT_TYPE type, void (*handler))
-{
-    int i;
-    
-    for (i = 0; i < PLAYBACK_MAX_EVENTS; i++)
-    {
-        if (events[i].type == type && events[i].callback == handler)
-        {
-            events[i].callback = NULL;
-            return;
-        }
-    }
-    
-    panicf("playback event not found");
-}
-
-static void send_event(enum PLAYBACK_EVENT_TYPE type, void *data)
-{
-    int i;
-    
-    for (i = 0; i < PLAYBACK_MAX_EVENTS; i++)
-    {
-        if (events[i].type == type && events[i].callback != NULL)
-            events[i].callback(data);
-    }
-}
-
 static bool audio_have_tracks(void)
 {
     return (audio_track_count() != 0);
@@ -1783,7 +1731,7 @@ static bool audio_load_track(int offset, bool start_play)
     {
         if (get_metadata(&id3, fd, trackname))
         {
-            send_event(PLAYBACK_EVENT_TRACK_BUFFER, &id3);
+            send_event(PLAYBACK_EVENT_TRACK_BUFFER, false, &id3);
             
             tracks[track_widx].id3_hid =
                 bufalloc(&id3, sizeof(struct mp3entry), TYPE_ID3);
@@ -2020,7 +1968,7 @@ static int audio_check_new_track(void)
     bool end_of_playlist;  /* Temporary flag, not the same as playlist_end */
 
     /* Now it's good time to send track unbuffer events. */
-    send_event(PLAYBACK_EVENT_TRACK_FINISH, &curtrack_id3);
+    send_event(PLAYBACK_EVENT_TRACK_FINISH, false, &curtrack_id3);
     
     if (dir_skip)
     {
@@ -2391,7 +2339,7 @@ static void audio_finalise_track_change(void)
         bufgetid3(prev_ti->id3_hid)->elapsed = 0;
     }
 
-    send_event(PLAYBACK_EVENT_TRACK_CHANGE, &curtrack_id3);
+    send_event(PLAYBACK_EVENT_TRACK_CHANGE, false, &curtrack_id3);
 
     track_changed = true;
     playlist_update_resume_info(audio_current_track());
diff --git a/apps/playback.h b/apps/playback.h
index 14ba35cea4..0b78eb3bcb 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -24,6 +24,7 @@
 
 #include "id3.h"
 #include "mp3data.h"
+#include "events.h"
 
 #define CODEC_IDX_AUDIO     0
 #define CODEC_IDX_VOICE     1
@@ -39,13 +40,6 @@
 
 #define MAX_TRACK_MASK  (MAX_TRACK-1)
 
-#define PLAYBACK_MAX_EVENTS  4
-enum PLAYBACK_EVENT_TYPE {
-    PLAYBACK_EVENT_TRACK_BUFFER,
-    PLAYBACK_EVENT_TRACK_FINISH,
-    PLAYBACK_EVENT_TRACK_CHANGE,
-};
-
 /* Functions */
 const char * get_codec_filename(int cod_spec);
 void voice_wait(void);
@@ -53,13 +47,7 @@ void voice_wait(void);
 #if CONFIG_CODEC == SWCODEC /* This #ifdef is better here than gui/gwps.c */
 extern void audio_next_dir(void);
 extern void audio_prev_dir(void);
-void playback_add_event(enum PLAYBACK_EVENT_TYPE type, void (*handler));
-void playback_remove_event(enum PLAYBACK_EVENT_TYPE type, void (*handler));
 #else
-/* Really, should get rid of these HWCODEC api definitions here. */
-void audio_set_track_changed_event(void (*handler)(struct mp3entry *id3));
-void audio_set_track_buffer_event(void (*handler)(struct mp3entry *id3));
-void audio_set_track_unbuffer_event(void (*handler)(struct mp3entry *id3));
 # define audio_next_dir() 
 #define audio_prev_dir()
 #endif
diff --git a/apps/scrobbler.c b/apps/scrobbler.c
index 16869bf18f..2f60e858e1 100644
--- a/apps/scrobbler.c
+++ b/apps/scrobbler.c
@@ -183,7 +183,10 @@ static void add_to_cache(unsigned long play_length)
     } else {
         cache_pos++;
         if (!scrobbler_ata_callback)
-            scrobbler_ata_callback = register_ata_idle_func(scrobbler_flush_callback);
+        {
+            register_ata_idle_func(scrobbler_flush_callback);
+            scrobbler_ata_callback = true;
+        }
     }
 
 }
@@ -224,11 +227,7 @@ int scrobbler_init(void)
 
     scrobbler_cache = buffer_alloc(SCROBBLER_MAX_CACHE*SCROBBLER_CACHE_LEN);
 
-#if CONFIG_CODEC == SWCODEC
-    playback_add_event(PLAYBACK_EVENT_TRACK_CHANGE, scrobbler_change_event);
-#else
-    audio_set_track_changed_event(&scrobbler_change_event);
-#endif
+    add_event(PLAYBACK_EVENT_TRACK_CHANGE, scrobbler_change_event);
     cache_pos = 0;
     pending = false;
     scrobbler_initialised = true;
@@ -263,11 +262,7 @@ void scrobbler_shutdown(void)
 
     if (scrobbler_initialised)
     {
-#if CONFIG_CODEC == SWCODEC
-        playback_remove_event(PLAYBACK_EVENT_TRACK_CHANGE, scrobbler_change_event);
-#else
-        audio_set_track_changed_event(NULL);
-#endif
+        remove_event(PLAYBACK_EVENT_TRACK_CHANGE, scrobbler_change_event);
         scrobbler_initialised = false;
     }
 }
diff --git a/apps/settings.c b/apps/settings.c
index 27832b427f..7eec15baf3 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -601,25 +601,7 @@ int settings_save( void )
        target doesnt have rtc ram */
     write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE);
 #endif
-    if(!register_ata_idle_func(flush_config_block_callback))
-    {
-        int i;
-        FOR_NB_SCREENS(i)
-        {
-            screens[i].clear_display();
-#ifdef HAVE_LCD_CHARCELLS
-            screens[i].puts(0, 0, str(LANG_SETTINGS_SAVE_FAILED));
-            screens[i].puts(0, 1, str(LANG_SETTINGS_PARTITION));
-#else
-            screens[i].puts(4, 2, str(LANG_SETTINGS_SAVE_FAILED));
-            screens[i].puts(2, 4, str(LANG_SETTINGS_PARTITION));
-            screens[i].update();
-#endif
-        }
-        cond_talk_ids_fq(LANG_SETTINGS_SAVE_FAILED);
-        sleep(HZ*2);
-        return -1;
-    }
+    register_ata_idle_func(flush_config_block_callback);
     return 0;
 }
 bool settings_save_config(int options)
diff --git a/apps/tagtree.c b/apps/tagtree.c
index c5e3ebff1e..4572204ae5 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -924,14 +924,9 @@ void tagtree_init(void)
         root_menu = 0;
     
     uniqbuf = buffer_alloc(UNIQBUF_SIZE);
-#if CONFIG_CODEC == SWCODEC
-    playback_add_event(PLAYBACK_EVENT_TRACK_BUFFER, tagtree_buffer_event);
-    playback_add_event(PLAYBACK_EVENT_TRACK_FINISH, tagtree_track_finish_event);
-#else
-    audio_set_track_buffer_event(tagtree_buffer_event);
-    audio_set_track_unbuffer_event(tagtree_track_finish_event);
-#endif
-    
+
+    add_event(PLAYBACK_EVENT_TRACK_BUFFER, tagtree_buffer_event);
+    add_event(PLAYBACK_EVENT_TRACK_FINISH, tagtree_track_finish_event);
 }
 
 static bool show_search_progress(bool init, int count)