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

Rename SUBTITLES -> DVBSUB

Browse source
This commit is contained in:
Andreas Öman 2009-12-01 19:30:19 +00:00
parent 3ee73a5b81
commit 6f0c3dfc00
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/htsp.c
View file

@ -1419,7 +1419,7 @@ htsp_subscription_start(htsp_subscription_t *hs, const streaming_start_t *ss)
if(ssc->ssc_lang[0])
htsmsg_add_str(c, "language", ssc->ssc_lang);
if(ssc->ssc_type == SCT_SUBTITLES) {
if(ssc->ssc_type == SCT_DVBSUB) {
htsmsg_add_u32(c, "composition_id", ssc->ssc_composition_id);
htsmsg_add_u32(c, "ancillary_id", ssc->ssc_ancillary_id);
}

2
src/parsers.c
View file

@ -135,7 +135,7 @@ parse_mpeg_ts(th_transport_t *t, th_stream_t *st, uint8_t *data,
parse_audio(t, st, data, len, start, parse_ac3);
break;
case SCT_SUBTITLES:
case SCT_DVBSUB:
parse_subtitles(t, st, data, len, start);
break;

8
src/psi.c
View file

@ -417,7 +417,7 @@ psi_parse_pmt(th_transport_t *t, const uint8_t *ptr, int len, int chksvcid,
memcpy(lang, ptr, 3);
composition_id = ptr[4] << 8 | ptr[5];
ancillary_id = ptr[6] << 8 | ptr[7];
hts_stream_type = SCT_SUBTITLES;
hts_stream_type = SCT_DVBSUB;
break;
default:
@ -698,7 +698,7 @@ static struct strtab streamtypetab[] = {
{ "H264", SCT_H264 },
{ "AC3", SCT_AC3 },
{ "TELETEXT", SCT_TELETEXT },
{ "SUBTITLES", SCT_SUBTITLES },
{ "DVBSUB", SCT_DVBSUB },
{ "CA", SCT_CA },
{ "PMT", SCT_PMT },
{ "PAT", SCT_PAT },
@ -748,7 +748,7 @@ psi_save_transport_settings(htsmsg_t *m, th_transport_t *t)
htsmsg_add_u32(sub, "caproviderid", st->st_providerid);
}
if(st->st_type == SCT_SUBTITLES) {
if(st->st_type == SCT_DVBSUB) {
htsmsg_add_u32(sub, "compositionid", st->st_composition_id);
htsmsg_add_u32(sub, "ancillartyid", st->st_ancillary_id);
}
@ -816,7 +816,7 @@ psi_load_transport_settings(htsmsg_t *m, th_transport_t *t)
htsmsg_get_u32(c, "caproviderid", &st->st_providerid);
if(type == SCT_SUBTITLES) {
if(type == SCT_DVBSUB) {
if(!htsmsg_get_u32(c, "compositionid", &u32))
st->st_composition_id = u32;

2
src/tvhead.h
View file

@ -125,7 +125,7 @@ typedef enum {
SCT_H264,
SCT_AC3,
SCT_TELETEXT,
SCT_SUBTITLES,
SCT_DVBSUB,
SCT_CA,
SCT_PAT,
SCT_PMT,

2
src/webui/extjs.c
View file

@ -1412,7 +1412,7 @@ extjs_servicedetails(http_connection_t *hc,
htsmsg_add_str(c, "details", st->st_lang);
break;
case SCT_SUBTITLES:
case SCT_DVBSUB:
snprintf(buf, sizeof(buf), "%s (%04x %04x)",
st->st_lang, st->st_composition_id, st->st_ancillary_id);
htsmsg_add_str(c, "details", buf);