Changeset 1135
- Timestamp:
- 01/09/10 09:24:46 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/globals.h
r1126 r1135 568 568 int waitforcards; 569 569 int preferlocalcards; 570 #ifdef CS_WITH_GBOX 570 571 uchar gbox_pwd[8]; 571 572 uchar ignorefile[512]; … … 575 576 int num_locals; 576 577 unsigned long locals[CS_MAXLOCALS]; 578 #endif 577 579 //struct s_irdeto_quess *itab[0xff]; 578 580 #ifdef HAVE_DVBAPI -
branches/monitor-improvement/oscam-config.c
r1130 r1135 31 31 TAG_CS357X, // camd 3.5x UDP 32 32 TAG_CS378X, // camd 3.5x TCP 33 #ifdef CS_WITH_GBOX 33 34 TAG_GBOX, // gbox 35 #endif 34 36 TAG_CCCAM, // cccam 35 37 TAG_DVBAPI … … 40 42 41 43 static 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", 43 49 #ifdef CS_ANTICASC 44 50 "anticasc", … … 524 530 } 525 531 532 #ifdef CS_WITH_GBOX 526 533 void chk_t_gbox(char *token, char *value) 527 534 { … … 547 554 fprintf(stderr, "Warning: keyword '%s' in gbox section not recognized\n",token); 548 555 } 556 #endif 549 557 550 558 void chk_t_cccam(char *token, char *value) … … 580 588 case TAG_SERIAL : chk_t_serial(token, value); break; 581 589 case TAG_CS378X : chk_t_camd35_tcp(token, value); break; 590 #ifdef CS_WITH_GBOX 582 591 case TAG_GBOX : chk_t_gbox(token, value); break; 592 #endif 583 593 case TAG_CCCAM : chk_t_cccam(token, value); break; 584 594 #ifdef HAVE_DVBAPI … … 1050 1060 } 1051 1061 1062 #ifdef CS_WITH_GBOX 1052 1063 /*Gbox*/ 1053 1064 if ((cfg->gbox_pwd[0] > 0) || (cfg->gbox_pwd[1] > 0) || (cfg->gbox_pwd[2] > 0) || (cfg->gbox_pwd[3] > 0)){ … … 1066 1077 fprintf(f,"\n\n"); 1067 1078 } 1079 #endif 1068 1080 1069 1081 /*serial*/ -
branches/monitor-improvement/oscam-http.c
r1131 r1135 267 267 } 268 268 269 #ifdef CS_WITH_GBOX 269 270 void send_oscam_config_gbox(struct templatevars *vars, FILE *f, struct uriparams *params) { 270 271 int i; … … 292 293 fputs(tpl_getTpl(vars, "CONFIGGBOX"), f); 293 294 } 295 #endif 294 296 295 297 void send_oscam_config_monitor(struct templatevars *vars, FILE *f, struct uriparams *params) { … … 413 415 else if (!strcmp(part,"radegast")) send_oscam_config_radegast(vars, f, params); 414 416 else if (!strcmp(part,"cccam")) send_oscam_config_cccam(vars, f, params); 417 #ifdef CS_WITH_GBOX 415 418 else if (!strcmp(part,"gbox")) send_oscam_config_gbox(vars, f, params); 419 #endif 416 420 #ifdef HAVE_DVBAPI_3 417 421 else if (!strcmp(part,"dvbapi")) send_oscam_config_dvbapi(vars, f, params); -
branches/monitor-improvement/oscam-http.h
r1131 r1135 75 75 <TD CLASS=\"menu\"><A HREF=\"config.html?part=radegast\">Radegast</TD>\n\ 76 76 <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##\ 78 78 ##TPLCONFIGMENUANTICASC##\ 79 79 <TD CLASS=\"menu\"><A HREF=\"config.html?part=monitor\">Monitor</TD>\n\ … … 89 89 #ifdef HAVE_DVBAPI_3 90 90 #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\" 91 95 #endif 92 96 … … 753 757 ,"CONFIGMENUANTICASC" 754 758 #endif 759 #ifdef CS_WITH_GBOX 760 ,"TPLCONFIGMENUGBOX" 761 #endif 755 762 }; 756 763 … … 801 808 ,TPLCONFIGMENUANTICASC 802 809 #endif 810 #ifdef CS_WITH_GBOX 811 ,TPLCONFIGMENUGBOX 812 #endif 803 813 }; 804 814
Note:
See TracChangeset
for help on using the changeset viewer.