diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-08-06 13:55:18 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-08-06 13:55:18 +0100 |
| commit | 03bbf6176f28955d9fd8ed4b090f73ac4f2c990c (patch) | |
| tree | f6b969504e7c2caee50443241bafbd9ad794b0ef | |
| parent | Unify local/global devices and tuners into a single coherent service (diff) | |
| download | p2pvr-03bbf6176f28955d9fd8ed4b090f73ac4f2c990c.tar.bz2 p2pvr-03bbf6176f28955d9fd8ed4b090f73ac4f2c990c.tar.xz p2pvr-03bbf6176f28955d9fd8ed4b090f73ac4f2c990c.zip | |
Tidy private functions in DevicesI
| -rw-r--r-- | p2pvr/devices/devices.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/p2pvr/devices/devices.h b/p2pvr/devices/devices.h index 0d8af11..30e0848 100644 --- a/p2pvr/devices/devices.h +++ b/p2pvr/devices/devices.h @@ -45,23 +45,24 @@ class DLL_PUBLIC DevicesI : public Tuners { private: typedef boost::function<DVBSI::DeliveryPtr()> DeliveryProvider; - TunerPtr getTuner(); - TunerPtr getTuner(const DeliveryProvider &); - TunerPtr getTuner(const DVBSI::DeliveryPtr &); - void releaseTuner(const TunerPtr &); - typedef boost::function<void(TunerPtr)> Target; - void finiteTunerOperation(TunerPtr && tuner, const Target &); - typedef boost::shared_ptr<OpenTuner> OpenTunerPtr; typedef std::map<Ice::Int, OpenTunerPtr> OpenDevices; - OpenDevices openDevices; typedef std::map<Ice::Int, TunerPtr> BackgroundOperations; + + DLL_PRIVATE TunerPtr getTuner(); + DLL_PRIVATE TunerPtr getTuner(const DeliveryProvider &); + DLL_PRIVATE TunerPtr getTuner(const DVBSI::DeliveryPtr &); + DLL_PRIVATE void releaseTuner(const TunerPtr &); + DLL_PRIVATE void finiteTunerOperation(TunerPtr && tuner, const Target &); + + OpenDevices openDevices; BackgroundOperations backgroundOperations; std::vector<boost::filesystem::path> devices; std::mutex lock; - static IceTray::Logging::LoggerPtr logger; IceTray::OptionsResolver<Options> options; + + static IceTray::Logging::LoggerPtr logger; }; } |