Attachment #453148 for bug #592276

View | Details | Raw Unified | Return to bug 592276
Collapse All | Expand All




        echo "MythMusic requires FLAC."
    fi

    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
        disable cdio
    fi


    fi

    if enabled cdio ; then
      if check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda ; then
        echo "#define HAVE_CDIO 1" >> ./mythmusic/mythmusic/config.h
      else
        echo "#define HAVE_CDIO_PARANOIA 1" >> ./mythmusic/mythmusic/config.h
      fi
      echo "CONFIG += cdio" >> ./mythmusic/mythmusic/config.pro
      echo "        libcdio        support will be included in MythMusic"
    else
      echo "#undef  HAVE_CDIO" >> ./mythmusic/mythmusic/config.h
      echo "#undef  HAVE_CDIO_PARANOIA" >> ./mythmusic/mythmusic/config.h
      echo "        libcdio        support will not be included in MythMusic"
    fi


Lines 14-20 Link Here

(-)mythtv-0.28/mythplugins/mythmusic/mythmusic/cddecoder.cpp (-1 / +5 lines)
14	#include <QString>	14	#include <QString>
15		15
16	// libcdio	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	#include <cdio/logging.h>	22	#include <cdio/logging.h>
19		23
20	// MythTV	24	// MythTV

Lines 15-20 Link Here

(-)mythtv-0.28/mythplugins/mythmusic/mythmusic/cddecoder.h (-1 / +6 lines)
15	# include <cdio/paranoia.h>	15	# include <cdio/paranoia.h>
16	#endif	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	class MusicMetadata;	23	class MusicMetadata;
19		24
20	class CdDecoder : public Decoder	25	class CdDecoder : public Decoder
Lines 82-88 Link Here
82	int m_settracknum;	87	int m_settracknum;
83	int m_tracknum;	88	int m_tracknum;
84		89
85	#ifdef HAVE_CDIO	90	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
86	CdIo_t *m_cdio;	91	CdIo_t *m_cdio;
87	cdrom_drive_t *m_device;	92	cdrom_drive_t *m_device;
88	cdrom_paranoia_t *m_paranoia;	93	cdrom_paranoia_t *m_paranoia;

Lines 12-17 Link Here

