Changeset 4199

Timestamp:

12/24/10 15:24:55 (12 years ago)

Author:

lattjo

Message:

Use the Azbox openxcas open and close functions only if HAVE_DVBAPI is defined. Use the openxcas_open_with_smartcard only if WITH_CARDREADER is defined.

File:

• trunk/oscam.c (modified) (3 diffs)

trunk/oscam.c

@@ -2 +2 @@
 #define CS_CORE
 #include "globals.h"
-#ifdef AZBOX
+#if defined(AZBOX) && defined(HAVE_DVBAPI)
 #  include "openxcas/openxcas_api.h"
 #endif
@@ -3254 +3254 @@
   server_pid = getpid();
 
-#ifdef AZBOX
+#if defined(AZBOX) && defined(HAVE_DVBAPI)
   openxcas_debug_message_onoff(1);  // debug
 
+#ifdef WITH_CARDREADER
   if (openxcas_open_with_smartcard("oscamCAS") < 0) {
+#else
+  if (openxcas_open("oscamCAS") < 0) {
+#endif  
     cs_log("openxcas: could not init");
   }
@@ -3356 +3360 @@
     }
 
-#ifdef AZBOX
+#if defined(AZBOX) && defined(HAVE_DVBAPI)
   if (openxcas_close() < 0) {
     cs_log("openxcas: could not close");