← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mythtv/maverick

« back to all changes in this revision

Viewing changes to .pc/36_setgroups_too/programs/mythbackend/main.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Dave Walker, Mario Limonciello
  • Date: 2010-02-27 14:33:45 UTC
  • mfrom: (1.1.48 upstream)
  • Revision ID: james.westby@ubuntu.com-20100227143345-qye52374g4b4caf9
Tags: 0.23.0~trunk23623-0ubuntu1
https://launchpad.net/bugs/524822
https://launchpad.net/bugs/527288
[ Dave Walker ]
* debian/control:  Added quilt as a build-depends, primarily
  for karmic builds.

[ Mario Limonciello ]
* New checkout (r23623).
  - Fixes audio issues w/ ac3 audio.
* debian/patches/36_setgroups_too:
  - Set the right args for setgroups. (LP: #524822)
* debian/rules:
  - Explicitly set all shell scripts executable.  Fixes problems on < lucid
    builds.
* debian/control:
  - Correct the replaces statements. (LP: #527288)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/36_setgroups_too/programs/mythbackend/main.cpp
332
332
                    .arg(chanid).arg(starttime));
333
333
            return GENERIC_EXIT_NOT_OK;
334
334
        }
 
335
        pginfo->pathname = pginfo->GetPlaybackURL(false, true);
335
336
    }
336
337
    else if (!infile.isEmpty())
337
338
    {
357
358
                    pginfo->pathname = QString("dvd:%1").arg(infile);
358
359
                }
359
360
                else
360
 
                    pginfo->pathname = infile;
 
361
                {
 
362
                    pginfo->pathname = QFileInfo(infile).absoluteFilePath();
 
363
                }
361
364
            }
362
365
 
363
366
        }
364
 
 
 
367
        else
 
368
        {
 
369
            pginfo->pathname = pginfo->GetPlaybackURL(false, true);
 
370
        }
365
371
    }
366
372
    else
367
373
    {
369
375
        return GENERIC_EXIT_NOT_OK;
370
376
    }
371
377
 
372
 
    PreviewGenerator *previewgen = new PreviewGenerator(pginfo, PreviewGenerator::kLocal);
 
378
    PreviewGenerator *previewgen = new PreviewGenerator(
 
379
        pginfo, PreviewGenerator::kLocal);
373
380
 
374
381
    if (previewFrameNumber >= 0)
375
382
        previewgen->SetPreviewTimeAsFrameNumber(previewFrameNumber);
379
386
 
380
387
    previewgen->SetOutputSize(previewSize);
381
388
    previewgen->SetOutputFilename(outfile);
382
 
    previewgen->RunReal();
 
389
    bool ok = previewgen->RunReal();
383
390
    previewgen->deleteLater();
384
391
 
385
392
    delete pginfo;
386
393
 
387
 
    return GENERIC_EXIT_OK;
 
394
    return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_NOT_OK;
388
395
}
389
396
 
390
397
// [WxH] | [WxH@]seconds[S] | [WxH@]frame_numF