← Back to branch summary

~ubuntu-branches/ubuntu/trusty/k3b/trusty

« back to all changes in this revision

Viewing changes to libk3b/projects/datacd/k3bdatajob.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2013-11-12 10:36:01 UTC
  • mfrom: (2.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20131112103601-q6vvln9lv3mg7qxh
Tags: 2.0.2-7ubuntu1
* Merge with Debian, remaining changes:
  - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
  - Do not ship k3b documentation, it's for the KDE3 version.
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Keep kubuntu_05_no_system_settings.diff
  - Keep kubuntu_07_quicklists.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff and
    112_dont_require_mp3.diff which aren't required due to our mp3 patches.
  - swap kubuntu_06_libav_0.7.diff for Debian's
    Fixed_compilation_with_new_FFMPEG.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libk3b/projects/datacd/k3bdatajob.cpp
58
58
{
59
59
public:
60
60
    Private()
61
 
        : usedWritingApp(K3b::WritingAppCdrecord),
 
61
        : usedWritingApp(K3b::WritingAppAuto),
62
62
          verificationJob( 0 ),
63
63
          pipe( 0 ) {
64
64
    }
813
813
 
814
814
        d->usedWritingApp = writingApp();
815
815
        // let's default to cdrecord for the time being (except for special cases below)
 
816
        // but prefer growisofs to wodim for DVDs
816
817
        if ( d->usedWritingApp == K3b::WritingAppAuto ) {
817
 
            d->usedWritingApp = K3b::WritingAppCdrecord;
 
818
            if (k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" ))
 
819
                d->usedWritingApp = K3b::WritingAppGrowisofs;
 
820
            else
 
821
                d->usedWritingApp = K3b::WritingAppCdrecord;
818
822
        }
819
823
 
820
824
        // -------------------------------
930
934
    else if ( foundMedium & K3b::Device::MEDIA_BD_ALL ) {
931
935
        d->usedWritingApp = writingApp();
932
936
        if( d->usedWritingApp == K3b::WritingAppAuto ) {
933
 
            d->usedWritingApp = K3b::WritingAppCdrecord;
 
937
            if (k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" ))
 
938
                d->usedWritingApp = K3b::WritingAppGrowisofs;
 
939
            else
 
940
                d->usedWritingApp = K3b::WritingAppCdrecord;
934
941
        }
935
942
 
936
943
        if ( d->usedWritingApp == K3b::WritingAppCdrecord &&