Ticket #4270: mythplugins.patch

configure

@@ -471 +471 @@
         fi
     fi
 
-    if test "$paranoia" = "no" -a "$targetos" != "Darwin" -a "$targetos" != "MINGW32_NT-6.0"; then
+    if test "$paranoia" = "no" -a "$targetos" != "Darwin" -a "${targetos:0:5}" != "MINGW"; then
         echo "MythMusic requires CDDA Paranoia."
     fi
 
@@ -489 +489 @@
         echo "MythMusic requires taglib 1.4."
     fi 
 
-    if test "$targetos" != "Darwin" -a "$targetos" != "MINGW32_NT-6.0" ; then
+    if test "$targetos" != "Darwin" -a "${targetos:0:5}" != "MINGW" ; then
         if test "$cdaudio" = "no" -o "$paranoia" = "no" ; then
             cdlibs="no"
         fi

mythmusic/mythmusic/databasebox.cpp

@@ -21 +21 @@
 #include "metadata.h"
 #include "databasebox.h"
 #include "treecheckitem.h"
-#include "cddecoder.h"
 #include "playlist.h"
 #include "musicplayer.h"
 #ifndef USING_MINGW

mythmusic/mythmusic/musicplayer.cpp

@@ -19 +19 @@
 // mythmusic
 #include "musicplayer.h"
 #include "decoder.h"
+#ifndef USING_MINGW
 #include "cddecoder.h"
+#endif
 #include "constants.h"
 #include "mainvisual.h"
 #include "miniplayer.h"
@@ -261 +263 @@
             return;
         }
 
+#ifndef USING_MINGW
         if (m_currentFile.contains("cda") == 1)
             dynamic_cast<CdDecoder*>(m_decoder)->setDevice(m_CDdevice);
+#endif
 
         m_decoder->setBlockSize(2 * 1024);
 
@@ -309 +313 @@
                     }
                 }
             }
+#ifndef USING_MINGW
             else
             {
                 // CD track
@@ -316 +321 @@
                 if (m_decoder)
                     m_currentMetadata = cddecoder->getMetadata(-m_currentNode->getInt());
             }
+#endif
         }
     }
 }
@@ -577 +583 @@
                 filename = Metadata::GetStartdir() + filename;
         }
     }
+#ifndef USING_MINGW
     else
     {
         // cd track
@@ -588 +595 @@
                 filename = meta->Filename();
         }
     }
+#endif
     return filename;
 }
 

mythmusic/mythmusic/playbackbox.h

@@ -47 +47 @@
     void play();
     void stop();
     void pause();
-    void stopDecoder();
+    void stopDecoder() {};
     void previous();
     void next();
     void seekforward();

mythmusic/mythmusic/goom/mythgoom.cpp

@@ -12 +12 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include <mythtv/compat.h>
+
 #include <iostream>
 using namespace std;