Changeset 7629
- Timestamp:
- 10/07/12 18:37:05 (11 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi-azbox.c
r7600 r7629 2 2 3 3 #if defined(HAVE_DVBAPI) && defined(WITH_AZBOX) 4 5 #include "openxcas/openxcas_api.h" 6 #include "openxcas/openxcas_message.h" 4 7 5 8 #include "module-dvbapi.h" … … 314 317 } 315 318 319 #ifdef WITH_CARDREADER 320 #define __openxcas_open openxcas_open_with_smartcard 321 #else 322 #define __openxcas_open openxcas_open 316 323 #endif 324 325 void azbox_init(void) { 326 openxcas_debug_message_onoff(1); // debug 327 if (__openxcas_open("oscamCAS") < 0) 328 cs_log("openxcas: could not init"); 329 } 330 331 void azbox_close(void) { 332 if (openxcas_close() < 0) 333 cs_log("openxcas: could not close"); 334 } 335 336 #endif -
trunk/module-dvbapi-azbox.h
r7175 r7629 1 1 #ifndef _MODULE_AZBOX_H_ 2 2 #define _MODULE_AZBOX_H_ 3 4 #include "openxcas/openxcas_api.h"5 #include "openxcas/openxcas_message.h"6 3 7 4 void azbox_openxcas_ecm_callback(int32_t stream_id, uint32_t sequence, int32_t cipher_index, uint32_t caid, unsigned char *ecm_data, int32_t l, uint16_t pid); … … 11 8 void * azbox_main_thread(void * cli); 12 9 10 #if defined(HAVE_DVBAPI) && defined(WITH_AZBOX) 11 void azbox_init(void); 12 void azbox_close(void); 13 #else 14 static inline void azbox_init(void) { } 15 static inline void azbox_close(void) { } 13 16 #endif 17 18 #endif -
trunk/oscam.c
r7627 r7629 6 6 #include "module-cccam.h" 7 7 #endif 8 #if defined(WITH_AZBOX) && defined(HAVE_DVBAPI)9 #include "openxcas/openxcas_api.h"10 #endif11 8 #include "module-anticasc.h" 12 9 #include "module-cacheex.h" 10 #include "module-dvbapi-azbox.h" 13 11 #include "module-ird-guess.h" 14 12 #include "module-lcd.h" … … 4053 4051 led_status_default(); 4054 4052 4055 #if defined(WITH_AZBOX) && defined(HAVE_DVBAPI) 4056 openxcas_debug_message_onoff(1); // debug 4057 4058 #ifdef WITH_CARDREADER 4059 if (openxcas_open_with_smartcard("oscamCAS") < 0) { 4060 #else 4061 if (openxcas_open("oscamCAS") < 0) { 4062 #endif 4063 cs_log("openxcas: could not init"); 4064 } 4065 #endif 4053 azbox_init(); 4066 4054 4067 4055 global_whitelist_read(); … … 4135 4123 client_check(); 4136 4124 4137 4138 #if defined(WITH_AZBOX) && defined(HAVE_DVBAPI) 4139 if (openxcas_close() < 0) { 4140 cs_log("openxcas: could not close"); 4141 } 4142 #endif 4125 azbox_close(); 4143 4126 4144 4127 cs_cleanup();
Note:
See TracChangeset
for help on using the changeset viewer.