(-)mythtv-0.28/mythplugins/mythmusic/mythmusic/cdrip.cpp (-14 / +19 lines)
12	# include <cdio/paranoia.h>	12	# include <cdio/paranoia.h>
13	#endif //def HAVE_CDIO	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	// C++ includes	20	// C++ includes
16	#include <iostream>	21	#include <iostream>
17	#include <memory>	22	#include <memory>
Lines 52-60 Link Here
52		57
53	// MythMusic includes	58	// MythMusic includes
54	#include "cdrip.h"	59	#include "cdrip.h"
55	#ifdef HAVE_CDIO	60	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
56	#include "cddecoder.h"	61	#include "cddecoder.h"
57	#endif // HAVE_CDIO	62	#endif // HAVE_CDIO \|\| HAVE_CDIO_PARANOIA
58	#include "encoder.h"	63	#include "encoder.h"
59	#include "vorbisencoder.h"	64	#include "vorbisencoder.h"
60	#include "lameencoder.h"	65	#include "lameencoder.h"
Lines 64-70 Link Here
64	#include "mythlogging.h"	69	#include "mythlogging.h"
65	#include "musicutils.h"	70	#include "musicutils.h"
66		71
67	#ifdef HAVE_CDIO	72	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
68	// libparanoia compatibility	73	// libparanoia compatibility
69	#ifndef cdrom_paranoia	74	#ifndef cdrom_paranoia
70	#define cdrom_paranoia cdrom_paranoia_t	75	#define cdrom_paranoia cdrom_paranoia_t
Lines 73-79 Link Here
73	#ifndef CD_FRAMESIZE_RAW	78	#ifndef CD_FRAMESIZE_RAW
74	# define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW	79	# define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW
75	#endif // CD_FRAMESIZE_RAW	80	#endif // CD_FRAMESIZE_RAW
76	#endif // HAVE_CDIO	81	#endif // HAVE_CDIO \|\| HAVE_CDIO_PARANOIA
77		82
78	QEvent::Type RipStatusEvent::kTrackTextEvent =	83	QEvent::Type RipStatusEvent::kTrackTextEvent =
79	(QEvent::Type) QEvent::registerEventType();	84	(QEvent::Type) QEvent::registerEventType();
Lines 132-138 Link Here
132		137
133	static long int getSectorCount (QString &cddevice, int tracknum)	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	QByteArray devname = cddevice.toLatin1();	141	QByteArray devname = cddevice.toLatin1();
137	cdrom_drive *device = cdda_identify(devname.constData(), 0, NULL);	142	cdrom_drive *device = cdda_identify(devname.constData(), 0, NULL);
138		143
Lines 168-182 Link Here
168	cdda_close(device);	173	cdda_close(device);
169	#else	174	#else
170	(void)cddevice; (void)tracknum;	175	(void)cddevice; (void)tracknum;
171	#endif // HAVE_CDIO	176	#endif // HAVE_CDIO \|\| HAVE_CDIO_PARANOIA
172	return 0;	177	return 0;
173	}	178	}
174		179
175	#ifdef HAVE_CDIO	180	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
176	static void paranoia_cb(long, paranoia_cb_mode_t)	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	CDRipperThread::CDRipperThread(RipStatus *parent, QString device,	186	CDRipperThread::CDRipperThread(RipStatus *parent, QString device,
182	QVector<RipTrack> tracks, int quality) :	187	QVector<RipTrack> tracks, int quality) :
Lines 413-419 Link Here
413		418
414	int CDRipperThread::ripTrack(QString &cddevice, Encoder *encoder, int tracknum)	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	QByteArray devname = cddevice.toLatin1();	422	QByteArray devname = cddevice.toLatin1();
418	cdrom_drive *device = cdda_identify(devname.constData(), 0, NULL);	423	cdrom_drive *device = cdda_identify(devname.constData(), 0, NULL);
419		424
Lines 529-535 Link Here
529	#else	534	#else
530	(void)cddevice; (void)encoder; (void)tracknum;	535	(void)cddevice; (void)encoder; (void)tracknum;
531	return 0;	536	return 0;
532	#endif // HAVE_CDIO	537	#endif // HAVE_CDIO \|\| HAVE_CDIO_PARANOIA
533	}	538	}
534		539
535	///////////////////////////////////////////////////////////////////////////////	540	///////////////////////////////////////////////////////////////////////////////
Lines 873-885 Link Here
873		878
874	void Ripper::scanCD(void)	879	void Ripper::scanCD(void)
875	{	880	{
876	#ifdef HAVE_CDIO	881	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
877	{	882	{
878	LOG(VB_MEDIA, LOG_INFO, QString("Ripper::%1 CD='%2'").	883	LOG(VB_MEDIA, LOG_INFO, QString("Ripper::%1 CD='%2'").
879	arg(__func__).arg(m_CDdevice));	884	arg(__func__).arg(m_CDdevice));
880	(void)cdio_close_tray(m_CDdevice.toLatin1().constData(), NULL);	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	if (m_decoder)	889	if (m_decoder)
885	delete m_decoder;	890	delete m_decoder;
Lines 1226-1232 Link Here
1226	bool bEjectCD = gCoreContext->GetNumSetting("EjectCDAfterRipping",1);	1231	bool bEjectCD = gCoreContext->GetNumSetting("EjectCDAfterRipping",1);
1227	if (bEjectCD)	1232	if (bEjectCD)
1228	{	1233	{
1229	#ifdef HAVE_CDIO	1234	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
1230	LOG(VB_MEDIA, LOG_INFO, QString("Ripper::%1 '%2'").	1235	LOG(VB_MEDIA, LOG_INFO, QString("Ripper::%1 '%2'").
1231	arg(__func__).arg(m_CDdevice));	1236	arg(__func__).arg(m_CDdevice));
1232	(void)cdio_eject_media_drive(m_CDdevice.toLatin1().constData());	1237	(void)cdio_eject_media_drive(m_CDdevice.toLatin1().constData());
Lines 1242-1248 Link Here
1242	mon->Unlock(pMedia);	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

Lines 71-77 Link Here

(-)mythtv-0.28/mythplugins/mythmusic/mythmusic/decoder.cpp (-1 / +1 lines)
71	{	71	{
72	factories = new QList<DecoderFactory*>;	72	factories = new QList<DecoderFactory*>;
73		73
74	#ifdef HAVE_CDIO	74	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
75	Decoder::registerFactory(new CdDecoderFactory);	75	Decoder::registerFactory(new CdDecoderFactory);
76	#endif	76	#endif
77	Decoder::registerFactory(new avfDecoderFactory);	77	Decoder::registerFactory(new avfDecoderFactory);




#include "importmusic.h"
#include "metaio.h"

#if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA
#include "cdrip.h"
#endif

#if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA
/**
 * \brief Work out the best CD drive to use at this time
 */


static void startRipper(void)
{
#if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA
    if (!checkStorageGroup())
        return;


{
    gMusicData->loadMusic();

#if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA
    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();

    Ripper *rip = new Ripper(mainStack, chooseCD());

    }
}

#if defined HAVE_CDIO || defined HAVE_CDIO_PARANOIA
static void handleCDMedia(MythMediaDevice *cd)
{


Lines 24-30 Link Here

(-)mythtv-0.28/mythplugins/mythmusic/mythmusic/musicplayer.cpp (-2 / +2 lines)
24	#include "decoder.h"	24	#include "decoder.h"
25	#include "decoderhandler.h"	25	#include "decoderhandler.h"
26	#include "metaio.h"	26	#include "metaio.h"
27	#ifdef HAVE_CDIO	27	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
28	#include "cddecoder.h"	28	#include "cddecoder.h"
29	#endif	29	#endif
30	#include "constants.h"	30	#include "constants.h"
Lines 1548-1554 Link Here
1548	LOG(VB_PLAYBACK, LOG_INFO, QString ("decoder handler is ready, decoding %1")	1548	LOG(VB_PLAYBACK, LOG_INFO, QString ("decoder handler is ready, decoding %1")
1549	.arg(getDecoder()->getURL()));	1549	.arg(getDecoder()->getURL()));
1550		1550
1551	#ifdef HAVE_CDIO	1551	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
1552	CdDecoder cddecoder = dynamic_cast<CdDecoder>(getDecoder());	1552	CdDecoder cddecoder = dynamic_cast<CdDecoder>(getDecoder());
1553	if (cddecoder)	1553	if (cddecoder)
1554	cddecoder->setDevice(gCDdevice);	1554	cddecoder->setDevice(gCDdevice);

Return to bug 592276

Lines 682-688 Link Here

(-)mythtv-0.28/mythplugins/configure (-2 / +7 lines)
682	echo "MythMusic requires FLAC."	682	echo "MythMusic requires FLAC."
683	fi	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	disable cdio	686	disable cdio
687	fi	687	fi
688		688
Lines 901-911 Link Here
901	fi	901	fi
902		902
903	if enabled cdio ; then	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	echo "CONFIG += cdio" >> ./mythmusic/mythmusic/config.pro	909	echo "CONFIG += cdio" >> ./mythmusic/mythmusic/config.pro
906	echo " libcdio support will be included in MythMusic"	910	echo " libcdio support will be included in MythMusic"
907	else	911	else
908	echo "#undef HAVE_CDIO" >> ./mythmusic/mythmusic/config.h	912	echo "#undef HAVE_CDIO" >> ./mythmusic/mythmusic/config.h
		913	echo "#undef HAVE_CDIO_PARANOIA" >> ./mythmusic/mythmusic/config.h
909	echo " libcdio support will not be included in MythMusic"	914	echo " libcdio support will not be included in MythMusic"
910	fi	915	fi
911		916

Lines 47-57 Link Here

(-)mythtv-0.28/mythplugins/mythmusic/mythmusic/main.cpp (-5 / +5 lines)
47	#include "importmusic.h"	47	#include "importmusic.h"
48	#include "metaio.h"	48	#include "metaio.h"
49		49
50	#ifdef HAVE_CDIO	50	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
51	#include "cdrip.h"	51	#include "cdrip.h"
52	#endif	52	#endif
53		53
54	#if defined HAVE_CDIO	54	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
55	/**	55	/**
56	* \brief Work out the best CD drive to use at this time	56	* \brief Work out the best CD drive to use at this time
57	*/	57	*/
Lines 197-203 Link Here
197		197
198	static void startRipper(void)	198	static void startRipper(void)
199	{	199	{
200	#if defined HAVE_CDIO	200	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
201	if (!checkStorageGroup())	201	if (!checkStorageGroup())
202	return;	202	return;
203		203
Lines 418-424 Link Here
418	{	418	{
419	gMusicData->loadMusic();	419	gMusicData->loadMusic();
420		420
421	#if defined HAVE_CDIO	421	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
422	MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();	422	MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
423		423
424	Ripper *rip = new Ripper(mainStack, chooseCD());	424	Ripper *rip = new Ripper(mainStack, chooseCD());
Lines 638-644 Link Here
638	}	638	}
639	}	639	}
640		640
641	#ifdef HAVE_CDIO	641	#if defined HAVE_CDIO \|\| defined HAVE_CDIO_PARANOIA
642	static void handleCDMedia(MythMediaDevice *cd)	642	static void handleCDMedia(MythMediaDevice *cd)
643	{	643	{
644		644