← Back to branch summary

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

« back to all changes in this revision

Viewing changes to 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:
programs/mythbackend/main.cpp
333
333
                    .arg(chanid).arg(starttime));
334
334
            return GENERIC_EXIT_NOT_OK;
335
335
        }
 
336
        pginfo->pathname = pginfo->GetPlaybackURL(false, true);
336
337
    }
337
338
    else if (!infile.isEmpty())
338
339
    {
358
359
                    pginfo->pathname = QString("dvd:%1").arg(infile);
359
360
                }
360
361
                else
361
 
                    pginfo->pathname = infile;
 
362
                {
 
363
                    pginfo->pathname = QFileInfo(infile).absoluteFilePath();
 
364
                }
362
365
            }
363
366
 
364
367
        }
365
 
 
 
368
        else
 
369
        {
 
370
            pginfo->pathname = pginfo->GetPlaybackURL(false, true);
 
371
        }
366
372
    }
367
373
    else
368
374
    {
370
376
        return GENERIC_EXIT_NOT_OK;
371
377
    }
372
378
 
373
 
    PreviewGenerator *previewgen = new PreviewGenerator(pginfo, PreviewGenerator::kLocal);
 
379
    PreviewGenerator *previewgen = new PreviewGenerator(
 
380
        pginfo, PreviewGenerator::kLocal);
374
381
 
375
382
    if (previewFrameNumber >= 0)
376
383
        previewgen->SetPreviewTimeAsFrameNumber(previewFrameNumber);
380
387
 
381
388
    previewgen->SetOutputSize(previewSize);
382
389
    previewgen->SetOutputFilename(outfile);
383
 
    previewgen->RunReal();
 
390
    bool ok = previewgen->RunReal();
384
391
    previewgen->deleteLater();
385
392
 
386
393
    delete pginfo;
387
394
 
388
 
    return GENERIC_EXIT_OK;
 
395
    return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_NOT_OK;
389
396
}
390
397
 
391
398
// [WxH] | [WxH@]seconds[S] | [WxH@]frame_numF
900
907
                }
901
908
                getgrouplist(user_info->pw_name, user_info->pw_gid, groups, &ngroups);
902
909
            }
903
 
            if (setgroups(sizeof(groups), groups) == -1)
 
910
            if (setgroups(ngroups, groups) == -1)
904
911
            {
905
912
                free(groups);
906
913
                VERBOSE(VB_IMPORTANT, "Error setting groups.");