Rename tht_status to tht_runstatus to avoid confusion

diff --git a/avgen.c b/avgen.c
index 03c7180125296a9763a0e521d5acdda74eb8d838..d82f222cdd4bc4cdc4bc5c9cd7d8a375002ca591 100644 (file)
--- a/avgen.c
+++ b/avgen.c
@@ -144,7 +144,7 @@ avgen_stop_feed(th_transport_t *t)
   av_free(avg->videoframe.data[0]);
   free(avg);
 
-  t->tht_status = TRANSPORT_IDLE;
+  t->tht_runstatus = TRANSPORT_IDLE;
 }
 
 
@@ -237,7 +237,7 @@ avgen_start_feed(th_transport_t *t, unsigned int weight, int status)
 
   t->tht_avgen = avg;
 
-  t->tht_status = TRANSPORT_RUNNING;
+  t->tht_runstatus = TRANSPORT_RUNNING;
 
   avg->refclock = getclock_hires();
   avgen_deliver(t, avg, avg->refclock);

diff --git a/dvb_dvr.c b/dvb_dvr.c
index c91ad6df0637f041627afbfb3d7c890c70a8f75d..88b8198c532e9108a463ca4b19a3e8b093d4bb8b 100644 (file)
--- a/dvb_dvr.c
+++ b/dvb_dvr.c
@@ -125,7 +125,7 @@ dvb_stop_feed(th_transport_t *t)
     close(st->st_demuxer_fd);
     st->st_demuxer_fd = -1;
   }
-  t->tht_status = TRANSPORT_IDLE;
+  t->tht_runstatus = TRANSPORT_IDLE;
 }
 
 
@@ -203,7 +203,7 @@ dvb_start_feed(th_transport_t *t, unsigned int weight, int status)
   }
 
   LIST_INSERT_HEAD(&tda->tda_transports, t, tht_active_link);
-  t->tht_status = status;
+  t->tht_runstatus = status;
   
   dvb_tune_tdmi(tdmi, 1, TDMI_RUNNING);
   return 0;

diff --git a/file_input.c b/file_input.c
index eb1fb7eb84b91122f53155fb8e3823890a24223d..28cf6a489b20f7e7e40b577552ecb0037ce778d6 100644 (file)
--- a/file_input.c
+++ b/file_input.c
@@ -173,7 +173,7 @@ file_input_stop_feed(th_transport_t *t)
   file_input_t *fi = t->tht_file_input;
 
   dtimer_disarm(&fi->fi_timer);
-  t->tht_status = TRANSPORT_IDLE;
+  t->tht_runstatus = TRANSPORT_IDLE;
 }
 
 
@@ -195,7 +195,7 @@ file_input_start_feed(th_transport_t *t, unsigned int weight, int status)
 {
   file_input_t *fi = t->tht_file_input;
   
-  t->tht_status = TRANSPORT_RUNNING;
+  t->tht_runstatus = TRANSPORT_RUNNING;
 
   file_input_reset(t, fi);
   fi->fi_refclock = getclock_hires();

diff --git a/iptv_input.c b/iptv_input.c
index b80e4bf049d5593785c036d74f1e668e2331b956..209dab7c5f1a260aec799eddabe33ebb7411698e 100644 (file)
--- a/iptv_input.c
+++ b/iptv_input.c
@@ -106,7 +106,7 @@ iptv_start_feed(th_transport_t *t, unsigned int weight, int status)
   }
 
   t->tht_iptv_fd = fd;
-  t->tht_status = status;
+  t->tht_runstatus = status;
 
   syslog(LOG_ERR, "iptv: \"%s\" joined group", t->tht_name);
 
