Rename SUBTITLES -> DVBSUB

diff --git a/src/htsp.c b/src/htsp.c
index 163cb71b39fdbedd5b3fb3fbe27afa92791fd447..8412d6f5b03b340497a71ca0b977895974031b46 100644 (file)
--- a/src/htsp.c
+++ b/src/htsp.c
@@ -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);
     }

diff --git a/src/parsers.c b/src/parsers.c
index 37f3f78cbf4a9136e03afb84ed6f0251df4db81c..0f33a6ff8f9136967a0416d45ed938c268e7778d 100644 (file)
--- a/src/parsers.c
+++ b/src/parsers.c
@@ -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;
     

diff --git a/src/psi.c b/src/psi.c
index 553900eaeda3ae26d7890aa8b2841f3a7fe1f482..10805524c027dd0a31f083eee5fe1da67d95412d 100644 (file)
--- a/src/psi.c
+++ b/src/psi.c
@@ -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;
 

diff --git a/src/tvhead.h b/src/tvhead.h
index 39f899a371fb66e11bda6ac547e44fa951cfba54..8d1d0f6f4740a3a554f71365f49a43c22c447370 100644 (file)
--- a/src/tvhead.h
+++ b/src/tvhead.h
@@ -125,7 +125,7 @@ typedef enum {
   SCT_H264,
   SCT_AC3,
   SCT_TELETEXT,
-  SCT_SUBTITLES,
+  SCT_DVBSUB,
   SCT_CA,
   SCT_PAT,
   SCT_PMT,

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 8625fbee9e490386d3dd58d7f1695caf51f46a3a..dd77c2680dd09a633c83089368b552cad32cbc5f 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -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);