stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add proper parsing of T2 else things go horribly wrong.

Browse source
This commit is contained in:
Adam Sutton 2012-08-04 22:26:59 +01:00
parent c7e08d26c0
commit 741612ccf9
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/muxes.c
View file

@ -119,10 +119,17 @@ static int _muxes_load_dvbt ( mux_t *mux, const char *line )
{ {
char bw[20], fec[20], fec2[20], qam[20], mode[20], guard[20], hier[20]; char bw[20], fec[20], fec2[20], qam[20], mode[20], guard[20], hier[20];
int r; int r;
uint32_t i;
r = sscanf(line, "%u %10s %10s %10s %10s %10s %10s %10s", if (*line == '2') {
&mux->freq, bw, fec, fec2, qam, mode, guard, hier); r = sscanf(line+1, "%u %u %u %10s %10s %10s %10s %10s %10s %10s",
if(r != 8) return 1; &i, &i, &mux->freq, bw, fec, fec2, qam, mode, guard, hier);
if(r != 10) return 1;
} else {
r = sscanf(line, "%u %10s %10s %10s %10s %10s %10s %10s",
&mux->freq, bw, fec, fec2, qam, mode, guard, hier);
if(r != 8) return 1;
}
if ((mux->bw = dvb_mux_str2bw(bw)) == -1) return 1; if ((mux->bw = dvb_mux_str2bw(bw)) == -1) return 1;
if ((mux->constellation = dvb_mux_str2qam(qam)) == -1) return 1; if ((mux->constellation = dvb_mux_str2qam(qam)) == -1) return 1;