summaryrefslogtreecommitdiff
path: root/p2pvr/devices/mockTuner.h
diff options
context:
space:
mode:
Diffstat (limited to 'p2pvr/devices/mockTuner.h')
-rw-r--r--p2pvr/devices/mockTuner.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/p2pvr/devices/mockTuner.h b/p2pvr/devices/mockTuner.h
index 73ab27c..d0db11e 100644
--- a/p2pvr/devices/mockTuner.h
+++ b/p2pvr/devices/mockTuner.h
@@ -9,38 +9,38 @@
namespace P2PVR {
namespace Testing {
-class DLL_PUBLIC MockTuner : public PrivateTuner {
+class DLL_PUBLIC MockTuner : public Tuner {
public:
- MockTuner();
+ MockTuner(Ice::CommunicatorPtr);
- void TuneTo(const DVBSI::DeliveryPtr &, const Ice::Current&);
- int GetStatus(const Ice::Current&);
+ void TuneTo(const DVBSI::DeliveryPtr &) override;
+ int GetStatus() override;
+ std::string GetDevice() override;
- void ScanAndSendNetworkInformation(const RawDataClientPrx & client, const Ice::Current&);
- void SendNetworkInformation(const RawDataClientPrx & client, const Ice::Current&);
- void SendBouquetAssociations(const RawDataClientPrx & client, const Ice::Current&);
- void SendServiceDescriptions(const RawDataClientPrx & client, const Ice::Current&);
- void SendProgramMap(Ice::Int pid, const RawDataClientPrx & client, const Ice::Current&);
- void SendProgramAssociationTable(const RawDataClientPrx & client, const Ice::Current&);
- void SendEventInformation(const RawDataClientPrx & client, const Ice::Current&);
+ void ScanAndSendNetworkInformation(const RawDataClientPrx & client) override;
+ void SendNetworkInformation(const RawDataClientPrx & client) override;
+ void SendBouquetAssociations(const RawDataClientPrx & client) override;
+ void SendServiceDescriptions(const RawDataClientPrx & client) override;
+ void SendProgramMap(Ice::Int pid, const RawDataClientPrx & client) override;
+ void SendProgramAssociationTable(const RawDataClientPrx & client) override;
+ void SendEventInformation(const RawDataClientPrx & client) override;
- int StartSendingTS(const PacketIds & pids, const RawDataClientPrx & client, const Ice::Current &);
- int StartSendingSection(Ice::Int pid, const RawDataClientPrx & client, const Ice::Current &);
- void StopSending(int handle, const Ice::Current &);
-
- Ice::Long GetLastUsedTime(const Ice::Current&);
+ int StartSendingTS(const PacketIds & pids, const RawDataClientPrx & client) override;
+ int StartSendingSection(Ice::Int pid, const RawDataClientPrx & client) override;
+ void StopSending(int handle) override;
static void SetEventsSet(int n);
protected:
static Ice::ByteSeq Decompress(const Ice::ByteSeq &);
static void LZMA_ASSERT(int ret_xz);
- void DecompressAndSendPackets(const Ice::ByteSeq &, const RawDataClientPrx &, const Ice::Current&) const;
- void SendLoop(const RawDataClientPrx & t, const Ice::ByteSeq & dataxz, const Ice::Current & ice) const;
+ void DecompressAndSendPackets(const Ice::ByteSeq &, const RawDataClientPrx &) const;
+ void SendLoop(const RawDataClientPrx & t, const Ice::ByteSeq & dataxz) const;
static int eventSet;
std::map<int, boost::thread *> senders;
- int senderId;
+ static int senderId;
+ Ice::CommunicatorPtr ic;
static IceTray::Logging::LoggerPtr logger;
};