@@ -118,10 +118,10 @@ iptv_start_feed(th_transport_t *t, unsigned int weight, int status)
 static void
 iptv_stop_feed(th_transport_t *t)
 {
-  if(t->tht_status == TRANSPORT_IDLE)
+  if(t->tht_runstatus == TRANSPORT_IDLE)
     return;
 
-  t->tht_status = TRANSPORT_IDLE;
+  t->tht_runstatus = TRANSPORT_IDLE;
   dispatch_delfd(t->tht_iptv_dispatch_handle);
   close(t->tht_iptv_fd);
 
@@ -137,7 +137,7 @@ static void
 iptv_parse_pmt(struct th_transport *t, th_stream_t *st,
               uint8_t *table, int table_len)
 {
-  if(table[0] != 2 || t->tht_status != TRANSPORT_PROBING)
+  if(table[0] != 2 || t->tht_runstatus != TRANSPORT_PROBING)
     return;
 
   psi_parse_pmt(t, table + 3, table_len - 3, 0);
@@ -154,7 +154,7 @@ static void
 iptv_parse_pat(struct th_transport *t, th_stream_t *st,
               uint8_t *table, int table_len)
 {
-  if(table[0] != 0 || t->tht_status != TRANSPORT_PROBING)
+  if(table[0] != 0 || t->tht_runstatus != TRANSPORT_PROBING)
     return;
 
   psi_parse_pat(t, table + 3, table_len - 3, iptv_parse_pmt);

diff --git a/serviceprobe.c b/serviceprobe.c
index cb9f8e0bf388fc05fdb98dea58332a6197a50158..f1e3ba5f94184090f4fb70facf317a97238b9ed9 100644 (file)
--- a/serviceprobe.c
+++ b/serviceprobe.c
@@ -149,7 +149,7 @@ serviceprobe_engage(void)
   s->ths_weight    = INT32_MAX;
   s->ths_opaque    = sp;
 
-  if(t->tht_status != TRANSPORT_RUNNING)
+  if(t->tht_runstatus != TRANSPORT_RUNNING)
     transport_start(t, INT32_MAX);
 
   s->ths_transport = t;

diff --git a/transports.c b/transports.c
index 2069a82d6eab981a9087dc08117e796d9a5511e0..8b7275f2b5aa7d81c74e1432bb9d4543e774acd3 100644 (file)
--- a/transports.c
+++ b/transports.c
@@ -162,7 +162,7 @@ transport_start(th_transport_t *t, unsigned int weight)
   AVCodec *c;
   enum CodecID id;
 
-  assert(t->tht_status != TRANSPORT_RUNNING);
+  assert(t->tht_runstatus != TRANSPORT_RUNNING);
 
   if(t->tht_start_feed(t, weight, TRANSPORT_RUNNING))
     return -1;
@@ -306,7 +306,7 @@ transport_find(channel_t *ch, unsigned int weight)
 
   for(i = 0; i < cnt; i++) {
     t = vec[i];
-    if(t->tht_status == TRANSPORT_RUNNING) 
+    if(t->tht_runstatus == TRANSPORT_RUNNING) 
       return t;
 
     if(!transport_start(t, 0))

diff --git a/tvhead.h b/tvhead.h
index 3ecf3f086157dabb9f316e1379761424445d943e..cab9897cbe72ad369aa2d4776c8b3e58f9a29ce7 100644 (file)
--- a/tvhead.h
+++ b/tvhead.h
@@ -383,7 +383,7 @@ typedef struct th_transport {
     TRANSPORT_IDLE,
     TRANSPORT_RUNNING,
     TRANSPORT_PROBING,
-  } tht_status;
+  } tht_runstatus;
 
   th_commercial_advice_t tht_tt_commercial_advice;
 

diff --git a/v4l.c b/v4l.c
index 25ef015df4106cba51bb197a1334c463ca349747..78f4de180f115bcaa46e0730e85a917481223f8c 100644 (file)
--- a/v4l.c
+++ b/v4l.c
@@ -202,7 +202,7 @@ v4l_stop_feed(th_transport_t *t)
   t->tht_v4l_adapter = NULL;
   LIST_REMOVE(t, tht_active_link);
 
-  t->tht_status = TRANSPORT_IDLE;
+  t->tht_runstatus = TRANSPORT_IDLE;
 
   if(LIST_FIRST(&tva->tva_transports) == NULL)
     v4l_stop(tva);
@@ -271,7 +271,7 @@ v4l_start_feed(th_transport_t *t, unsigned int weight, int status)
 
   LIST_INSERT_HEAD(&tva->tva_transports, t, tht_active_link);
   t->tht_v4l_adapter = tva;
-  t->tht_status = TRANSPORT_RUNNING;
+  t->tht_runstatus = TRANSPORT_RUNNING;
   
   return 0;
 }