Changeset 1014


Ignore:
Timestamp:
12/31/09 13:45:35 (14 years ago)
Author:
landlord
Message:

Renamed 'HAVE_DVBAPI' to 'HAVE_DVBAPI_3'

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Distribution/doc/example/oscam.conf

    r206 r1014  
    4545[serial]
    4646device        = user2@/dev/ttyS0?delay=1&timeout=300
     47
     48[dvbapi]
     49enabled       = 1
     50user          = user1
     51demux         = /dev/dvb/adapter0/demux0
     52ca            = /dev/dvb/adapter0/ca1
     53socket        = /tmp/camd.socket

  • trunk/README

    r107 r1014  
    2222    svn co http://streamboard.gmc.to/svn/oscam/trunk oscam
    2323    cd oscam
     24
     25Compile options
     26---------------
     27
     28Enable features:
     29
     30CS_ANTICASC   - enable anti-cascading
     31CS_LOGHISTORY - enable log history
     32HAVE_DVBAPI_3 - enable DVB API 3 support
     33
    2434
    2535Build with CMake (new solution for building)

  • trunk/globals.h

    r1013 r1014  
    568568  unsigned long locals[CS_MAXLOCALS];
    569569  //struct s_irdeto_quess *itab[0xff];
    570 #ifdef HAVE_DVBAPI
     570#ifdef HAVE_DVBAPI_3
    571571  int       dvbapi_enabled;
    572572  int       dvbapi_au;
    … …  
    844844extern void module_gbox(struct s_module *);
    845845extern void module_cccam(struct s_module *);
    846 #ifdef HAVE_DVBAPI
     846#ifdef HAVE_DVBAPI_3
    847847extern void module_dvbapi(struct s_module *);
    848848#endif

  • trunk/module-dvbapi.c

    r1013 r1014  
    1717 */
    1818
    19 #ifdef HAVE_DVBAPI
     19#ifdef HAVE_DVBAPI_3
    2020
    2121#include <errno.h>
    … …  
    803803void module_dvbapi(struct s_module *ph) {}
    804804
    805 #endif // HAVE_DVBAPI
     805#endif // HAVE_DVBAPI_3

  • trunk/oscam-config.c

    r1013 r1014  
    522522static void chk_t_dvbapi(char *token, char *value)
    523523{
    524 #ifndef HAVE_DVBAPI
    525     fprintf(stderr, "Warning: OSCam compiled without DVBAPI Support\n");
     524#ifndef HAVE_DVBAPI_3
     525    fprintf(stderr, "Warning: OSCam compiled without DVB API support\n");
    526526#else
    527527    if (!strcmp(token, "enabled"))  { cfg->dvbapi_enabled=atoi(value); return; }

  • trunk/oscam.c

    r1013 r1014  
    21742174           module_radegast,
    21752175           module_oscam_ser,
    2176 #ifdef HAVE_DVBAPI
     2176#ifdef HAVE_DVBAPI_3
    21772177       module_dvbapi,
    21782178#endif
Note: See TracChangeset for help on using the changeset viewer.