← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/libmythtv/frequencytables.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
https://launchpad.net/bugs/537714
https://launchpad.net/bugs/483748
https://launchpad.net/bugs/546552
https://launchpad.net/bugs/544521
[ 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:
libs/libmythtv/frequencytables.cpp
17
17
    : mplexid((uint)-1),  FriendlyName(""),
18
18
      friendlyNum(0),     SourceID(0),          UseTimer(false),
19
19
      scanning(false),    timeoutTune(1000)
20
 
{ 
 
20
{
21
21
    bzero(freq_offsets, sizeof(int)*3);
22
22
 
23
23
    tuning.Clear();
36
36
 
37
37
    tuning.Clear();
38
38
    tuning.sistandard = _si_std;
 
39
 
 
40
    if (_si_std == "analog")
 
41
    {
 
42
        tuning.sistandard = "analog";
 
43
        tuning.modulation = DTVModulation::kModulationAnalog;
 
44
    }
39
45
}
40
46
 
41
47
TransportScanItem::TransportScanItem(uint           _sourceid,
61
67
      SourceID(_sourceid), UseTimer(false),
62
68
      scanning(false),     timeoutTune(_timeoutTune)
63
69
{
64
 
    bzero(freq_offsets, sizeof(int) * 3); 
 
70
    bzero(freq_offsets, sizeof(int) * 3);
65
71
    expectedChannels = _tuning.channels;
66
72
 
67
73
    tuning.Clear();
95
101
 
96
102
    // setup tuning params
97
103
    tuning.frequency  = freq;
98
 
    tuning.sistandard = (std.toLower() != "atsc") ? "dvb" : "atsc";
 
104
    tuning.sistandard = "dvb";
99
105
    tuning.modulation = ft.modulation;
 
106
 
 
107
    if (std.toLower() == "atsc")
 
108
        tuning.sistandard = "atsc";
 
109
    else if (std.toLower() == "analog")
 
110
    {
 
111
        tuning.sistandard = "analog";
 
112
        tuning.modulation = DTVModulation::kModulationAnalog;
 
113
    }
 
114
 
100
115
    freq_offsets[1]   = ft.offset1;
101
116
    freq_offsets[2]   = ft.offset2;
102
117
 
148
163
    str += QString("\tUseTimer(%1) scanning(%2)\n")
149
164
        .arg(UseTimer).arg(scanning);
150
165
    str += QString("\ttimeoutTune(%3 msec)\n").arg(timeoutTune);
151
 
    if (tuning.sistandard == "atsc")
 
166
    if (tuning.sistandard == "atsc" || tuning.sistandard == "analog")
152
167
    {
153
168
        str += QString("\tfrequency(%1) modulation(%2)\n")
154
169
            .arg(tuning.frequency)
155
 
            .arg(tuning.modulation);
 
170
            .arg(tuning.modulation.toString());
156
171
    }
157
172
    else
158
173
    {
159
174
        str += QString("\tfrequency(%1) constellation(%2)\n")
160
175
            .arg(tuning.frequency)
161
 
            .arg(tuning.modulation);
 
176
            .arg(tuning.modulation.toString());
162
177
        str += QString("\t  inv(%1) bandwidth(%2) hp(%3) lp(%4)\n")
163
178
            .arg(tuning.inversion)
164
179
            .arg(tuning.bandwidth)
262
277
 
263
278
    freq_table_list_t list =
264
279
        get_matching_freq_tables_internal(format, modulation, country);
265
 
    
 
280
 
266
281
    for (uint i = 0; i < list.size(); ++i)
267
282
    {
268
283
        int min_freqid = list[i]->name_offset;