← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libk3b/jobs/k3bmetawriter.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/jobs/k3bmetawriter.cpp
261
261
    bool cdrecordOnTheFly = false;
262
262
    bool cdrecordCdText = false;
263
263
    bool cdrecordBluRay = false;
 
264
    bool cdrecordWodim = false;
264
265
    bool growisofsBluRay = false;
265
266
    if( k3bcore->externalBinManager()->binObject("cdrecord") ) {
266
267
        cdrecordOnTheFly = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "audio-stdin" );
267
268
        cdrecordCdText = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "cdtext" );
268
269
        cdrecordBluRay = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "blu-ray" );
 
270
        cdrecordWodim = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" );
269
271
    }
270
272
    if( k3bcore->externalBinManager()->binObject("growisofs") ) {
271
273
        growisofsBluRay = k3bcore->externalBinManager()->binObject("growisofs")->hasFeature( "blu-ray" );
316
318
                d->usedWritingApp = WritingAppGrowisofs;
317
319
            }
318
320
            else if( mediaType & Device::MEDIA_DVD_ALL ) {
319
 
                d->usedWritingApp = WritingAppCdrecord;
 
321
                // wodim (at least on fedora) doesn't do DVDs all that well, use growisofs instead
 
322
                if ( cdrecordWodim ) {
 
323
                    d->usedWritingApp = WritingAppGrowisofs;
 
324
                }
 
325
                else {
 
326
                    d->usedWritingApp = WritingAppCdrecord;
 
327
                }
320
328
            }
321
329
            else if( mediaType & Device::MEDIA_BD_ALL ) {
322
 
                if( cdrecordBluRay ) {
 
330
                if( cdrecordBluRay && ! cdrecordWodim ) {
323
331
                    d->usedWritingApp = WritingAppCdrecord;
324
332
                }
325
333
                else if( growisofsBluRay ) {