11 files changed, 74 insertions, 57 deletions

diff --git a/sysutils/k3b/files/patch-src-Makefile.in b/sysutils/k3b/files/patch-src-Makefile.in
index cad7cb52ecb7..c3077fada020 100644
--- a/sysutils/k3b/files/patch-src-Makefile.in
+++ b/sysutils/k3b/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Tue Aug 10 12:56:08 2004
-+++ src/Makefile.in	Sun Aug 22 15:28:36 2004
-@@ -287,7 +287,7 @@
+--- src/Makefile.in.orig	Sat Dec 11 17:46:26 2004
++++ src/Makefile.in	Sun Jan  2 09:30:08 2005
+@@ -297,7 +297,7 @@
  #>+ 1
  k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp  k3bprojectinterface.cpp  k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp
  
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevice.cpp b/sysutils/k3b/files/patch-src-device-k3bdevice.cpp
index 024a3a2db2c5..b4af3c1a7620 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevice.cpp
+++ b/sysutils/k3b/files/patch-src-device-k3bdevice.cpp
@@ -1,5 +1,5 @@
---- src/device/k3bdevice.cpp.orig	Tue Aug 10 09:45:21 2004
-+++ src/device/k3bdevice.cpp	Sun Aug 29 10:41:17 2004
+--- src/device/k3bdevice.cpp.orig	Sun Nov 28 01:22:29 2004
++++ src/device/k3bdevice.cpp	Sun Jan  2 09:30:08 2005
 @@ -57,6 +57,13 @@
  
  #endif // Q_OS_LINUX
