5 files changed, 9 insertions, 7 deletions

diff --git a/apps/codec_thread.c b/apps/codec_thread.c
index f166f2ba18..6f15ba1fb3 100644
--- a/apps/codec_thread.c
+++ b/apps/codec_thread.c
@@ -567,7 +567,7 @@ void codec_thread_resume(void)
 
 bool is_codec_thread(void)
 {
-    return thread_get_current() == codec_thread_id;
+    return thread_self() == codec_thread_id;
 }
 
 #ifdef HAVE_PRIORITY_SCHEDULING
diff --git a/apps/plugin.c b/apps/plugin.c
index 192488ef81..3807ad5d76 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -779,6 +779,7 @@ static const struct plugin_api rockbox_api = {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
+    thread_self,
 };
 
 int plugin_load(const char* plugin, const void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 2275b309d7..43b9818ffd 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -145,7 +145,7 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 200
+#define PLUGIN_API_VERSION 201
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
@@ -909,6 +909,7 @@ struct plugin_api {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
+    unsigned int (*thread_self)(void);
 };
 
 /* plugin header */
diff --git a/apps/plugins/mpegplayer/audio_thread.c b/apps/plugins/mpegplayer/audio_thread.c
index 45fa7257ef..f976fd6007 100644
--- a/apps/plugins/mpegplayer/audio_thread.c
+++ b/apps/plugins/mpegplayer/audio_thread.c
@@ -468,7 +468,7 @@ static void audio_thread(void)
     struct audio_thread_data td;
 #ifdef HAVE_PRIORITY_SCHEDULING
     /* Up the priority since the core DSP over-yields internally */
-    int old_priority = rb->thread_set_priority(THREAD_ID_CURRENT,
+    int old_priority = rb->thread_set_priority(rb->thread_self(),
                                                PRIORITY_PLAYBACK-4);
 #endif
 
@@ -514,7 +514,7 @@ static void audio_thread(void)
             default:
             {
 #ifdef HAVE_PRIORITY_SCHEDULING
-                rb->thread_set_priority(THREAD_ID_CURRENT, old_priority);
+                rb->thread_set_priority(rb->thread_self(), old_priority);
 #endif
                 return;
                 }
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index 8c9207f232..8a832e409c 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -897,8 +897,8 @@ static void pcmrec_flush(unsigned flush_num)
                priority until finished */
             logf("pcmrec: boost (%s)",
                  num >= flood_watermark ? "num" : "time");
-            prio_pcmrec = thread_set_priority(THREAD_ID_CURRENT,
-                                thread_get_priority(THREAD_ID_CURRENT) - 4);
+            prio_pcmrec = thread_set_priority(thread_self(),
+                                thread_get_priority(thread_self()) - 4);
             prio_codec = codec_thread_set_priority(
                                 codec_thread_get_priority() - 4);
         }
@@ -950,7 +950,7 @@ static void pcmrec_flush(unsigned flush_num)
     {
         /* return to original priorities */
         logf("pcmrec: unboost priority");
-        thread_set_priority(THREAD_ID_CURRENT, prio_pcmrec);
+        thread_set_priority(thread_self(), prio_pcmrec);
         codec_thread_set_priority(prio_codec);
     }