[dvbtools-cvs] dvbtune dvbtune.c,1.4,1.5

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

Update of /cvsroot/dvbtools/dvbtune
In directory usw-pr-cvs1:/tmp/cvs-serv21509

Modified Files:
	dvbtune.c 
Log Message:
more minor bug fixes - thanks again to Douglas Kosovic

Index: dvbtune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/dvbtune.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dvbtune.c	27 Jun 2002 20:20:47 -0000	1.4
--- dvbtune.c	29 Jun 2002 09:59:06 -0000	1.5
***************
*** 118,122 ****
  }
  
! char xmlify_result[5];
  char* xmlify (char c) {
    switch(c) {
--- 118,122 ----
  }
  
! char xmlify_result[10];
  char* xmlify (char c) {
    switch(c) {
***************
*** 555,561 ****
  
            case 0x56:
               printf("<teletext tag=\"0x56\">\n");
               while (j < descriptor_length) {
!                printf("<teletext_info lang=\"%s%s%s\" type=\"%d\" page=\"%d%02x\" />\n",xmlify(buf[i]),xmlify(buf[i+1]),xmlify(buf[i+2]),(buf[i+3]&0xf8)>>3,(buf[i+3]&0x07),buf[i+4]);
                 i+=5;
                 j+=5;
--- 555,566 ----
  
            case 0x56:
+              j=0;
               printf("<teletext tag=\"0x56\">\n");
               while (j < descriptor_length) {
!                printf("<teletext_info lang=\"");
!                printf("%s",xmlify(buf[i]));
!                printf("%s",xmlify(buf[i+1]));
!                printf("%s",xmlify(buf[i+2]));
!                printf("\" type=\"%d\" page=\"%d%02x\" />\n",(buf[i+3]&0xf8)>>3,(buf[i+3]&0x07),buf[i+4]);
                 i+=5;
                 j+=5;
***************
*** 568,572 ****
               printf("<subtitling_descriptor tag=\"0x59\">\n");
               while (j < descriptor_length) {
!                printf("<subtitle_stream lang=\"%s%s%s\" type=\"%d\" composition_page_id=\"%04x\" ancillary_page_id=\"%04x\" />\n",xmlify(buf[i]),xmlify(buf[i+1]),xmlify(buf[i+2]),buf[i+3],(buf[i+4]<<8)|buf[i+5],(buf[i+6]<<8)|buf[i+7]);
                 i+=7;
                 j+=7;
--- 573,581 ----
               printf("<subtitling_descriptor tag=\"0x59\">\n");
               while (j < descriptor_length) {
!                printf("<subtitle_stream lang=\"");
!                printf("%s",xmlify(buf[i]));
!                printf("%s",xmlify(buf[i+1]));
!                printf("%s",xmlify(buf[i+2]));
!                printf("\" type=\"%d\" composition_page_id=\"%04x\" ancillary_page_id=\"%04x\" />\n",buf[i+3],(buf[i+4]<<8)|buf[i+5],(buf[i+6]<<8)|buf[i+7]);
                 i+=7;
                 j+=7;
***************
*** 588,592 ****
              printf("<canal_radio tag=\"0x%02x\" id=\"%d\" name=\"",descriptor_tag,buf[i]);
              i++;
-             j=0;
              for (j=0;j<descriptor_length;j++) 
                if (buf[i+j]!=0) printf("%c",buf[i+j]);
--- 597,600 ----