Browse Source

latest oxygine

[email protected] 8 years ago
parent
commit
74a5bc72c7

+ 1 - 1
src/sound/SoundInstance.cpp

@@ -6,7 +6,7 @@ namespace oxygine
 {
 {
 #define EXIT_IF_EMPTY() if (!_handle) return
 #define EXIT_IF_EMPTY() if (!_handle) return
 
 
-//#define LOGD(str) log::messageln("ss: %s (from %s) %d '%s'", str, state2str(_state), __id, getName().c_str());
+//#define LOGD(str) logs::messageln("ss: %s (from %s) %d '%s'", str, state2str(_state), __id, getName().c_str());
 #define LOGD(str) {}
 #define LOGD(str) {}
 
 
     const char* state2str(SoundInstance::State s)
     const char* state2str(SoundInstance::State s)

+ 1 - 1
src/sound/SoundPlayer.cpp

@@ -246,7 +246,7 @@ namespace oxygine
                 ++i;
                 ++i;
         }
         }
 
 
-        //log::messageln("sounds %d", _sounds.size());
+        //logs::messageln("sounds %d", _sounds.size());
 
 
         _lastUpdateTime = t;
         _lastUpdateTime = t;
     }
     }

+ 5 - 5
src/sound/oal/SoundSystemOAL.cpp

@@ -16,7 +16,7 @@ namespace oxygine
 
 
         if (error != AL_NO_ERROR)
         if (error != AL_NO_ERROR)
         {
         {
-            log::messageln("AL error: %d '%s'", error, alGetString(error));
+            logs::messageln("AL error: %d '%s'", error, alGetString(error));
 
 
             OX_ASSERT(!"open al error");
             OX_ASSERT(!"open al error");
 
 
@@ -55,7 +55,7 @@ namespace oxygine
             if (!SoundSystem::instance)
             if (!SoundSystem::instance)
             {
             {
                 OX_ASSERT(0);
                 OX_ASSERT(0);
-                log::error("can't create SoundSystemOAL");
+                logs::error("can't create SoundSystemOAL");
 
 
                 SoundSystem::instance = new SoundSystemNull;
                 SoundSystem::instance = new SoundSystemNull;
             }
             }
@@ -67,7 +67,7 @@ namespace oxygine
     SoundSystemOAL::SoundSystemOAL(ALCdevice* device, ALCcontext* context): _device(device), _context(context), _volume(1.0)
     SoundSystemOAL::SoundSystemOAL(ALCdevice* device, ALCcontext* context): _device(device), _context(context), _volume(1.0)
     {
     {
 
 
-        log::messageln("SoundSystemOAL init");
+        logs::messageln("SoundSystemOAL init");
 
 
         alcMakeContextCurrent(_context);
         alcMakeContextCurrent(_context);
         OAL_CHECK();
         OAL_CHECK();
@@ -105,7 +105,7 @@ namespace oxygine
 
 
     void SoundSystemOAL::pause()
     void SoundSystemOAL::pause()
     {
     {
-        log::messageln("SoundSystemOAL::pause");
+        logs::messageln("SoundSystemOAL::pause");
 
 
         StreamingOggSoundHandleOAL::clearThreadQueue();
         StreamingOggSoundHandleOAL::clearThreadQueue();
 
 
@@ -127,7 +127,7 @@ namespace oxygine
 
 
     void SoundSystemOAL::resume()
     void SoundSystemOAL::resume()
     {
     {
-        log::messageln("SoundSystemOAL::resume");
+        logs::messageln("SoundSystemOAL::resume");
 
 
 #if defined(__ANDROID__)
 #if defined(__ANDROID__)
         alcResume();
         alcResume();

+ 5 - 5
src/sound/oal/StreamingSoundHandleOAL.cpp

@@ -8,8 +8,8 @@ namespace oxygine
 {
 {
 
 
 #ifdef CHANNEL_DEBUG
 #ifdef CHANNEL_DEBUG
-#define  LOG2DN(...)  log::messageln(__VA_ARGS__)
-#define  LOG2D(...)  log::message(__VA_ARGS__)
+#define  LOG2DN(...)  logs::messageln(__VA_ARGS__)
+#define  LOG2D(...)  logs::message(__VA_ARGS__)
 
 
 #else
 #else
 #define  LOG2DN(...) ((void)0)
 #define  LOG2DN(...) ((void)0)
@@ -17,8 +17,8 @@ namespace oxygine
 #endif
 #endif
 
 
 #ifdef CHANNEL_DEBUG
 #ifdef CHANNEL_DEBUG
-#define  LOGDN(...)  log::messageln(__VA_ARGS__)
-#define  LOGD(...)  log::message(__VA_ARGS__)
+#define  LOGDN(...)  logs::messageln(__VA_ARGS__)
+#define  LOGD(...)  logs::message(__VA_ARGS__)
 
 
 #else
 #else
 #define  LOGDN(...)  ((void)0)
 #define  LOGDN(...)  ((void)0)
@@ -162,7 +162,7 @@ namespace oxygine
 
 
         for (int i = 0; i < num; ++i)
         for (int i = 0; i < num; ++i)
         {
         {
-            //log::messageln("decode %d", getTimeMS());
+            //logs::messageln("decode %d", getTimeMS());
             ALuint buffer = buffers[i];
             ALuint buffer = buffers[i];
             size = _stream->decodeNextBlock(_looping, data, size);
             size = _stream->decodeNextBlock(_looping, data, size);
             if (!size)
             if (!size)