From 3eba2c632cc9515a424a2986d6bdeb690f15fd81 Mon Sep 17 00:00:00 2001 From: Ronny Strutz Date: Wed, 23 Nov 2005 02:20:26 +0000 Subject: [PATCH] add cancelenq --- lib/dvb_ci/dvbci.cpp | 28 ++++++++++++++++++++++++---- lib/dvb_ci/dvbci.h | 6 ++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 31dc65a..3ddd9bb 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -116,14 +116,24 @@ int eDVBCIInterfaces::answerText(int slotid, int answer) return slot->answerText(answer); } -int eDVBCIInterfaces::answerEnq(int slotid, int answer, char *value) +int eDVBCIInterfaces::answerEnq(int slotid, char *value) { eDVBCISlot *slot; if( (slot = getSlot(slotid)) == 0 ) return -1; - return slot->answerEnq(answer, value); + return slot->answerEnq(value); +} + +int eDVBCIInterfaces::cancelEnq(int slotid) +{ + eDVBCISlot *slot; + + if( (slot = getSlot(slotid)) == 0 ) + return -1; + + return slot->cancelEnq(); } void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler) @@ -367,9 +377,19 @@ int eDVBCISlot::getMMIState() return 0; } -int eDVBCISlot::answerEnq(int answer, char *value) +int eDVBCISlot::answerEnq(char *value) { - printf("edvbcislot: answerMMI(%d,%s)\n", answer, value); + printf("edvbcislot: answerENQ(%s)\n", value); + return 0; +} + +int eDVBCISlot::cancelEnq() +{ + printf("edvbcislot: cancelENQ\n"); + + if(mmi_session) + mmi_session->cancelEnq(); + return 0; } diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h index 1df87ea..1921ad7 100644 --- a/lib/dvb_ci/dvbci.h +++ b/lib/dvb_ci/dvbci.h @@ -39,7 +39,8 @@ public: int startMMI(); int stopMMI(); int answerText(int answer); - int answerEnq(int answer, char *value); + int answerEnq(char *value); + int cancelEnq(); int getMMIState(); int sendCAPMT(eDVBServicePMTHandler *ptr, const std::vector &caids=std::vector()); uint8_t getPrevSentCAPMTVersion() const { return prev_sent_capmt_version; } @@ -88,7 +89,8 @@ public: int startMMI(int slot); int stopMMI(int slot); int answerText(int slot, int answer); - int answerEnq(int slot, int answer, char *value); + int answerEnq(int slot, char *value); + int cancelEnq(int slot); int getMMIState(int slot); }; -- 2.7.4