From 6e982f765eb538e16cfe2fe0320edbe20073c701 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 30 Oct 2005 13:21:23 +0100 Subject: Fixed lock handling in CAM communication to avoid problems with multiple CAMs per device or CAMs with more than one smart card --- ci.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ci.h') diff --git a/ci.h b/ci.h index 6c35e6f0..ae760155 100644 --- a/ci.h +++ b/ci.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: ci.h 1.17 2005/10/03 12:49:52 kls Exp $ + * $Id: ci.h 1.18 2005/10/30 12:31:14 kls Exp $ */ #ifndef __CI_H @@ -17,11 +17,12 @@ class cCiMMI; class cCiMenu { + friend class cCiHandler; friend class cCiMMI; private: enum { MAX_CIMENU_ENTRIES = 64 }; ///< XXX is there a specified maximum? cCiMMI *mmi; - cMutex mutex; + cMutex *mutex; bool selectable; char *titleText; char *subTitleText; @@ -45,10 +46,11 @@ public: }; class cCiEnquiry { + friend class cCiHandler; friend class cCiMMI; private: cCiMMI *mmi; - cMutex mutex; + cMutex *mutex; char *text; bool blind; int expectedLength; -- cgit v1.2.3