File old-paranoia.diff of Package kde3-kaffeine

Overview Repositories Revisions Requests Users Attributes Meta

File old-paranoia.diff of Package kde3-kaffeine

Index: kaffeine/src/input/disc/paranoia.h
===================================================================
--- kaffeine/src/input/disc/paranoia.h	(revision 970525)
+++ kaffeine/src/input/disc/paranoia.h	(revision 970524)
@@ -32,8 +32,8 @@
 
 extern "C"
 {
-#include <cdio/cdda.h>
-#include <cdio/paranoia.h>
+#include <cdda_interface.h>
+#include <cdda_paranoia.h>
 }
 
 class KiloConfig : public ParanoiaSettings
@@ -91,8 +91,8 @@
 	bool setPath( QString &path, const QString &artist, const QString &album );
 
 	long nTracks;
-	cdrom_drive_t *d;
-	cdrom_paranoia_t *p;
+	cdrom_drive *d;
+	cdrom_paranoia *p;
 	long currentSector, endOfTrack;
 	bool isRunning;
 	QStringList encodingList;
Index: kaffeine/src/input/disc/Makefile.am
===================================================================
--- kaffeine/src/input/disc/Makefile.am	(revision 970525)
+++ kaffeine/src/input/disc/Makefile.am	(revision 970524)
@@ -28,7 +28,7 @@
 libkaffeinedisc_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \
 	$(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la \
 	$(top_builddir)/kaffeine/src/input/disc/plugins/libkaffeineaudioencoder.la \
-	-lcdio_cdda -lcdio_paranoia
+	-lcdda_interface -lcdda_paranoia
 
 # this is where the XML-GUI resource file goes
 shellrcdir   = $(kde_datadir)/kaffeine
Index: kaffeine/src/input/disc/paranoia.cpp
===================================================================
--- kaffeine/src/input/disc/paranoia.cpp	(revision 970525)
+++ kaffeine/src/input/disc/paranoia.cpp	(revision 970524)
@@ -120,7 +120,7 @@
 {
 }
 
-void paranoiaCallback( long int, paranoia_cb_mode_t )
+void paranoiaCallback( long, int )
 {
 }
 
@@ -396,7 +396,7 @@
 		curpos = currentSector;
 		endpos = endOfTrack;
 		if ( normalize ) {
-			len = CDIO_CD_FRAMESIZE_RAW;
+			len = CD_FRAMESIZE_RAW;
 			fn.open( IO_ReadWrite | IO_Truncate );
 			do {
 				buf = paranoia_read_limited( p, paranoiaCallback, 3 );
@@ -419,7 +419,7 @@
 			while ( curpos<endpos && len!=0 );
 
 			factor = 32767.0/max;
-			buf = new signed short[CDIO_CD_FRAMESIZE_RAW];
+			buf = new signed short[CD_FRAMESIZE_RAW];
 			fn.at( 0 );
 			f.open( IO_ReadWrite | IO_Truncate );
 			currentEncoder->start( encodingList[i].remove(0,3), encodingList[0], encodingList[1], encodingList[i].left(2) );
@@ -428,7 +428,7 @@
 				f.writeBlock( encoded, len );
 
 			do {
-				len = fn.readBlock( (char*)buf, CDIO_CD_FRAMESIZE_RAW );
+				len = fn.readBlock( (char*)buf, CD_FRAMESIZE_RAW );
 				if ( len>0 ) {
 					if ( max<32760 )
 						for ( n=0; n<len/2; ++n )
@@ -455,7 +455,7 @@
 			encoded = currentEncoder->getHeader( len );
 			if ( encoded )
 				f.writeBlock( encoded, len );
-			len = CDIO_CD_FRAMESIZE_RAW;
+			len = CD_FRAMESIZE_RAW;
 			do {
 				buf = paranoia_read_limited( p, paranoiaCallback, 3 );
 				if ( Q_BYTE_ORDER == Q_BIG_ENDIAN ) {
@@ -514,7 +514,7 @@
 	QString s, c;
 	long total;
 
-	total = CDIO_CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) );
+	total = CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) );
 	if ( total>(1048576 ) ) s = c.setNum(total/1048576.0, 'f', 2)+" "+i18n("MB");
 	else if ( total>1024 ) s = c.setNum(total/1024.0, 'f', 2)+" "+i18n("KB");
 	else s = c.setNum(total*1.0, 'f', 2)+" "+i18n("Bytes");
@@ -532,8 +532,8 @@
 	long total, time;
 	int m, s;
 
-	if ( t<0 ) total = CDIO_CD_FRAMESIZE_RAW * (cdda_disc_lastsector( d )-cdda_disc_firstsector( d ) );
-	else total = CDIO_CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) );
+	if ( t<0 ) total = CD_FRAMESIZE_RAW * (cdda_disc_lastsector( d )-cdda_disc_firstsector( d ) );
+	else total = CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) );
 	time = (8 * total) / (44100 * 2 * 16);
 	m = time/60;
 	s = time%60;
Index: kaffeine/configure.in.in
===================================================================
--- kaffeine/configure.in.in	(revision 970525)
+++ kaffeine/configure.in.in	(revision 970524)
@@ -220,7 +220,7 @@
 dnl check for cdparanoia
 dnl --------------------
 
-KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
+KDE_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no])
 
 if test "$with_cdparanoia" != "yes" ; then
 	echo ""

Places

File old-paranoia.diff of Package kde3-kaffeine

Places