diff -ruN mythtv-0.28/mythplugins/configure mythtv-0.28_new/mythplugins/configure
old
|
new
|
|
682 | 682 | echo "MythMusic requires FLAC." |
683 | 683 | fi |
684 | 684 | |
685 | | if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then |
| 685 | if ! check_lib cdio/cdio.h cdio_open -lcdio || (! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda && ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda) || (! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia && ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia) ; then |
686 | 686 | disable cdio |
687 | 687 | fi |
688 | 688 | |
… |
… |
|
901 | 901 | fi |
902 | 902 | |
903 | 903 | if enabled cdio ; then |
904 | | echo "#define HAVE_CDIO 1" >> ./mythmusic/mythmusic/config.h |
| 904 | if check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda ; then |
| 905 | echo "#define HAVE_CDIO 1" >> ./mythmusic/mythmusic/config.h |
| 906 | else |
| 907 | echo "#define HAVE_CDIO_PARANOIA 1" >> ./mythmusic/mythmusic/config.h |
| 908 | fi |
905 | 909 | echo "CONFIG += cdio" >> ./mythmusic/mythmusic/config.pro |
906 | 910 | echo " libcdio support will be included in MythMusic" |
907 | 911 | else |
908 | 912 | echo "#undef HAVE_CDIO" >> ./mythmusic/mythmusic/config.h |
| 913 | echo "#undef HAVE_CDIO_PARANOIA" >> ./mythmusic/mythmusic/config.h |
909 | 914 | echo " libcdio support will not be included in MythMusic" |
910 | 915 | fi |
911 | 916 | |
diff -ruN mythtv-0.28/mythplugins/mythmusic/mythmusic/cddecoder.cpp mythtv-0.28_new/mythplugins/mythmusic/mythmusic/cddecoder.cpp
old
|
new
|
|
14 | 14 | #include <QString> |
15 | 15 | |
16 | 16 | // libcdio |
17 | | #include <cdio/cdda.h> |
| 17 | #ifdef HAVE_CDIO |
| 18 | # include <cdio/cdda.h> |
| 19 | #else |
| 20 | # include <cdio/paranoia/cdda.h> |
| 21 | #endif |
18 | 22 | #include <cdio/logging.h> |
19 | 23 | |
20 | 24 | // MythTV |
diff -ruN mythtv-0.28/mythplugins/mythmusic/mythmusic/cddecoder.h mythtv-0.28_new/mythplugins/mythmusic/mythmusic/cddecoder.h
old
|
new
|
|
15 | 15 | # include <cdio/paranoia.h> |
16 | 16 | #endif |
17 | 17 | |
| 18 | #ifdef HAVE_CDIO_PARANOIA |
| 19 | # include <cdio/paranoia/cdda.h> |
| 20 | # include <cdio/paranoia/paranoia.h> |
| 21 | #endif |
| 22 | |
18 | 23 | class MusicMetadata; |
19 | 24 | |
20 | 25 | class CdDecoder : public Decoder |
… |
… |
|
82 | 87 | int m_settracknum; |
83 | 88 | int m_tracknum; |
84 | 89 | |
85 | | #ifdef HAVE_CDIO |
| 90 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
86 | 91 | CdIo_t *m_cdio; |
87 | 92 | cdrom_drive_t *m_device; |
88 | 93 | cdrom_paranoia_t *m_paranoia; |
diff -ruN mythtv-0.28/mythplugins/mythmusic/mythmusic/cdrip.cpp mythtv-0.28_new/mythplugins/mythmusic/mythmusic/cdrip.cpp
old
|
new
|
|
12 | 12 | # include <cdio/paranoia.h> |
13 | 13 | #endif //def HAVE_CDIO |
14 | 14 | |
| 15 | #ifdef HAVE_CDIO_PARANOIA |
| 16 | # include <cdio/paranoia/cdda.h> |
| 17 | # include <cdio/paranoia/paranoia.h> |
| 18 | #endif //def HAVE_CDIO_PARANOIA |
| 19 | |
15 | 20 | // C++ includes |
16 | 21 | #include <iostream> |
17 | 22 | #include <memory> |
… |
… |
|
52 | 57 | |
53 | 58 | // MythMusic includes |
54 | 59 | #include "cdrip.h" |
55 | | #ifdef HAVE_CDIO |
| 60 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
56 | 61 | #include "cddecoder.h" |
57 | | #endif // HAVE_CDIO |
| 62 | #endif // HAVE_CDIO || HAVE_CDIO_PARANOIA |
58 | 63 | #include "encoder.h" |
59 | 64 | #include "vorbisencoder.h" |
60 | 65 | #include "lameencoder.h" |
… |
… |
|
64 | 69 | #include "mythlogging.h" |
65 | 70 | #include "musicutils.h" |
66 | 71 | |
67 | | #ifdef HAVE_CDIO |
| 72 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
68 | 73 | // libparanoia compatibility |
69 | 74 | #ifndef cdrom_paranoia |
70 | 75 | #define cdrom_paranoia cdrom_paranoia_t |
… |
… |
|
73 | 78 | #ifndef CD_FRAMESIZE_RAW |
74 | 79 | # define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW |
75 | 80 | #endif // CD_FRAMESIZE_RAW |
76 | | #endif // HAVE_CDIO |
| 81 | #endif // HAVE_CDIO || HAVE_CDIO_PARANOIA |
77 | 82 | |
78 | 83 | QEvent::Type RipStatusEvent::kTrackTextEvent = |
79 | 84 | (QEvent::Type) QEvent::registerEventType(); |
… |
… |
|
132 | 137 | |
133 | 138 | static long int getSectorCount (QString &cddevice, int tracknum) |
134 | 139 | { |
135 | | #ifdef HAVE_CDIO |
| 140 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
136 | 141 | QByteArray devname = cddevice.toLatin1(); |
137 | 142 | cdrom_drive *device = cdda_identify(devname.constData(), 0, NULL); |
138 | 143 | |
… |
… |
|
168 | 173 | cdda_close(device); |
169 | 174 | #else |
170 | 175 | (void)cddevice; (void)tracknum; |
171 | | #endif // HAVE_CDIO |
| 176 | #endif // HAVE_CDIO || HAVE_CDIO_PARANOIA |
172 | 177 | return 0; |
173 | 178 | } |
174 | 179 | |
175 | | #ifdef HAVE_CDIO |
| 180 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
176 | 181 | static void paranoia_cb(long, paranoia_cb_mode_t) |
177 | 182 | { |
178 | 183 | } |
179 | | #endif // HAVE_CDIO |
| 184 | #endif // HAVE_CDIO || HAVE_CDIO_PARANOIA |
180 | 185 | |
181 | 186 | CDRipperThread::CDRipperThread(RipStatus *parent, QString device, |
182 | 187 | QVector<RipTrack*> *tracks, int quality) : |
… |
… |
|
413 | 418 | |
414 | 419 | int CDRipperThread::ripTrack(QString &cddevice, Encoder *encoder, int tracknum) |
415 | 420 | { |
416 | | #ifdef HAVE_CDIO |
| 421 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
417 | 422 | QByteArray devname = cddevice.toLatin1(); |
418 | 423 | cdrom_drive *device = cdda_identify(devname.constData(), 0, NULL); |
419 | 424 | |
… |
… |
|
529 | 534 | #else |
530 | 535 | (void)cddevice; (void)encoder; (void)tracknum; |
531 | 536 | return 0; |
532 | | #endif // HAVE_CDIO |
| 537 | #endif // HAVE_CDIO || HAVE_CDIO_PARANOIA |
533 | 538 | } |
534 | 539 | |
535 | 540 | /////////////////////////////////////////////////////////////////////////////// |
… |
… |
|
873 | 878 | |
874 | 879 | void Ripper::scanCD(void) |
875 | 880 | { |
876 | | #ifdef HAVE_CDIO |
| 881 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
877 | 882 | { |
878 | 883 | LOG(VB_MEDIA, LOG_INFO, QString("Ripper::%1 CD='%2'"). |
879 | 884 | arg(__func__).arg(m_CDdevice)); |
880 | 885 | (void)cdio_close_tray(m_CDdevice.toLatin1().constData(), NULL); |
881 | 886 | } |
882 | | #endif // HAVE_CDIO |
| 887 | #endif // HAVE_CDIO || HAVE_CDIO_PARANOIA |
883 | 888 | |
884 | 889 | if (m_decoder) |
885 | 890 | delete m_decoder; |
… |
… |
|
1226 | 1231 | bool bEjectCD = gCoreContext->GetNumSetting("EjectCDAfterRipping",1); |
1227 | 1232 | if (bEjectCD) |
1228 | 1233 | { |
1229 | | #ifdef HAVE_CDIO |
| 1234 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
1230 | 1235 | LOG(VB_MEDIA, LOG_INFO, QString("Ripper::%1 '%2'"). |
1231 | 1236 | arg(__func__).arg(m_CDdevice)); |
1232 | 1237 | (void)cdio_eject_media_drive(m_CDdevice.toLatin1().constData()); |
… |
… |
|
1242 | 1247 | mon->Unlock(pMedia); |
1243 | 1248 | } |
1244 | 1249 | } |
1245 | | #endif // HAVE_CDIO |
| 1250 | #endif // HAVE_CDIO || HAVE_CDIO_PARANOIA |
1246 | 1251 | } |
1247 | 1252 | } |
1248 | 1253 | |
diff -ruN mythtv-0.28/mythplugins/mythmusic/mythmusic/decoder.cpp mythtv-0.28_new/mythplugins/mythmusic/mythmusic/decoder.cpp
old
|
new
|
|
71 | 71 | { |
72 | 72 | factories = new QList<DecoderFactory*>; |
73 | 73 | |
74 | | #ifdef HAVE_CDIO |
| 74 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
75 | 75 | Decoder::registerFactory(new CdDecoderFactory); |
76 | 76 | #endif |
77 | 77 | Decoder::registerFactory(new avfDecoderFactory); |
diff -ruN mythtv-0.28/mythplugins/mythmusic/mythmusic/main.cpp mythtv-0.28_new/mythplugins/mythmusic/mythmusic/main.cpp
old
|
new
|
|
47 | 47 | #include "importmusic.h" |
48 | 48 | #include "metaio.h" |
49 | 49 | |
50 | | #ifdef HAVE_CDIO |
| 50 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
51 | 51 | #include "cdrip.h" |
52 | 52 | #endif |
53 | 53 | |
54 | | #if defined HAVE_CDIO |
| 54 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
55 | 55 | /** |
56 | 56 | * \brief Work out the best CD drive to use at this time |
57 | 57 | */ |
… |
… |
|
197 | 197 | |
198 | 198 | static void startRipper(void) |
199 | 199 | { |
200 | | #if defined HAVE_CDIO |
| 200 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
201 | 201 | if (!checkStorageGroup()) |
202 | 202 | return; |
203 | 203 | |
… |
… |
|
418 | 418 | { |
419 | 419 | gMusicData->loadMusic(); |
420 | 420 | |
421 | | #if defined HAVE_CDIO |
| 421 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
422 | 422 | MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack(); |
423 | 423 | |
424 | 424 | Ripper *rip = new Ripper(mainStack, chooseCD()); |
… |
… |
|
638 | 638 | } |
639 | 639 | } |
640 | 640 | |
641 | | #ifdef HAVE_CDIO |
| 641 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
642 | 642 | static void handleCDMedia(MythMediaDevice *cd) |
643 | 643 | { |
644 | 644 | |
diff -ruN mythtv-0.28/mythplugins/mythmusic/mythmusic/musicplayer.cpp mythtv-0.28_new/mythplugins/mythmusic/mythmusic/musicplayer.cpp
old
|
new
|
|
24 | 24 | #include "decoder.h" |
25 | 25 | #include "decoderhandler.h" |
26 | 26 | #include "metaio.h" |
27 | | #ifdef HAVE_CDIO |
| 27 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
28 | 28 | #include "cddecoder.h" |
29 | 29 | #endif |
30 | 30 | #include "constants.h" |
… |
… |
|
1548 | 1548 | LOG(VB_PLAYBACK, LOG_INFO, QString ("decoder handler is ready, decoding %1") |
1549 | 1549 | .arg(getDecoder()->getURL())); |
1550 | 1550 | |
1551 | | #ifdef HAVE_CDIO |
| 1551 | #if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA |
1552 | 1552 | CdDecoder *cddecoder = dynamic_cast<CdDecoder*>(getDecoder()); |
1553 | 1553 | if (cddecoder) |
1554 | 1554 | cddecoder->setDevice(gCDdevice); |