Changeset 365 for trunk/src/sdl

Timestamp:

05/16/15 17:40:16 (10 years ago)

Author:

epyon

Message:

• overhaul of logging: no longer stream operated no longer using STL no memory allocation shorthand macros fast file and console I/O

Location:

trunk

Files:

• . (modified) (1 prop)
• src/sdl/sdl_audio.cc (modified) (5 diffs)
• src/sdl/sdl_window.cc (modified) (2 diffs)
• src/sdl/sdl_window_manager.cc (modified) (1 diff)

trunk/src/sdl/sdl_audio.cc

@@ -21 +21 @@
         if ( SDL_Init( SDL_INIT_AUDIO ) == -1 ) 
         {
-                NV_LOG( LOG_CRITICAL, "SDL_AUDIO failed to load -- " << SDL_GetError() );
+                NV_LOG_CRITICAL( "SDL_AUDIO failed to load -- ", SDL_GetError() );
                 return;
         }
@@ -27 +27 @@
         if( Mix_OpenAudio( 44100, MIX_DEFAULT_FORMAT, 2, 1024 ) == -1 )
         {
-                NV_LOG( LOG_CRITICAL, "SDL_mixer failed to load -- " << Mix_GetError() );
+                NV_LOG_CRITICAL( "SDL_mixer failed to load -- ", Mix_GetError() );
                 return;
         }
@@ -40 +40 @@
                 if ( channel == -1 )
                 {
-                        NV_LOG( LOG_WARNING, "SDL_mixer failed to play -- " << Mix_GetError() );
+                        NV_LOG_WARNING( "SDL_mixer failed to play -- ", Mix_GetError() );
                 }
                 else
@@ -67 +67 @@
                 if ( channel == -1 )
                 {
-                        NV_LOG( LOG_WARNING, "SDL_mixer failed to play -- " << Mix_GetError() );
+                        NV_LOG_WARNING( "SDL_mixer failed to play -- ", Mix_GetError() );
                 }
                 else
@@ -91 +91 @@
         if ( Mix_LoadWAV_RW == nullptr || SDL_RWFromFile == nullptr ) 
         {
-                NV_LOG( LOG_ERROR, "SDL_mixer not loaded!" );
+                NV_LOG_ERROR( "SDL_mixer not loaded!" );
         }
         Mix_Chunk *sample = Mix_LoadWAV_RW(SDL_RWFromFile(a_path.c_str(), "rb"), 1);
         if ( sample == nullptr )
         {
-                NV_LOG( LOG_ERROR, "SDL_mixer failed to load sample '" << a_path << "' -- " << Mix_GetError() );
+                NV_LOG_ERROR( "SDL_mixer failed to load sample '", a_path, "' -- ", Mix_GetError() );
                 return sound();
         }

trunk/src/sdl/sdl_window.cc

@@ -38 +38 @@
         if ( m_handle == 0 )
         {
-                NV_LOG( LOG_CRITICAL, "Video mode set failed: " << SDL_GetError( ) );
+                NV_LOG_CRITICAL( "Video mode set failed: ", SDL_GetError( ) );
                 return; // TODO: Error report
         }
@@ -56 +56 @@
         if ( ctx_handle == 0 )
         {
-                NV_LOG( LOG_CRITICAL, "GL Context creation failed: " << SDL_GetError( ) );
+                NV_LOG_CRITICAL( "GL Context creation failed: ", SDL_GetError( ) );
                 return; // TODO: Error report
         }
 
         nv::load_gl_library();
-        NV_LOG( LOG_INFO, "OpenGL Vendor       : " << glGetString(GL_VENDOR) );
-        NV_LOG( LOG_INFO, "OpenGL Renderer     : " << glGetString(GL_RENDERER) );
-        NV_LOG( LOG_INFO, "OpenGL Version      : " << glGetString(GL_VERSION) );
-        NV_LOG( LOG_INFO, "OpenGL GLSL Version : " << glGetString(GL_SHADING_LANGUAGE_VERSION) );
+        NV_LOG_INFO( "OpenGL Vendor       : ", (const char*)glGetString(GL_VENDOR) );
+        NV_LOG_INFO( "OpenGL Renderer     : ", (const char*)glGetString( GL_RENDERER ) );
+        NV_LOG_INFO( "OpenGL Version      : ", (const char*)glGetString( GL_VERSION ) );
+        NV_LOG_INFO( "OpenGL GLSL Version : ", (const char*)glGetString( GL_SHADING_LANGUAGE_VERSION ) );
         SDL_GL_SetSwapInterval(1);
 

trunk/src/sdl/sdl_window_manager.cc

@@ -19 +19 @@
         if ( SDL_Init(0) < 0 )
         {
-                NV_LOG( LOG_CRITICAL, "SDL initialization failed: " << SDL_GetError( ) );
+                NV_LOG_CRITICAL( "SDL initialization failed: ", SDL_GetError( ) );
                 return; // TODO: Error report
         }