← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/libmythtv/channelscan/channelscanner.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, John Baab
  • Date: 2009-09-29 01:33:23 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20090929013323-6pvn8encm757zbxw
Tags: 0.22.0~trunk22101-0ubuntu1
[ Mario Limonciello ]
* New upstream checkout (r22101)
* Try to guard and make sure that ~mythtv is read from /etc/passwd 
  rather than assuming it's /home/mythtv.

[ John Baab ]
* debian/mythtv-common.postinst:
  - Added symlink for /home/mythtv/.mythtv/config.xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythtv/channelscan/channelscanner.cpp
328
328
                channel_timeout * 10 : signal_timeout;
329
329
        }
330
330
 
 
331
        // ensure a minimal signal timeout of 1 second
 
332
        signal_timeout = max(signal_timeout, 1000U);
 
333
 
331
334
        // Make sure that channel_timeout is at least 7 seconds to catch
332
335
        // at least one SDT section. kDVBTableTimeout in ChannelScanSM
333
336
        // ensures that we catch the NIT then.