Permalink
Browse files

Refs #10970. Don't print EOF as error if it's expected.

This isn't the cause of any issues, it's just a bit confusing when reading the logs.
When we close a DRB we are expecting a EOF so it's not an error when we see it..
  • Loading branch information...
1 parent ff9073d commit 9f0be65bfcf192191d8905012f173f80a19f66d5 @daniel-kristjansson daniel-kristjansson committed Aug 3, 2012
Showing with 12 additions and 3 deletions.
  1. +12 −3 mythtv/libs/libmythtv/dvbstreamhandler.cpp
@@ -97,8 +97,14 @@ DVBStreamHandler::DVBStreamHandler(const QString &dvb_device) :
void DVBStreamHandler::SetRunningDesired(bool desired)
{
if (_drb && _running_desired && !desired)
+ {
+ StreamHandler::SetRunningDesired(desired);
_drb->Stop();
- StreamHandler::SetRunningDesired(desired);
+ }
+ else
+ {
+ StreamHandler::SetRunningDesired(desired);
+ }
}
void DVBStreamHandler::run(void)
@@ -179,9 +185,12 @@ void DVBStreamHandler::RunTS(void)
drb->Start();
}
- SetRunning(true, _needs_buffering, false);
{
+ // SetRunning() + set _drb
QMutexLocker locker(&_start_stop_lock);
+ _running = true;
+ _using_buffering = _needs_buffering;
+ _using_section_reader = false;
_drb = drb;
}
@@ -209,7 +218,7 @@ void DVBStreamHandler::RunTS(void)
_error = true;
}
- if (drb->IsEOF())
+ if (drb->IsEOF() && _running_desired)
{
LOG(VB_GENERAL, LOG_ERR, LOC + "Device EOF detected");
_error = true;

0 comments on commit 9f0be65

Please sign in to comment.