streaming: add SMT_NOSTART_WARN for HTSP, fixes #2771

tvheadend · Sep 22, 2015 · 9a45923 · 9a45923
1 parent 8949199
commit 9a45923
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 0 deletions.
diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
@@ -1075,6 +1075,7 @@ dvr_thread(void *aux)
       break;
 
     case SMT_GRACE:
+    case SMT_NOSTART_WARN:
     case SMT_SPEED:
     case SMT_SKIP:
     case SMT_SIGNAL_STATUS:

diff --git a/src/htsp_server.c b/src/htsp_server.c
@@ -3798,6 +3798,7 @@ htsp_streaming_input(void *opaque, streaming_message_t *sm)
     break;
 
   case SMT_NOSTART:
+  case SMT_NOSTART_WARN:
     htsp_subscription_status(hs,  streaming_code2txt(sm->sm_code),
         sm->sm_code ? _htsp_get_subscription_status(sm->sm_code) : NULL);
     break;

diff --git a/src/plumbing/globalheaders.c b/src/plumbing/globalheaders.c
@@ -331,6 +331,7 @@ gh_hold(globalheaders_t *gh, streaming_message_t *sm)
   case SMT_SERVICE_STATUS:
   case SMT_SIGNAL_STATUS:
   case SMT_NOSTART:
+  case SMT_NOSTART_WARN:
   case SMT_MPEGTS:
   case SMT_SPEED:
   case SMT_SKIP:
@@ -366,6 +367,7 @@ gh_pass(globalheaders_t *gh, streaming_message_t *sm)
   case SMT_SERVICE_STATUS:
   case SMT_SIGNAL_STATUS:
   case SMT_NOSTART:
+  case SMT_NOSTART_WARN:
   case SMT_MPEGTS:
   case SMT_SKIP:
   case SMT_SPEED:

diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
@@ -1832,6 +1832,7 @@ transcoder_input(void *opaque, streaming_message_t *sm)
   case SMT_SERVICE_STATUS:
   case SMT_SIGNAL_STATUS:
   case SMT_NOSTART:
+  case SMT_NOSTART_WARN:
   case SMT_MPEGTS:
     streaming_target_deliver2(t->t_output, sm);
     break;

diff --git a/src/plumbing/tsfix.c b/src/plumbing/tsfix.c
@@ -549,6 +549,7 @@ tsfix_input(void *opaque, streaming_message_t *sm)
   case SMT_SERVICE_STATUS:
   case SMT_SIGNAL_STATUS:
   case SMT_NOSTART:
+  case SMT_NOSTART_WARN:
   case SMT_MPEGTS:
   case SMT_SPEED:
   case SMT_SKIP:

diff --git a/src/satip/rtp.c b/src/satip/rtp.c
@@ -210,6 +210,7 @@ satip_rtp_thread(void *aux)
 
     case SMT_START:
     case SMT_STOP:
+    case SMT_NOSTART_WARN:
     case SMT_PACKET:
     case SMT_GRACE:
     case SMT_SKIP:

diff --git a/src/streaming.c b/src/streaming.c
@@ -270,6 +270,7 @@ streaming_msg_clone(streaming_message_t *src)
   case SMT_STOP:
   case SMT_SERVICE_STATUS:
   case SMT_NOSTART:
+  case SMT_NOSTART_WARN:
     dst->sm_code = src->sm_code;
     break;
 
@@ -331,6 +332,7 @@ streaming_msg_free(streaming_message_t *sm)
   case SMT_EXIT:
   case SMT_SERVICE_STATUS:
   case SMT_NOSTART:
+  case SMT_NOSTART_WARN:
   case SMT_SPEED:
     break;
 

diff --git a/src/subscriptions.c b/src/subscriptions.c
@@ -366,6 +366,8 @@ subscription_reschedule(void)
         s->ths_testing_error = 0;
         s->ths_current_instance = NULL;
         service_instance_list_clear(&s->ths_instances);
+        sm = streaming_msg_create_code(SMT_NOSTART_WARN, error);
+        streaming_target_deliver(s->ths_output, sm);
         continue;
       }
       /* No service available */

diff --git a/src/timeshift/timeshift_reader.c b/src/timeshift/timeshift_reader.c
@@ -135,6 +135,7 @@ static ssize_t _read_msg ( timeshift_file_t *tsf, int fd, streaming_message_t **
     /* Unhandled */
     case SMT_START:
     case SMT_NOSTART:
+    case SMT_NOSTART_WARN:
     case SMT_SERVICE_STATUS:
       return -1;
       break;

diff --git a/src/timeshift/timeshift_writer.c b/src/timeshift/timeshift_writer.c
@@ -308,6 +308,7 @@ static void _process_msg
     /* Status */
     case SMT_GRACE:
     case SMT_NOSTART:
+    case SMT_NOSTART_WARN:
     case SMT_SERVICE_STATUS:
     case SMT_TIMESHIFT_STATUS:
       break;

diff --git a/src/tvheadend.h b/src/tvheadend.h
@@ -389,6 +389,13 @@ typedef enum {
    */
   SMT_NOSTART,
 
+  /**
+   * Streaming unable to start (non-fatal).
+   *
+   * sm_code indicates reason. Scheduler will try to restart
+   */
+  SMT_NOSTART_WARN,
+
   /**
    * Raw MPEG TS data
    */

diff --git a/src/webui/webui.c b/src/webui/webui.c
@@ -425,6 +425,7 @@ http_stream_run(http_connection_t *hc, profile_chain_t *prch,
       }
       break;
 
+    case SMT_NOSTART_WARN:
     case SMT_SKIP:
     case SMT_SPEED:
     case SMT_SIGNAL_STATUS: