diff options
| author | randomdan <randomdan@localhost> | 2014-01-05 15:46:17 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2014-01-05 15:46:17 +0000 |
| commit | 68ab7b71044f2860d0b421d41344914d27f86cc2 (patch) | |
| tree | 23e5d4dac96f7bbbdccc65b005b473cb4e7092ad /p2pvr/lib/tuner.cpp | |
| parent | Do reschudule automatically after events have been updated (diff) | |
| download | p2pvr-68ab7b71044f2860d0b421d41344914d27f86cc2.tar.bz2 p2pvr-68ab7b71044f2860d0b421d41344914d27f86cc2.tar.xz p2pvr-68ab7b71044f2860d0b421d41344914d27f86cc2.zip | |
Unify the daemon base code
Enable multiple threads
Add mutexes where required
Proxy ICE logs into p2 logger
Diffstat (limited to 'p2pvr/lib/tuner.cpp')
| -rw-r--r-- | p2pvr/lib/tuner.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/p2pvr/lib/tuner.cpp b/p2pvr/lib/tuner.cpp index 1095667..f4263ee 100644 --- a/p2pvr/lib/tuner.cpp +++ b/p2pvr/lib/tuner.cpp @@ -271,7 +271,7 @@ Tuner::StartSendingSection(int pid, const P2PVR::RawDataClientPrx & client, cons } int -Tuner::StartSendingTS(const P2PVR::PacketIds & pids, const P2PVR::RawDataClientPrx & client, const Ice::Current &) +Tuner::StartSendingTS(const P2PVR::PacketIds & pids, const P2PVR::RawDataClientPrx & client, const Ice::Current & ice) { time(&lastUsedTime); Logger()->message(LOG_DEBUG, __PRETTY_FUNCTION__); @@ -279,8 +279,11 @@ Tuner::StartSendingTS(const P2PVR::PacketIds & pids, const P2PVR::RawDataClientP throw P2PVR::DeviceError("demux", "Packet Id list cannot be empty", 0); } + if (ice.con) { + ice.con->createProxy(client->ice_getIdentity()); + } std::lock_guard<std::mutex> g(lock); - int demux = backgroundClients.insert(BackgroundClients::value_type(OpenDemux(), client)).first->first; + int demux = backgroundClients.insert(BackgroundClients::value_type(OpenDemux(), client->ice_collocationOptimized(false))).first->first; struct dmx_pes_filter_params pesFilterParams; memset(&pesFilterParams, 0, sizeof(struct dmx_pes_filter_params)); |