@@ -14,7 +14,7 @@
  
  #ifdef HAVE_RESMGR
  extern "C" {
-@@ -154,8 +161,10 @@
+@@ -188,8 +195,10 @@
  
    d->supportedProfiles = 0;
  
@@ -25,7 +25,7 @@
  
  
    //
-@@ -194,6 +203,7 @@
+@@ -228,6 +237,7 @@
    unsigned char header[2048];
    ::memset( header, 0, 2048 );
  
@@ -33,22 +33,32 @@
    cmd[0] = MMC::GET_CONFIGURATION;
    cmd[8] = 8;
    if( cmd.transport( TR_DIR_READ, header, 8 ) ) {
-@@ -754,6 +764,14 @@
+@@ -820,6 +830,24 @@
      m_bufferSize = 1024;
      d->burnfree = false;
    }
-+  else if( vendor().startsWith("TEAC") && description().startsWith("CD-R56S") ) {
-+    m_writeModes |= TAO;
-+    d->deviceType |= CDROM|CDR;
-+    m_maxWriteSpeed = 6;
-+    m_maxReadSpeed = 24;
-+    m_bufferSize = 1302;
-+    d->burnfree = false;
++  else if( vendor().startsWith("TEAC") ) { 
++    if( description().startsWith("CD-R56S") ) {
++      m_writeModes |= TAO;
++      d->deviceType |= CDROM|CDR;
++      m_maxWriteSpeed = 6;
++      m_maxReadSpeed = 24;
++      m_bufferSize = 1302;
++      d->burnfree = false;
++    }
++    if( description().startsWith("CD-R58S") ) {
++      m_writeModes |= TAO;
++      d->deviceType |= CDROM|CDR;
++      m_maxWriteSpeed = 8;
++      m_maxReadSpeed = 24;
++      m_bufferSize = 4096;
++      d->burnfree = false;
++    }
 +  }
    else if( vendor().startsWith("MATSHITA") ) {
      if( description().startsWith("CD-R   CW-7501") ) {
        m_writeModes = TAO|SAO;
-@@ -2597,10 +2615,12 @@
+@@ -2663,10 +2691,12 @@
  {
    // if the device is already opened we do not close it
    // to allow fast multible method calls in a row
@@ -61,7 +71,7 @@
  
    // header size is 8
    unsigned char* buffer = 0;
-@@ -2686,13 +2706,16 @@
+@@ -2752,13 +2782,16 @@
      delete [] buffer;
    }
      
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevice.h b/sysutils/k3b/files/patch-src-device-k3bdevice.h
index 557d0e871f44..9ac0e33764ed 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevice.h
+++ b/sysutils/k3b/files/patch-src-device-k3bdevice.h
@@ -1,6 +1,6 @@
---- src/device/k3bdevice.h.orig	Thu Jul 29 12:07:16 2004
-+++ src/device/k3bdevice.h	Sun Aug 22 15:28:36 2004
-@@ -677,6 +677,10 @@
+--- src/device/k3bdevice.h.orig	Sun Nov 28 13:27:24 2004
++++ src/device/k3bdevice.h	Sun Jan  2 09:30:08 2005
+@@ -690,6 +690,10 @@
  
      class Private;
      Private* d;
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp
index a839f7e2a930..f99aa0b15d55 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp
+++ b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp
@@ -1,5 +1,5 @@
---- src/device/k3bdevicemanager.cpp.orig	Sat Jul 17 11:50:08 2004
-+++ src/device/k3bdevicemanager.cpp	Sun Aug 22 15:28:36 2004
+--- src/device/k3bdevicemanager.cpp.orig	Sun Nov 28 13:27:24 2004
++++ src/device/k3bdevicemanager.cpp	Sun Jan  2 09:44:09 2005
 @@ -49,6 +49,12 @@
  #include <sys/stat.h>
  #include <sys/ioctl.h>
@@ -27,15 +27,15 @@
    QFile info("/proc/sys/dev/cdrom/info");
    QString line,devstring;
    info.open(IO_ReadOnly);
-@@ -286,6 +299,7 @@
- //       m_foundDevices++;
- //   }
+@@ -269,6 +282,7 @@
+   // FIXME: also scan /dev/scsi/hostX.... for devfs without symlinks
+ #endif
  
 +#endif
    scanFstab();
  
    return m_foundDevices;
-@@ -423,6 +437,7 @@
+@@ -412,6 +426,7 @@
  bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename)
  {
    bool ret = false;
@@ -43,7 +43,7 @@
    int cdromfd = K3bCdDevice::openDevice( devicename.ascii() );
    if (cdromfd < 0) {
      kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl;
-@@ -463,11 +478,36 @@
+@@ -452,11 +467,36 @@
    }
  
    ::close( cdromfd );
@@ -80,7 +80,7 @@
    K3bDevice* device = 0;
  
    // resolve all symlinks
-@@ -499,6 +539,7 @@
+@@ -488,6 +528,7 @@
      device->m_target = target;
      device->m_lun = lun;
    }
@@ -88,7 +88,7 @@
  
    if( !device->init() ) {
      kdDebug() << "Could not initialize device " << devicename << endl;
-@@ -574,9 +615,20 @@
+@@ -563,9 +604,20 @@
  
      if( K3bDevice* dev = findDevice( resolveSymLink(md) ) )
      {
@@ -109,7 +109,7 @@
          dev->setMountDevice( md );
  	dev->m_supermount = supermount;
        }
-@@ -585,6 +637,8 @@
+@@ -574,6 +626,8 @@
      {
        // compare bus, id, lun since the same device can for example be
        // determined as /dev/srX or /dev/scdX
@@ -118,7 +118,7 @@
        int bus = -1, id = -1, lun = -1;
        if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) {
          if( K3bDevice* dev = findDevice( bus, id, lun ) ) {
-@@ -595,6 +649,17 @@
+@@ -584,6 +638,17 @@
            }
          }
        }
@@ -136,7 +136,7 @@
  
  
      }
-@@ -670,5 +735,131 @@
+@@ -659,5 +724,138 @@
    return QString::fromLatin1( resolved );
  }
  
@@ -152,7 +152,7 @@
 +	int need_close = 0;
 +	int skip_device = 0;
 +	int bus, target, lun;
-+	QString dev1, dev2;
++	QString dev1 = "", dev2 = "";
 +
 +	if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) 
 +	{
@@ -205,15 +205,19 @@
 +#if __FreeBSD_version < 500100
 +					dev += "c";
 +#endif
-+
-+					K3bDevice* device = new K3bDevice(dev.latin1());
-+					device->m_bus = bus;
-+					device->m_target = target;
-+					device->m_lun = lun;
-+					device->m_passDevice = "/dev/" + pass;
-+					kdDebug() << "(bsd_scan_devices) add device " << dev << ":" << bus << ":" << target << ":" << lun << endl;
-+					addDevice(device);
++					if (dev1 != "" && dev2 != "")
++					{
++						K3bDevice* device = new K3bDevice(dev.latin1());
++						device->m_bus = bus;
++						device->m_target = target;
++						device->m_lun = lun;
++						device->m_passDevice = "/dev/" + pass;
++						kdDebug() << "(bsd_scan_devices) add device " << dev << ":" << bus << ":" << target << ":" << lun << endl;
++						addDevice(device);
++					}
 +					need_close = 0;
++					dev1="";
++					dev2="";
 +				}
 +				bus = dev_result->path_id;
 +				target = dev_result->target_id;
@@ -255,13 +259,16 @@
 +#if __FreeBSD_version < 500100
 +					dev += "c";
 +#endif
-+					K3bDevice* device = new K3bDevice(dev.latin1());
-+					device->m_bus = bus;
-+					device->m_target = target;
-+					device->m_lun = lun;
-+					device->m_passDevice = "/dev/" + pass;
-+					kdDebug() << "(bsd_scan_devices) add device " << dev << ":" << bus << ":" << target << ":" << lun << endl;
-+					addDevice(device);
++					if (dev1 != "" && dev2 != "")
++					{
++						K3bDevice* device = new K3bDevice(dev.latin1());
++						device->m_bus = bus;
++						device->m_target = target;
++						device->m_lun = lun;
++						device->m_passDevice = "/dev/" + pass;
++						kdDebug() << "(bsd_scan_devices) add device " << dev << ":" << bus << ":" << target << ":" << lun << endl;
++						addDevice(device);
++					}
 +	}
 +	close(fd);
 +}
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h
index 4f9acc5a36dc..7e776226bb86 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h
+++ b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h
@@ -1,5 +1,5 @@
 --- src/device/k3bdevicemanager.h.orig	Wed Jan 21 11:20:11 2004
