Improve logging classes.

Replace SG_GENERAL by more specific log classes in many places.

diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx
index 9dce6a4288eea3697a448242c6eb2bbae6bf51bd..e48cd0ab2cc10978f9e12eaf4e8f17f317b5d65f 100644 (file)
--- a/simgear/sound/sample_group.cxx
+++ b/simgear/sound/sample_group.cxx
@@ -181,7 +181,7 @@ void SGSampleGroup::update( double dt ) {
                         alSourcePlay( source );
                         testForALError("sample play");
                     } else
-                        SG_LOG( SG_GENERAL, SG_ALERT, "No such buffer!\n");
+                        SG_LOG( SG_SOUND, SG_ALERT, "No such buffer!\n");
                 }
             }
 
@@ -463,7 +463,7 @@ void SGSampleGroup::update_sample_config( SGSoundSample *sample ) {
 bool SGSampleGroup::testForError(void *p, string s)
 {
    if (p == NULL) {
-      SG_LOG( SG_GENERAL, SG_ALERT, "Error (sample group): " << s);
+      SG_LOG( SG_SOUND, SG_ALERT, "Error (sample group): " << s);
       return true;
    }
    return false;
@@ -473,7 +473,7 @@ bool SGSampleGroup::testForALError(string s)
 {
     ALenum error = alGetError();
     if (error != AL_NO_ERROR)  {
-       SG_LOG( SG_GENERAL, SG_ALERT, "AL Error (" << _refname << "): "
+       SG_LOG( SG_SOUND, SG_ALERT, "AL Error (" << _refname << "): "
                                       << alGetString(error) << " at " << s);
        return true;
     }

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 3c9cb864ad81403fc1d06794c3722046bde1d35f..2029d9ccc80b04d4d2697ba788c04143cb383336 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -148,7 +148,7 @@ SGSoundSample::SGSoundSample( const unsigned char** data,
     _static_changed(true),
     _is_file(false)
 {
-    SG_LOG( SG_GENERAL, SG_DEBUG, "In memory sounds sample" );
+    SG_LOG( SG_SOUND, SG_DEBUG, "In memory sounds sample" );
     _data = (unsigned char*)*data; *data = NULL;
 }
 
@@ -184,7 +184,7 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
     _static_changed(true),
     _is_file(false)
 {
-    SG_LOG( SG_GENERAL, SG_DEBUG, "In memory sounds sample" );
+    SG_LOG( SG_SOUND, SG_DEBUG, "In memory sounds sample" );
     _data = (unsigned char*)*data; *data = NULL;
 }
 

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index 34bea9bc93c5579f603513d95721ff06451e8781..448af1236b4f426b20877a30e5eaa7e9f042ae05 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -111,7 +111,7 @@ SGSoundMgr::~SGSoundMgr() {
 // initialize the sound manager
 void SGSoundMgr::init(const char *devname) {
 
-    SG_LOG( SG_GENERAL, SG_INFO, "Initializing OpenAL sound manager" );
+    SG_LOG( SG_SOUND, SG_INFO, "Initializing OpenAL sound manager" );
 
     ALCdevice *device = alcOpenDevice(devname);
     if ( testForError(device, "Audio device not available, trying default") ) {
@@ -137,7 +137,7 @@ void SGSoundMgr::init(const char *devname) {
     }
 
     if (_context != NULL)
-        SG_LOG(SG_GENERAL, SG_ALERT, "context is already assigned");
+        SG_LOG(SG_SOUND, SG_ALERT, "context is already assigned");
     _context = context;
     _working = true;
 
@@ -184,7 +184,7 @@ void SGSoundMgr::init(const char *devname) {
     }
 
     if (_free_sources.size() == 0) {
-        SG_LOG(SG_GENERAL, SG_ALERT, "Unable to grab any OpenAL sources!");
+        SG_LOG(SG_SOUND, SG_ALERT, "Unable to grab any OpenAL sources!");
     }
 }
 
@@ -427,7 +427,7 @@ unsigned int SGSoundMgr::request_source()
        _sources_in_use.push_back(source);
     }
     else
-       SG_LOG( SG_GENERAL, SG_ALERT, "Sound manager: No more free sources available!\n");
+       SG_LOG( SG_SOUND, SG_ALERT, "Sound manager: No more free sources available!\n");
 
     return source;
 }
@@ -480,7 +480,7 @@ unsigned int SGSoundMgr::request_buffer(SGSoundSample *sample)
               bool res = load(sample_name, &sample_data, &format, &size, &freq);
               if (res == false) return NO_BUFFER;
             } catch (sg_exception& e) {
-              SG_LOG(SG_GENERAL, SG_ALERT,
+              SG_LOG(SG_SOUND, SG_ALERT,
                     "failed to load sound buffer: " << e.getFormattedMessage());
               sample->set_buffer( SGSoundMgr::FAILED_BUFFER );
               return FAILED_BUFFER;
@@ -661,7 +661,7 @@ vector<const char*> SGSoundMgr::get_available_devices()
 bool SGSoundMgr::testForError(void *p, string s)
 {
    if (p == NULL) {
-      SG_LOG( SG_GENERAL, SG_ALERT, "Error: " << s);
+      SG_LOG( SG_SOUND, SG_ALERT, "Error: " << s);
       return true;
    }
    return false;
@@ -672,7 +672,7 @@ bool SGSoundMgr::testForALError(string s)
 {
     ALenum error = alGetError();
     if (error != AL_NO_ERROR)  {
-       SG_LOG( SG_GENERAL, SG_ALERT, "AL Error (sound manager): "
+       SG_LOG( SG_SOUND, SG_ALERT, "AL Error (sound manager): "
                                       << alGetString(error) << " at " << s);
        return true;
     }
@@ -684,7 +684,7 @@ bool SGSoundMgr::testForALCError(string s)
     ALCenum error;
     error = alcGetError(_device);
     if (error != ALC_NO_ERROR) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "ALC Error (sound manager): "
+        SG_LOG( SG_SOUND, SG_ALERT, "ALC Error (sound manager): "
                                        << alcGetString(_device, error) << " at "
                                        << s);
         return true;
@@ -698,7 +698,7 @@ bool SGSoundMgr::testForALUTError(string s)
     ALenum error;
     error =  alutGetError ();
     if (error != ALUT_ERROR_NO_ERROR) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "ALUT Error (sound manager): "
+        SG_LOG( SG_SOUND, SG_ALERT, "ALUT Error (sound manager): "
                                        << alutGetErrorString(error) << " at "
                                        << s);
         return true;

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index f3471d4ef0c2c9cfdf2d1b2203f34b8eb071c9e2..f680f47a185a816362021f412212d73674919f30 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -94,7 +94,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    //
 
    _name = node->getStringValue("name", "");
-   SG_LOG(SG_GENERAL, SG_DEBUG, "Loading sound information for: " << _name );
+   SG_LOG(SG_SOUND, SG_DEBUG, "Loading sound information for: " << _name );
 
    string mode_str = node->getStringValue("mode", "");
    if ( mode_str == "looped" ) {
@@ -121,7 +121,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
       _condition = sgReadCondition(root, condition);
 
    if (!_property && !_condition)
-      SG_LOG(SG_GENERAL, SG_WARN,
+      SG_LOG(SG_SOUND, SG_WARN,
              "  Neither a condition nor a property specified");
 
    _delay = node->getDoubleValue("delay-sec", 0.0);
@@ -161,19 +161,19 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
             }
 
          if (!volume.fn)
-            SG_LOG(SG_GENERAL,SG_INFO,
+            SG_LOG(SG_SOUND,SG_INFO,
                    "  Unknown volume type, default to 'lin'");
       }
 
       volume.offset = kids[i]->getDoubleValue("offset", 0.0);
 
       if ((volume.min = kids[i]->getDoubleValue("min", 0.0)) < 0.0)
-         SG_LOG( SG_GENERAL, SG_WARN,
+         SG_LOG( SG_SOUND, SG_WARN,
           "Volume minimum value below 0. Forced to 0.");
 
       volume.max = kids[i]->getDoubleValue("max", 0.0);
       if (volume.max && (volume.max < volume.min) )
-         SG_LOG(SG_GENERAL,SG_ALERT,
+         SG_LOG(SG_SOUND,SG_ALERT,
                 "  Volume maximum below minimum. Neglected.");
 
       _volume.push_back(volume);
@@ -219,19 +219,19 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
             }
 
          if (!pitch.fn)
-            SG_LOG(SG_GENERAL,SG_INFO,
+            SG_LOG(SG_SOUND,SG_INFO,
                    "  Unknown pitch type, default to 'lin'");
       }
      
       pitch.offset = kids[i]->getDoubleValue("offset", 1.0);
 
       if ((pitch.min = kids[i]->getDoubleValue("min", 0.0)) < 0.0)
-         SG_LOG(SG_GENERAL,SG_WARN,
+         SG_LOG(SG_SOUND,SG_WARN,
                 "  Pitch minimum value below 0. Forced to 0.");
 
       pitch.max = kids[i]->getDoubleValue("max", 0.0);
       if (pitch.max && (pitch.max < pitch.min) )
-         SG_LOG(SG_GENERAL,SG_ALERT,
+         SG_LOG(SG_SOUND,SG_ALERT,
                 "  Pitch maximum below minimum. Neglected");
 
       _pitch.push_back(pitch);
@@ -326,7 +326,7 @@ SGXmlSound::update (double dt)
        if ((_mode != SGXmlSound::IN_TRANSIT) || (_stopping > MAX_TRANSIT_TIME))
        {
            if (_sample->is_playing()) {
-               SG_LOG(SG_GENERAL, SG_DEBUG, "Stopping audio after " << _dt_play
+               SG_LOG(SG_SOUND, SG_DEBUG, "Stopping audio after " << _dt_play
                       << " sec: " << _name );
 
                _sample->stop();
@@ -447,7 +447,7 @@ SGXmlSound::update (double dt)
 
    double vol = volume_offset + volume;
    if (vol > 1.0) {
-      SG_LOG(SG_GENERAL, SG_DEBUG, "Sound volume too large for '"
+      SG_LOG(SG_SOUND, SG_DEBUG, "Sound volume too large for '"
               << _name << "':  " << vol << "  ->  clipping to 1.0");
       vol = 1.0;
    }
@@ -466,9 +466,9 @@ SGXmlSound::update (double dt)
       else
          _sample->play(true);
 
-      SG_LOG(SG_GENERAL, SG_DEBUG, "Playing audio after " << _dt_stop 
+      SG_LOG(SG_SOUND, SG_DEBUG, "Playing audio after " << _dt_stop
                                    << " sec: " << _name);
-      SG_LOG(SG_GENERAL, SG_DEBUG,
+      SG_LOG(SG_SOUND, SG_DEBUG,
                          "Playing " << ((_mode == ONCE) ? "once" : "looped"));
 
       _active = true;