Clean up a bunch of mythmusic compile warnings

MythTV · Apr 12, 2012 · c5d987c · c5d987c
1 parent 631bb1e
commit c5d987c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/bumpscope.cpp b/mythplugins/mythmusic/mythmusic/bumpscope.cpp
@@ -422,6 +422,8 @@ bool BumpScope::draw(QPainter *p, const QColor &back)
         return false;
     }
 
+    (void)back;
+
     m_ilx = m_x;
     m_ily = m_y;
 

diff --git a/mythplugins/mythmusic/mythmusic/cddecoder.cpp b/mythplugins/mythmusic/mythmusic/cddecoder.cpp
@@ -273,8 +273,9 @@ bool CdDecoder::initialize()
     m_output_at = 0;
 
     setCDSpeed(2);
+    m_inited = true;
 
-    return m_inited = true;
+    return m_inited;
 }
 
 // pure virtual

diff --git a/mythplugins/mythmusic/mythmusic/flacencoder.h b/mythplugins/mythmusic/mythmusic/flacencoder.h
@@ -1,7 +1,7 @@
 #ifndef FLACENCODER_H_
 #define FLACENCODER_H_
 
-#define HAVE_INTTYPES_H
+#include <stdint.h>
 
 #include <FLAC/export.h>
 #if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7

diff --git a/mythplugins/mythmusic/mythmusic/main.cpp b/mythplugins/mythmusic/mythmusic/main.cpp
@@ -473,6 +473,7 @@ static void showMiniPlayer(void)
         gPlayer->showMiniPlayer();
 }
 
+#ifdef FIXME  // the only call is likewise commented out and needs fixing
 static void handleMedia(MythMediaDevice *cd)
 {
     // if the music player is already playing ignore the event
@@ -537,6 +538,7 @@ static void handleMedia(MythMediaDevice *cd)
     else
         mythplugin_run();
 }
+#endif
 
 static void setupKeys(void)
 {
@@ -597,9 +599,9 @@ static void setupKeys(void)
         "Toggle track selection"), "T");
 
 
+#ifdef FIXME
 // FIXME need to find a way to stop the media monitor jumping to the main menu before
 // calling the handler
-#if 0
     REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
         "MythMusic Media Handler 1/2"), "", "", handleMedia,
         MEDIATYPE_AUDIO | MEDIATYPE_MIXED, QString::null);

diff --git a/mythplugins/mythmusic/mythmusic/synaesthesia.cpp b/mythplugins/mythmusic/mythmusic/synaesthesia.cpp
@@ -606,6 +606,8 @@ bool Synaesthesia::draw(QPainter *p, const QColor &back)
     if (!m_outputImage)
         return true;
 
+    (void)back;
+
     register uint32_t *ptrOutput = (uint32_t *)output;
 
     for (int j = 0; j < m_outHeight * 2; j += 2)