-+++ src/device/k3bdevicemanager.h	Sun Aug 22 15:28:36 2004
++++ src/device/k3bdevicemanager.h	Sun Jan  2 09:30:08 2005
 @@ -112,6 +112,10 @@
  
        class Private;
diff --git a/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp b/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp
index e2162c1bcf7c..5a5f1a442391 100644
--- a/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp
+++ b/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp
@@ -1,5 +1,5 @@
---- src/device/k3bscsicommand.cpp.orig	Wed Jan 21 11:20:11 2004
-+++ src/device/k3bscsicommand.cpp	Sun Aug 22 15:28:36 2004
+--- src/device/k3bscsicommand.cpp.orig	Sun Aug 15 11:58:23 2004
++++ src/device/k3bscsicommand.cpp	Sun Jan  2 09:30:08 2005
 @@ -58,13 +58,14 @@
  
  
@@ -21,7 +21,7 @@
  
  K3bCdDevice::ScsiCommand::ScsiCommand( const K3bCdDevice::CdDevice* dev )
    : m_device(dev)
-@@ -135,6 +136,155 @@
+@@ -141,6 +142,155 @@
      return 0;
  }
  
diff --git a/sysutils/k3b/files/patch-src-device-k3bscsicommand.h b/sysutils/k3b/files/patch-src-device-k3bscsicommand.h
index f0e12a23295b..3c4a17c90648 100644
--- a/sysutils/k3b/files/patch-src-device-k3bscsicommand.h
+++ b/sysutils/k3b/files/patch-src-device-k3bscsicommand.h
@@ -1,5 +1,5 @@
 --- src/device/k3bscsicommand.h.orig	Wed Jan 21 11:20:11 2004
-+++ src/device/k3bscsicommand.h	Sun Aug 22 15:28:36 2004
++++ src/device/k3bscsicommand.h	Sun Jan  2 09:30:08 2005
 @@ -17,9 +17,27 @@
  #define _K3B_SCSI_COMMAND_H_
  
diff --git a/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp b/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp
index feaa2ecc86a4..ce6fbcb63c4a 100644
--- a/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp
+++ b/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp
@@ -1,5 +1,5 @@
 --- src/rip/k3bdvdrippingprocess.cpp.orig	Wed Jun  2 11:31:41 2004
-+++ src/rip/k3bdvdrippingprocess.cpp	Sun Aug 22 15:28:36 2004
++++ src/rip/k3bdvdrippingprocess.cpp	Sun Jan  2 09:30:08 2005
 @@ -285,10 +285,13 @@
  void K3bDvdRippingProcess::slotPreProcessingDvd() {
      QString video;
diff --git a/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp b/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp
index 9757b9bb7916..915d1ae51a1a 100644
--- a/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp
+++ b/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp
@@ -1,5 +1,5 @@
 --- src/rip/k3bmovieview.cpp.orig	Fri Feb  6 12:08:51 2004
-+++ src/rip/k3bmovieview.cpp	Sun Aug 22 15:28:36 2004
++++ src/rip/k3bmovieview.cpp	Sun Jan  2 09:30:08 2005
 @@ -223,8 +223,11 @@
      }
  
diff --git a/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp b/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp
index 496f7cf4c8c2..38024980ea3d 100644
--- a/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp
+++ b/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp
@@ -1,5 +1,5 @@
 --- src/rip/k3btcwrapper.cpp.orig	Wed Jan 21 11:20:20 2004
-+++ src/rip/k3btcwrapper.cpp	Sun Aug 22 15:28:36 2004
++++ src/rip/k3btcwrapper.cpp	Sun Jan  2 09:30:08 2005
 @@ -65,7 +65,12 @@
    //K3bProcess *p = new K3bProcess();
    emit tcprobeTitleParsed( m_currentTitle );
diff --git a/sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp b/sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp
index f08184166c66..6e9fe5ad3223 100644
--- a/sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp
+++ b/sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp
@@ -1,5 +1,5 @@
 --- src/rip/k3bvideocdrip.cpp.orig	Wed Jan 21 11:20:20 2004
-+++ src/rip/k3bvideocdrip.cpp	Sun Aug 22 15:28:36 2004
++++ src/rip/k3bvideocdrip.cpp	Sun Jan  2 09:30:08 2005
 @@ -41,7 +41,8 @@
          m_ripsourceType( 0 ),
          m_videooptions( options ),