diff options
Diffstat (limited to 'p2pvr/devices/devices.cpp')
| -rw-r--r-- | p2pvr/devices/devices.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/p2pvr/devices/devices.cpp b/p2pvr/devices/devices.cpp index 420632d..8cd9a74 100644 --- a/p2pvr/devices/devices.cpp +++ b/p2pvr/devices/devices.cpp @@ -52,7 +52,9 @@ DevicesI::getTuner() } for (auto devItr = devices.begin(); devItr != devices.end(); devItr++) { try { - return openTuner(*devItr); + TunerPtr tuner = openTuner(*devItr); + devices.erase(devItr); + return tuner; } catch (...) { logger->messagebf(LOG::DEBUG, "%s: Failed to open device %s", __PRETTY_FUNCTION__, @@ -121,17 +123,17 @@ DevicesI::releaseTuner(const TunerPtr & tuner) Lock(lock); logger->messagebf(LOG::DEBUG, "%s", __PRETTY_FUNCTION__); auto openTuner = std::find_if(openDevices.begin(), openDevices.end(), [&tuner](const auto & ot) { - return ot.second->tuner == tuner; - }); - if (openTuner == openDevices.end()) { - logger->messagebf(LOG::DEBUG, "%s: Not one of mine", __PRETTY_FUNCTION__); - throw DeviceError(); + return ot.second->tuner == tuner; + }); + if (openTuner != openDevices.end()) { + openTuner->second->clients -= 1; + if (openTuner->second->clients == 0) { + openDevices.erase(openTuner); + devices.push_back(tuner->GetDevice()); + } } - logger->messagebf(LOG::DEBUG, "%s: Locally owned deivce %s", __PRETTY_FUNCTION__, openTuner->first); - openTuner->second->clients -= 1; - if (openTuner->second->clients == 0) { - openDevices.erase(openTuner); - devices.push_back(openTuner->second->tuner->GetDevice()); + else { + devices.push_back(tuner->GetDevice()); } } |