Fix some warnings in non-debug mode.

git-svn-id: svn://localhost/ardour2/branches/3.0@12047 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 14 insertions, 7 deletions

diff --git a/libs/taglib/taglib/ogg/flac/oggflacfile.cpp b/libs/taglib/taglib/ogg/flac/oggflacfile.cpp
index 3070f3ab14..9281fbaf1d 100644
--- a/libs/taglib/taglib/ogg/flac/oggflacfile.cpp
+++ b/libs/taglib/taglib/ogg/flac/oggflacfile.cpp
@@ -256,8 +256,9 @@ void Ogg::FLAC::File::scan()
       d->hasXiphComment = true;
       d->commentPacket = ipacket;
     }
-    else if(blockType > 5)
+    else if(blockType > 5) {
       debug("Ogg::FLAC::File::scan() -- Unknown metadata block");
+    }
 
   }
 
diff --git a/libs/taglib/taglib/ogg/oggpage.cpp b/libs/taglib/taglib/ogg/oggpage.cpp
index 0b82828467..da231a143b 100644
--- a/libs/taglib/taglib/ogg/oggpage.cpp
+++ b/libs/taglib/taglib/ogg/oggpage.cpp
@@ -151,8 +151,9 @@ ByteVectorList Ogg::Page::packets() const
     for(; it != packetSizes.end(); ++it)
       l.append(d->file->readBlock(*it));
   }
-  else
+  else {
     debug("Ogg::Page::packets() -- attempting to read packets from an invalid page.");
+  }
 
   return l;
 }
@@ -173,8 +174,9 @@ ByteVector Ogg::Page::render() const
       d->file->seek(d->packetOffset);
       data.append(d->file->readBlock(d->dataSize));
     }
-    else
+    else {
       debug("Ogg::Page::render() -- this page is empty!");
+    }
   }
   else {
     ByteVectorList::ConstIterator it = d->packets.begin();
diff --git a/libs/taglib/taglib/ogg/speex/speexproperties.cpp b/libs/taglib/taglib/ogg/speex/speexproperties.cpp
index 29deb019c1..9790325175 100644
--- a/libs/taglib/taglib/ogg/speex/speexproperties.cpp
+++ b/libs/taglib/taglib/ogg/speex/speexproperties.cpp
@@ -161,10 +161,12 @@ void Speex::Properties::read()
 
     if(start >= 0 && end >= 0 && d->sampleRate > 0)
       d->length = (int) ((end - start) / (long long) d->sampleRate);
-    else
+    else {
       debug("Speex::Properties::read() -- Either the PCM values for the start or "
             "end of this file was incorrect or the sample rate is zero.");
+    }
   }
-  else
+  else {
     debug("Speex::Properties::read() -- Could not find valid first and last Ogg pages.");
+  }
 }
diff --git a/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp b/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp
index c82a3191f3..492a0fdccb 100644
--- a/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp
+++ b/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp
@@ -174,10 +174,12 @@ void Vorbis::Properties::read()
 
     if(start >= 0 && end >= 0 && d->sampleRate > 0)
       d->length = (end - start) / (long long) d->sampleRate;
-    else
+    else {
       debug("Vorbis::Properties::read() -- Either the PCM values for the start or "
             "end of this file was incorrect or the sample rate is zero.");
+    }
   }
-  else
+  else {
     debug("Vorbis::Properties::read() -- Could not find valid first and last Ogg pages.");
+  }
 }