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

« back to all changes in this revision

Viewing changes to libs/libmythtv/tv.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:
11
11
 */
12
12
QString StateToString(TVState state, bool brief)
13
13
{
14
 
    bool appendWatching = false;
15
14
    QString statestr = QString("Unknown(%1)").arg((int)state);
16
15
    switch (state) {
17
16
        case kState_Error: statestr = "Error"; break;
18
17
        case kState_None: statestr = "None"; break;
19
18
        case kState_WatchingLiveTV:
20
19
            statestr = "WatchingLiveTV";
21
 
            appendWatching = true;
22
20
            break;
23
21
        case kState_WatchingPreRecorded:
24
22
            statestr = "WatchingPreRecorded";
25
 
            appendWatching = true;
26
23
            break;
27
24
        case kState_WatchingVideo:
28
 
            statestr = "Video";
29
 
            appendWatching = true;
 
25
            statestr = (brief) ? "Video" : "WatchingVideo";
30
26
            break;
31
27
        case kState_WatchingDVD:
32
 
            statestr = "DVD";
33
 
            appendWatching = true;
 
28
            statestr = (brief) ? "DVD" : "WatchingDVD";
34
29
            break;
35
30
        case kState_WatchingRecording:
36
31
            statestr = "WatchingRecording";
37
 
            appendWatching = true;
38
32
            break;
39
33
        case kState_RecordingOnly:
40
34
            statestr = "RecordingOnly";
41
 
            appendWatching  = true;
42
35
            break;
43
36
        case kState_ChangingState: statestr = "ChangingState"; break;
44
37
    }
45
38
    statestr.detach();
46
 
    if (!brief && appendWatching)
47
 
        statestr.prepend("Watching ");
48
39
    return statestr;
49
40
}
50
41