~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythtv/jobqueue.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey), Jamie Bennett, Mario Limonciello, Dave Walker (Daviey)
  • Date: 2010-03-23 19:32:33 UTC
  • mfrom: (1.1.49 upstream)
  • Revision ID: james.westby@ubuntu.com-20100323193233-5sv9djoxtlmwt3ca
Tags: 0.23.0+fixes23789-0ubuntu1
[ Jamie Bennett ]
* Fix FTBFS on armel (LP: #537714)

[ Mario Limonciello ]
* mythtv-{common,backend}.{config,templates,postinst}: (LP: #483748)
  - Simplify debconf questions by avoiding showing the generated pw
  - Don't warn about mythtv group.
  - Don't notify about running mythtv-setup.  This is optional (but
    of course encouraged!)
* Set version to include a "+" delimitter.
* Restore libfaad-dev dependency. (LP: #546552)

[ Dave Walker (Daviey) ]
* New snapshot (r23789), based from 0.23-fixes.
* debian/control:
  - mythtv-frontend set to Conflict with mythflix, as it's dropped
    upstream. (LP: #544521)
  - Remove unnecessary and potentially problematic use of Pre-Depends.
  - Set the debug package to Priority extra.
  - Change *-perl Section's from libs to perl
  - add ${shlibs:Depends} for mythtv-common Depends field
  - Minor spelling fix.
  - Fixes the long description for one of the packages, ensuring the
    description doesn't exceed 80 characters.
  - Vcs-* set to -fixes, rather than -trunk.
* debian/rules:
  - Use debconf-updatepo to update translations when required
  - Ensure license files are not included in the binary packages, except 
    for debian/copyright.
  - Fixes the permissions of certain files in the packaging.
* debian/copyright:
  - updated to reflect that mythtv is GPL-2 only.
  - inserted better licence statement and Copyright reference.
* debian/mythtv-*.templates
  - Simplified strings; removed verbosity and improved readability.
* Prevent the maintainer scripts from failing in case any questions 
  can't be displayed.
* Added holding debian/mythtv-frontend.config, mainly to appease lintian.
* debian/mythtv-frontend.menu: Changed section to Applications/Graphics.
* debian/mythtv-backend.postinst: Load debconf libraries.
* debian/source.lintian-overrides: Removes the unecessary override of the 
  binNMU warnings.
* Fix perl binding installation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1620
1620
 
1621
1621
    ChangeJobStatus(jobID, JOB_PENDING);
1622
1622
    ProgramInfo *pginfo = NULL;
1623
 
    
 
1623
 
1624
1624
    if (!job.chanid.isEmpty())
1625
1625
    {
1626
1626
        pginfo = ProgramInfo::GetProgramFromRecorded(job.chanid, job.starttime);
1778
1778
        ProgramInfo *pginfo = runningJobs[id].pginfo;
1779
1779
        if (pginfo)
1780
1780
        {
1781
 
            pginfo->MarkAsInUse(false);
 
1781
            pginfo->MarkAsInUse(false, kJobQueueInUseID);
1782
1782
            delete pginfo;
1783
1783
        }
1784
1784
 
1852
1852
    runningJobsLock->unlock();
1853
1853
 
1854
1854
    QString subtitle;
1855
 
    
 
1855
 
1856
1856
    if (!program_info->subtitle.isEmpty())
1857
1857
        subtitle = QString(" \"%1\"").arg(program_info->subtitle);
1858
1858
 
2088
2088
    runningJobsLock->unlock();
2089
2089
 
2090
2090
    QString subtitle;
2091
 
    
 
2091
 
2092
2092
    if (!program_info->subtitle.isEmpty())
2093
2093
        subtitle = QString(" \"%1\"").arg(program_info->subtitle);
2094
2094
 
2231
2231
    ChangeJobStatus(jobID, JOB_RUNNING);
2232
2232
 
2233
2233
    QString msg;
2234
 
    
 
2234
 
2235
2235
    if (pginfo)
2236
2236
        msg = QString("Started %1 for \"%2\" recorded from channel %3 at %4")
2237
2237
                      .arg(jobDesc).arg(pginfo->title).arg(pginfo->chanid)