[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [k3b/cdrskin] /: Change features and arguments for Cdrskin
From:       Leslie Zhai <xiangzhai83 () gmail ! com>
Date:       2016-12-01 2:39:26
Message-ID: E1cCHHS-0006hh-PV () code ! kde ! org
[Download RAW message or body]

Git commit 5213bf69e5a0c1aa0d2115b2bbe851e7294bcbf0 by Leslie Zhai.
Committed on 01/12/2016 at 02:33.
Pushed by lesliezhai into branch 'cdrskin'.

Change features and arguments for Cdrskin

Test plan1:
1. cdemu create-blank --writer-id=WRITER-ISO --medium-type=dvd+r 0
~/virt.iso
2. k3b burn ArchLinux iso
* FAILED: cdrskin-burn-archlinux-iso-debugging-output3.txt

Test plan2:
1. cdemu create-blank --writer-id=WRITER-ISO --medium-type=dvd+r 0
~/virt.iso
2. dd if=/dev/zero bs=2048 count=375808 | /usr/sbin/cdrskin -v -V
dev=/dev/sr1 speed=18 -tao -data -tsize=375808s - 2>&1 | tee -i
/tmp/cdrskin1.log
* SUCCESS: cdrskin1.log

Test plan3:
1. cdemu create-blank --writer-id=WRITER-ISO --medium-type=dvd+r 0
~/virt.iso
2. dd if=/dev/zero bs=2048 count=375808 | /usr/sbin/cdrskin -v -V
dev=/dev/sr1 speed=18 -tao -data -tsize=375808s - >/tmp/cdrskin2.log 2>&1
* SUCCESS: cdrskin2.log

Test plan4:
1. cdemu create-blank --writer-id=WRITER-ISO --medium-type=dvd+r 0
~/virt.iso
2. dd if=/dev/zero bs=2048 count=375808 | /usr/bin/cdrecord -d -v -V
gracetime=2 dev=/dev/sr1 speed=18 -sao driveropts=burnfree -data
-tsize=375808s - >/tmp/cdrecord.log 2>&1
* SUCCESS: cdrecord.log

CCMAIL: scdbackup@gmx.net
CCBUG: 137436

M  +4    -1    libk3b/core/k3bdefaultexternalprograms.cpp
M  +5    -17   libk3b/projects/k3bcdrskinwriter.cpp
M  +1    -0    libk3bdevice/k3bdevice.cpp

https://commits.kde.org/k3b/5213bf69e5a0c1aa0d2115b2bbe851e7294bcbf0

diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
index da3b971..a8f4c06 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -572,11 +572,14 @@ bool K3b::CdrskinProgram::scanFeatures(ExternalBin& bin) const
         bin.setVersion(QString(bin.version().versionString()).remove("-dvd"));
     }
 
+    // TODO: find . -name "*.cpp" | xargs grep plain-atapi
+    // In src/k3bsystemproblemdialog.cpp there is Check for we have atapi support 
+    // in some way in the kernel
     bin.addFeature("plain-atapi");
+    // The same story
     bin.addFeature("hacked-atapi");
 
     bin.addFeature("burnfree");
-    bin.addFeature("burnproof");
 
     if (bin.version() >= K3b::Version(0, 6, 2)) {
 #ifdef K3B_DEBUG
diff --git a/libk3b/projects/k3bcdrskinwriter.cpp b/libk3b/projects/k3bcdrskinwriter.cpp
index a012368..e73d739 100644
--- a/libk3b/projects/k3bcdrskinwriter.cpp
+++ b/libk3b/projects/k3bcdrskinwriter.cpp
@@ -257,7 +257,7 @@ bool K3b::CdrskinWriter::prepareProcess()
         //
         // One may omit both -tao and -sao in order to let cdrskin decide on base
         // of -multi, input source and Medium state which write type to use.
-        d->process << "-sao" << "-tao";
+        d->process << "-tao"/* << "-sao"*/;
     }
     else if( K3b::Device::isCdMedia( d->burnedMediaType ) ) {
         if( d->writingMode == K3b::WritingModeSao || d->cue ) {
@@ -275,15 +275,9 @@ bool K3b::CdrskinWriter::prepareProcess()
             // cdrskin supports only -audio and -data.
             // Options -xa1, -xa, -xa2, -mode2 do not lead to error but the payload is
             // nevertheless written as -data.
-            if (burnDevice()->supportsWritingMode(K3b::Device::WRITINGMODE_RAW_R96R) || 
-                burnDevice()->supportsWritingMode(K3b::Device::WRITINGMODE_RAW_R16)  ||
-                burnDevice()->supportsWritingMode(K3b::Device::WRITINGMODE_RAW_R96P)) {
-                d->process << "-data";
-            } else {
-                emit infoMessage( i18n("Writer does not support raw writing."), MessageWarning );
-                if( d->cdrskinBinObject->hasFeature( "tao" ) )
-                    d->process << "-tao";
-            }
+            emit infoMessage(i18n("Writer does not support raw writing."), MessageWarning);
+            if (d->cdrskinBinObject->hasFeature("tao"))
+                d->process << "-tao";
         }
         else if( d->cdrskinBinObject->hasFeature( "tao" ) )
             d->process << "-tao";
@@ -295,12 +289,6 @@ bool K3b::CdrskinWriter::prepareProcess()
 
     if (simulate())
         d->process << "-dummy";
-    // TODO: CDEmu
-#ifdef K3B_DEBUG
-    qDebug() << "DEBUG:" << __PRETTY_FUNCTION__ << burnDevice()->description();
-#endif
-    if (burnDevice()->description().contains("Virt"))
-        d->process << "--allow_emulated_drives";
 
     d->usingBurnfree = false;
     if (k3bcore->globalSettings()->burnfree()) {
@@ -338,7 +326,7 @@ bool K3b::CdrskinWriter::prepareProcess()
                 d->process << "blank=all";
                 break;
             case FormattingQuick:
-                if (d->burnedMediaType & Device::MEDIA_DVD_PLUS_RW)
+                if (d->burnedMediaType & Device::MEDIA_DVD_RW_SEQ)
                     d->process << "blank=deformat_sequential_quickest";
                 break;
         }
diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp
index 2cec00a..db0a976 100644
--- a/libk3bdevice/k3bdevice.cpp
+++ b/libk3bdevice/k3bdevice.cpp
@@ -249,6 +249,7 @@ K3b::Device::Device::Device( const Solid::Device& dev )
 #endif
     d = new Private;
     d->solidDevice = dev;
+    // TODO: block device address might not be "stdio:/path"
 #ifndef Q_OS_NETBSD
     d->blockDevice = dev.as<Solid::Block>()->device();
 #else
[prev in list] [next in list] [prev in thread] [next in thread]