Ticket #4270: mythmusic.1.patch

mythplugins/mythmusic/mythmusic/mythmusic.pro

@@ -74 +74 @@
 
     HEADERS -= cdrip.h   importmusic.h
     SOURCES -= cdrip.cpp importmusic.cpp cddecoder.cpp
+    SOURCES += cddecoder-windows.cpp
 
     LIBS += -logg
 }

mythplugins/mythmusic/mythmusic/cddecoder.h

@@ -7 +7 @@
 
 #ifdef CONFIG_DARWIN
 #include <vector>
-#else
+#endif
+
+#ifdef __linux__
 #include <cdaudio.h>
 extern "C" {
 #include <cdda_interface.h>
@@ -62 +64 @@
     double             m_lengthInSecs;
     vector<int>        m_tracks;        ///< Start block offset of each track
     vector<Metadata*>  m_mData;         ///< After lookup, details of each trk
-#else
+#endif
+
     int stat;
     char *output_buf;
     ulong output_bytes, output_at;
@@ -77 +80 @@
     int settracknum;
     int tracknum;
 
+#ifdef __linux__
     cdrom_drive *device;
     cdrom_paranoia *paranoia;
+#endif
 
     long int start;
     long int end;
     long int curpos;
-#endif
 };
 
 #endif