diff options
author | Tobias Grimm <git@e-tobi.net> | 2010-02-02 15:47:47 +0100 |
---|---|---|
committer | Tobias Grimm <git@e-tobi.net> | 2010-02-03 00:57:41 +0100 |
commit | d05646e8f30635e9aad84cc38c7e0e0a70b978cd (patch) | |
tree | 8daf833faa91e88b1309b9c1582dc2702be00a41 | |
parent | bdc743525fd9e051796c387b416bb9d66028404a (diff) | |
download | vdr-plugin-ttxtsubs-d05646e8f30635e9aad84cc38c7e0e0a70b978cd.tar.gz vdr-plugin-ttxtsubs-d05646e8f30635e9aad84cc38c7e0e0a70b978cd.tar.bz2 |
refactoring - removed unused print_line debug code
-rw-r--r-- | teletext.c | 51 | ||||
-rw-r--r-- | teletext.h | 1 | ||||
-rw-r--r-- | ttxtsubsdisplay.c | 3 | ||||
-rw-r--r-- | ttxtsubsreceiver.c | 8 |
4 files changed, 0 insertions, 63 deletions
@@ -279,54 +279,3 @@ print_page(struct ttxt_page *p) } } } - - -void print_line(char *p) -{ - int mp; - int mag; // X in ETSI EN 300 706 - int packet; // Y - struct ttxt_data_field *d = (struct ttxt_data_field *) p; - - mp = unham(invtab[d->mag_addr_ham[0]], invtab[d->mag_addr_ham[1]]); - mag = mp & 0x7; - packet = (mp >> 3) & 0x1f; - - dprint("I%d Y%02d M%d ", d->data_unit_id, packet, mag); - - // packet 0, change page no in this magazine - if(packet == 0) { - int no; - uint8_t buf[8]; - - for(int i = 0; i < 8; i++) - buf[i] = invtab[d->data[i]]; - - no = unham(buf[0], buf[1]); - - dprint("P%02x ", no); - - dprint("<"); - for(int i = 8; i < 40; i++) - print_code(invtab[d->data[i]] & 0x7f, 0); - dprint(">"); - - if(buf[3] & 0x80) dprint(", erase page"); - if(buf[5] & 0x20) dprint(", newsflash"); - if(buf[5] & 0x80) dprint(", subtitle"); - if(buf[6] & 0x02) dprint(", suppress header"); - if(buf[6] & 0x08) dprint(", update indicator"); - if(buf[6] & 0x20) dprint(", interrupted sequence"); - if(buf[6] & 0x80) dprint(", inhibit display"); - if(buf[7] & 0x02) dprint(", magazine serial"); - - dprint(", charset=%d", ((buf[7] & 0x80) >> 5) + ((buf[7] & 0x20) >> 4) + ((buf[7] & 0x08) >> 3)); - } else { - dprint("<"); - for(int i = 0; i < 40; i++) - print_code(invtab[d->data[i]] & 0x7f, 0); - dprint(">"); - } - - dprint("\n"); -} @@ -111,7 +111,6 @@ uint16_t ttxt_laG2_la1_char(uint8_t inchar); // debug stuff void print_page(struct ttxt_page *p); -void print_line(char *p); void dump_hex(char *msg, const uint8_t *p, int len); // invert tab for last 42 bytes in packets diff --git a/ttxtsubsdisplay.c b/ttxtsubsdisplay.c index 481d82b..4006066 100644 --- a/ttxtsubsdisplay.c +++ b/ttxtsubsdisplay.c @@ -183,8 +183,6 @@ void cTtxtSubsDisplay::TtxtData(const uint8_t *Data, uint64_t sched_time) if(Data == NULL) return; - //print_line((char *) Data); - d = (struct ttxt_data_field *) Data; mp = unham(invtab[d->mag_addr_ham[0]], invtab[d->mag_addr_ham[1]]); @@ -213,7 +211,6 @@ void cTtxtSubsDisplay::TtxtData(const uint8_t *Data, uint64_t sched_time) no = unham(fi[0], fi[1]); //dprint("cTtxtSubsDisplay::TtxtData: page:%d%02x, packet: %d\n", mag, no, packet); // XXX - //print_line((char *) Data); if(mag == mMag && no == mNo) { //dprint("cTtxtSubsDisplay::TtxtData: page:%d%02x, packet: %d\n", mag, no, packet); // XXX diff --git a/ttxtsubsreceiver.c b/ttxtsubsreceiver.c index 5856375..f1c7ad5 100644 --- a/ttxtsubsreceiver.c +++ b/ttxtsubsreceiver.c @@ -184,8 +184,6 @@ void cTtxtSubsReceiver::Receive(uchar *Data, int Length) if(mFilter.Filter((char *) Data + 4 + i*46, (char *) it.data)) { // dprint("Forward Packet:\n"); - // print_line((char *) Data + 4 + i*46); - // print_line(buf); cFrame *f = new cFrame((uchar *) &it, sizeof(ringBufItem)); mRingBuf.Put(f); @@ -248,8 +246,6 @@ void cTtxtSubsReceiver::AddIndexInfo(char *lang, int type, uint16_t page) for(int i = txtlen; i < 32; i++) d->data[i+8] = invtab[(unsigned char) ' ']; // space already has correct parity - //print_line((char *) mIndexPage[mIndexPageLines]); // XXX - mIndexPageLines++; init_line(mIndexPage[mIndexPageLines], mIndexPageLines, mIndexPageNo >> 8); @@ -259,8 +255,6 @@ void cTtxtSubsReceiver::AddIndexInfo(char *lang, int type, uint16_t page) copy_inv_par(d->data, (uint8_t *) header, txtlen); for(int i = txtlen; i < 40; i++) d->data[i] = invtab[(unsigned char) ' ']; // space already has correct parity - - //print_line((char *) mIndexPage[mIndexPageLines]); // XXX mIndexPageLines++; } @@ -284,8 +278,6 @@ void cTtxtSubsReceiver::AddIndexInfo(char *lang, int type, uint16_t page) copy_inv_par(d->data+ mIndexPageCol*8, buf, 8); - //print_line((char *) mIndexPage[mIndexPageLines]); // XXX - mIndexPageCol++; if(mIndexPageCol == 5) { |