Changeset 1135


Ignore:
Timestamp:
01/09/10 09:24:46 (12 years ago)
Author:
alno
Message:

WebIf:

  • unused code removed depending of #ifdef CS_WITH_GBOX (maybe backport to trunk would be nice)
Location:
branches/monitor-improvement
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/globals.h

    r1126 r1135  
    568568  int       waitforcards;
    569569  int       preferlocalcards;
     570#ifdef CS_WITH_GBOX
    570571  uchar      gbox_pwd[8];
    571572  uchar   ignorefile[512];
     
    575576  int       num_locals;
    576577  unsigned long locals[CS_MAXLOCALS];
     578#endif
    577579  //struct s_irdeto_quess *itab[0xff];
    578580#ifdef HAVE_DVBAPI
  • branches/monitor-improvement/oscam-config.c

    r1130 r1135  
    3131  TAG_CS357X,   // camd 3.5x UDP
    3232  TAG_CS378X,    // camd 3.5x TCP
     33#ifdef CS_WITH_GBOX
    3334  TAG_GBOX, // gbox
     35#endif
    3436  TAG_CCCAM,  // cccam
    3537  TAG_DVBAPI
     
    4042
    4143static char *cctag[]={"global", "monitor", "camd33", "camd35",
    42                       "newcamd", "radegast", "serial", "cs357x", "cs378x", "gbox", "cccam", "dvbapi",
     44                      "newcamd", "radegast", "serial", "cs357x", "cs378x",
     45#ifdef CS_WITH_GBOX
     46                      "gbox",
     47#endif
     48                      "cccam", "dvbapi",
    4349#ifdef CS_ANTICASC
    4450                      "anticasc",
     
    524530}
    525531
     532#ifdef CS_WITH_GBOX
    526533void chk_t_gbox(char *token, char *value)
    527534{
     
    547554    fprintf(stderr, "Warning: keyword '%s' in gbox section not recognized\n",token);
    548555}
     556#endif
    549557
    550558void chk_t_cccam(char *token, char *value)
     
    580588    case TAG_SERIAL  : chk_t_serial(token, value); break;
    581589    case TAG_CS378X  : chk_t_camd35_tcp(token, value); break;
     590#ifdef CS_WITH_GBOX
    582591    case TAG_GBOX    : chk_t_gbox(token, value); break;
     592#endif
    583593    case TAG_CCCAM   : chk_t_cccam(token, value); break;
    584594#ifdef HAVE_DVBAPI
     
    10501060    }
    10511061
     1062#ifdef CS_WITH_GBOX
    10521063    /*Gbox*/
    10531064    if ((cfg->gbox_pwd[0] > 0) || (cfg->gbox_pwd[1] > 0) || (cfg->gbox_pwd[2] > 0) || (cfg->gbox_pwd[3] > 0)){
     
    10661077        fprintf(f,"\n\n");
    10671078    }
     1079#endif
    10681080
    10691081    /*serial*/
  • branches/monitor-improvement/oscam-http.c

    r1131 r1135  
    267267}
    268268
     269#ifdef CS_WITH_GBOX
    269270void send_oscam_config_gbox(struct templatevars *vars, FILE *f, struct uriparams *params) {
    270271    int i;
     
    292293    fputs(tpl_getTpl(vars, "CONFIGGBOX"), f);
    293294}
     295#endif
    294296
    295297void send_oscam_config_monitor(struct templatevars *vars, FILE *f, struct uriparams *params) {
     
    413415    else if (!strcmp(part,"radegast")) send_oscam_config_radegast(vars, f, params);
    414416    else if (!strcmp(part,"cccam")) send_oscam_config_cccam(vars, f, params);
     417#ifdef CS_WITH_GBOX
    415418    else if (!strcmp(part,"gbox")) send_oscam_config_gbox(vars, f, params);
     419#endif
    416420#ifdef HAVE_DVBAPI_3
    417421    else if (!strcmp(part,"dvbapi")) send_oscam_config_dvbapi(vars, f, params);
  • branches/monitor-improvement/oscam-http.h

    r1131 r1135  
    7575            <TD CLASS=\"menu\"><A HREF=\"config.html?part=radegast\">Radegast</TD>\n\
    7676            <TD CLASS=\"menu\"><A HREF=\"config.html?part=cccam\">Cccam</TD>\n\
    77             <TD CLASS=\"menu\"><A HREF=\"config.html?part=gbox\">Gbox</TD>\n\
     77            ##TPLCONFIGMENUGBOX##\
    7878            ##TPLCONFIGMENUANTICASC##\
    7979            <TD CLASS=\"menu\"><A HREF=\"config.html?part=monitor\">Monitor</TD>\n\
     
    8989#ifdef HAVE_DVBAPI_3
    9090#define TPLCONFIGMENUDVBAPI "<TD CLASS=\"menu\"><A HREF=\"config.html?part=dvbapi\">DVB-Api</TD>\n"
     91#endif
     92
     93#ifdef CS_WITH_GBOX
     94#define TPLCONFIGMENUGBOX "<TD CLASS=\"menu\"><A HREF=\"config.html?part=gbox\">Gbox</TD>\n\"
    9195#endif
    9296
     
    753757    ,"CONFIGMENUANTICASC"
    754758#endif
     759#ifdef CS_WITH_GBOX
     760    ,"TPLCONFIGMENUGBOX"
     761#endif
    755762};
    756763
     
    801808    ,TPLCONFIGMENUANTICASC
    802809#endif
     810#ifdef CS_WITH_GBOX
     811    ,TPLCONFIGMENUGBOX
     812#endif
    803813};
    804814
Note: See TracChangeset for help on using the changeset viewer.