[dvbtools-cvs] dvbtune xml2vdr.c,1.3,1.4

[<lin...@us...>]

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv8396

Modified Files:
	xml2vdr.c 
Log Message:
Add new style diseqc paramater - currently hard-coded to S28.2E

Index: xml2vdr.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/xml2vdr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xml2vdr.c	7 Jul 2002 10:29:26 -0000	1.3
--- xml2vdr.c	9 Oct 2003 18:09:08 -0000	1.4
***************
*** 43,47 ****
  int freq;
  char pol;
! int diseqc=0;
  int srate;
  int vpid;
--- 43,47 ----
  int freq;
  char pol;
! char diseqc[]="S28.2E";
  int srate;
  int vpid;
***************
*** 219,223 ****
    } else if (strcmp(name,"canal_radio")==0) {
  //     if (ca==0) printf("%s:RADIO:%s:%d:%c:%d:%d:%d:%d:%d:%d:%d\n",provider_name,service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
!     if ((ca==0) || (fta==0)) printf("%s (RADIO):%d:%c:%d:%d:%d:%d:%d:%d:%d\n",service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
       n_apids=0;
       n_ca=0;
--- 219,223 ----
    } else if (strcmp(name,"canal_radio")==0) {
  //     if (ca==0) printf("%s:RADIO:%s:%d:%c:%d:%d:%d:%d:%d:%d:%d\n",provider_name,service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
!     if ((ca==0) || (fta==0)) printf("%s (RADIO):%d:%c:%s:%d:%d:%d:%d:%d:%d\n",service_name,freq,pol,diseqc,srate,vpid,apid[0],tpid,ca,pnr);
       n_apids=0;
       n_ca=0;
***************
*** 228,233 ****
         /* Only print service if at least 1 PID is non-zero */
         if (((ca==0) || (fta==0)) && (((vpid!=0) || (n_apids>0) || (tpid!=0)))) {
! //         printf("%s:%s:%s:%d:%c:%d:%d:%d:",provider_name,((vpid==0) ? "RADIO" : "TV"),service_name,freq,pol,diseqc,srate,vpid);
!          printf("%s (%s):%d:%c:%d:%d:%d:",service_name,((vpid==0) ? "RADIO" : "TV"),freq,pol,diseqc,srate,vpid);
           x=0;
           for (i=0;i<n_apids;i++) {
--- 228,233 ----
         /* Only print service if at least 1 PID is non-zero */
         if (((ca==0) || (fta==0)) && (((vpid!=0) || (n_apids>0) || (tpid!=0)))) {
! //         printf("%s:%s:%s:%d:%c:%s:%d:%d:",provider_name,((vpid==0) ? "RADIO" : "TV"),service_name,freq,pol,diseqc,srate,vpid);
!          printf("%s (%s):%d:%c:%s:%d:%d:",service_name,((vpid==0) ? "RADIO" : "TV"),freq,pol,diseqc,srate,vpid);
           x=0;
           for (i=0;i<n_apids;i++) {
***************
*** 276,280 ****
      freq=0;
      pol=0;
-     diseqc=0;
      srate=0;
    }
--- 276,279 ----