From b7d5e6802616927b31f6cd4d8991f21077c242b6 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sun, 7 May 2017 14:44:47 +0200
Subject: [PATCH] - Using now os_usleep instead of usleep

---
 src/Application.cpp         | 2 +-
 src/controller_patcher      | 2 +-
 src/dynamic_libs            | 2 +-
 src/gui/GuiImageAsync.cpp   | 2 +-
 src/gui/GuiSound.cpp        | 2 +-
 src/main.cpp                | 4 ++--
 src/sounds/Mp3Decoder.cpp   | 2 +-
 src/sounds/OggDecoder.cpp   | 2 +-
 src/sounds/SoundDecoder.cpp | 2 +-
 src/sounds/SoundHandler.cpp | 4 ++--
 src/utils/logger.c          | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index e8ef1be..b72bafd 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -69,7 +69,7 @@ Application::~Application(){
         log_printf("Application::~Application(line %d): Triggering AsyncDeleter\n",__LINE__);
         AsyncDeleter::triggerDeleteProcess();
         while(!AsyncDeleter::realListEmpty()){
-            usleep(1000);
+            os_usleep(1000);
         }
     }while(!AsyncDeleter::deleteListEmpty());
     AsyncDeleter::destroyInstance();
diff --git a/src/controller_patcher b/src/controller_patcher
index 5c7be02..3559a18 160000
--- a/src/controller_patcher
+++ b/src/controller_patcher
@@ -1 +1 @@
-Subproject commit 5c7be021d07e7d482accabbe686e3ff5927dde6b
+Subproject commit 3559a18408126682d25ffe51ff6a43f99119e441
diff --git a/src/dynamic_libs b/src/dynamic_libs
index 64f2253..a2f4abd 160000
--- a/src/dynamic_libs
+++ b/src/dynamic_libs
@@ -1 +1 @@
-Subproject commit 64f225382a6b832458e3bcf054418c23edce4f1b
+Subproject commit a2f4abdbebedce82e36d10635d25d22038169795
diff --git a/src/gui/GuiImageAsync.cpp b/src/gui/GuiImageAsync.cpp
index 9b33689..158a724 100644
--- a/src/gui/GuiImageAsync.cpp
+++ b/src/gui/GuiImageAsync.cpp
@@ -50,7 +50,7 @@ GuiImageAsync::~GuiImageAsync()
 {
 	threadRemoveImage(this);
 	while(pInUse == this)
-        usleep(1000);
+        os_usleep(1000);
 
 	if (imgData)
         delete imgData;
diff --git a/src/gui/GuiSound.cpp b/src/gui/GuiSound.cpp
index e4214b8..f88950d 100644
--- a/src/gui/GuiSound.cpp
+++ b/src/gui/GuiSound.cpp
@@ -126,7 +126,7 @@ void GuiSound::Stop()
             v->setState(Voice::STATE_STOP);
 
         while(v->getState() != Voice::STATE_STOPPED)
-            usleep(1000);
+            os_usleep(1000);
     }
 
     SoundDecoder * decoder = SoundHandler::instance()->getDecoder(voice);
diff --git a/src/main.cpp b/src/main.cpp
index 6a5ffa7..3850de8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-#include "Application.h"
+#include "Application.h"
 #include "dynamic_libs/os_functions.h"
 #include "dynamic_libs/gx2_functions.h"
 #include "dynamic_libs/syshid_functions.h"
@@ -192,7 +192,7 @@ bool SplashScreen(s32 time,const char * message,u8 pos,u32 button){
             i = times;
         }
         i++;
-        usleep(sleepingtime);
+        os_usleep(sleepingtime);
     }
     return result;
 }
diff --git a/src/sounds/Mp3Decoder.cpp b/src/sounds/Mp3Decoder.cpp
index ed9df1d..90c17c2 100644
--- a/src/sounds/Mp3Decoder.cpp
+++ b/src/sounds/Mp3Decoder.cpp
@@ -68,7 +68,7 @@ Mp3Decoder::~Mp3Decoder()
 {
 	ExitRequested = true;
 	while(Decoding)
-		usleep(100);
+		os_usleep(100);
 
 	mad_synth_finish(&Synth);
 	mad_frame_finish(&Frame);
diff --git a/src/sounds/OggDecoder.cpp b/src/sounds/OggDecoder.cpp
index 12e5f6a..9824a5f 100644
--- a/src/sounds/OggDecoder.cpp
+++ b/src/sounds/OggDecoder.cpp
@@ -82,7 +82,7 @@ OggDecoder::~OggDecoder()
 {
 	ExitRequested = true;
 	while(Decoding)
-		usleep(100);
+		os_usleep(100);
 
 	if(file_fd)
 		ov_clear(&ogg_file);
diff --git a/src/sounds/SoundDecoder.cpp b/src/sounds/SoundDecoder.cpp
index 3e60872..19a83ba 100644
--- a/src/sounds/SoundDecoder.cpp
+++ b/src/sounds/SoundDecoder.cpp
@@ -46,7 +46,7 @@ SoundDecoder::~SoundDecoder()
 {
 	ExitRequested = true;
 	while(Decoding)
-		usleep(1000);
+		os_usleep(1000);
 
 	//! lock unlock once to make sure it's really not decoding
 	Lock();
diff --git a/src/sounds/SoundHandler.cpp b/src/sounds/SoundHandler.cpp
index b7e3016..d970d53 100644
--- a/src/sounds/SoundHandler.cpp
+++ b/src/sounds/SoundHandler.cpp
@@ -50,7 +50,7 @@ SoundHandler::SoundHandler()
 
     //! wait for initialization
     while(!isThreadSuspended())
-        usleep(1000);
+        os_usleep(1000);
 }
 
 SoundHandler::~SoundHandler()
@@ -96,7 +96,7 @@ void SoundHandler::RemoveDecoder(s32 voice)
                 voiceList[voice]->setState(Voice::STATE_STOP);
 
             while(voiceList[voice]->getState() != Voice::STATE_STOPPED)
-                usleep(1000);
+                os_usleep(1000);
         }
         SoundDecoder *decoder = DecoderList[voice];
         decoder->Lock();
diff --git a/src/utils/logger.c b/src/utils/logger.c
index 11141be..a31fb49 100644
--- a/src/utils/logger.c
+++ b/src/utils/logger.c
@@ -48,7 +48,7 @@ void log_print(const char *str)
     }
 
     while(log_lock)
-        usleep(1000);
+        os_usleep(1000);
     log_lock = 1;
 
     s32 len = strlen(str);