fixed gcc warnings

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8326 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 8 insertions, 12 deletions

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index cf414f61c..4dfa27327 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include <QFile>
+#include <QtDebug>
 #include "replaygainreader.h"
 #include "decoder_ffmpeg.h"
 #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,34,0)) //libav-10: 55.34.1; ffmpeg-2.1: 55.39.100
@@ -304,12 +305,8 @@ bool DecoderFFmpeg::initialize()
     if(c->bit_rate)
         m_bitrate = c->bit_rate/1000;
     qDebug("DecoderFFmpeg: initialize succes");
+    qDebug() << "DecoderFFmpeg: total time =" << m_totalTime;
 
-#ifdef Q_OS_WIN
-    qDebug("total time = %I64d", m_totalTime);
-#else
-    qDebug("total time = %lld ", m_totalTime);
-#endif
     return true;
 }
 
diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
index cc492fa00..f786e091a 100644
--- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp
+++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
@@ -29,7 +29,9 @@
 #include "decoder_sndfile.h"
 #include "decodersndfilefactory.h"
 
+#ifndef WAVE_FORMAT_PCM
 #define WAVE_FORMAT_PCM 0x0001
+#endif
 #define WAVE_FORMAT_ADPCM 0x0002
 #define WAVE_FORMAT_IEEE_FLOAT 0x0003
 #define WAVE_FORMAT_ALAW 0x0006
diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp
index ce3cd2036..0cb4ed319 100644
--- a/src/qmmp/outputwriter.cpp
+++ b/src/qmmp/outputwriter.cpp
@@ -18,6 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <QtDebug>
 #include <string.h>
 #include "statehandler.h"
 #include "visual.h"
@@ -397,11 +398,7 @@ void OutputWriter::run()
     if(m_finish)
     {
         m_output->drain();
-#ifdef Q_OS_WIN
-        qDebug("OutputWriter: total written %I64d", m_totalWritten);
-#else
-        qDebug("OutputWriter: total written %lld", m_totalWritten);
-#endif
+        qDebug() << "OutputWriter: total written" << m_totalWritten;
     }
     dispatch(Qmmp::Stopped);
     stopVisualization();
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index 73c2db852..059a4e957 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -169,9 +169,9 @@ void DetailsDialog::updatePage()
     QList<TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(m_info.path());
     if(!infoList.isEmpty())
     {
-        if(infoList.first()->parts() && TrackInfo::MetaData)
+        if(infoList.first()->parts() & TrackInfo::MetaData)
             m_info.setValues(infoList.first()->metaData());
-        if(infoList.first()->parts() && TrackInfo::Properties)
+        if(infoList.first()->parts() & TrackInfo::Properties)
         {
             m_info.updateValues(infoList.first()->properties());
             m_info.setDuration(infoList.first()->duration());