From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 15 Jan 2019 09:35:26 +0000 (+0100)
Subject: mpegts input: change mpegts_input_tuning_error() to more universal mpegts_input_error()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6621db64e23c5a77d7973ae39be17a76135e18dd;p=thirdparty%2Ftvheadend.git

mpegts input: change mpegts_input_tuning_error() to more universal mpegts_input_error()
---

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index 087bfdaa1..51863f1ca 100644
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -751,7 +751,7 @@ struct mpegts_input
   void (*mi_stopping_mux)   (mpegts_input_t*,mpegts_mux_instance_t*);
   void (*mi_stopped_mux)    (mpegts_input_t*,mpegts_mux_instance_t*);
   int  (*mi_has_subscription) (mpegts_input_t*, mpegts_mux_t *mm);
-  void (*mi_tuning_error)   (mpegts_input_t*, mpegts_mux_t *);
+  void (*mi_error)          (mpegts_input_t*, mpegts_mux_t *, int tss_flags);
   void (*mi_empty_status)   (mpegts_input_t*, tvh_input_stream_t *);
   idnode_set_t *(*mi_network_list) (mpegts_input_t*);
 };
diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index bc4b385c5..cef26f00e 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -1058,14 +1058,14 @@ mpegts_input_has_subscription ( mpegts_input_t *mi, mpegts_mux_t *mm )
 }
 
 static void
-mpegts_input_tuning_error ( mpegts_input_t *mi, mpegts_mux_t *mm )
+mpegts_input_error ( mpegts_input_t *mi, mpegts_mux_t *mm, int tss_flags )
 {
   service_t *t, *t_next;
   tvh_mutex_lock(&mi->mi_output_lock);
   for (t = LIST_FIRST(&mm->mm_transports); t; t = t_next) {
     t_next = LIST_NEXT(t, s_active_link);
     tvh_mutex_lock(&t->s_stream_mutex);
-    service_set_streaming_status_flags(t, TSS_TUNING);
+    service_set_streaming_status_flags(t, tss_flags);
     tvh_mutex_unlock(&t->s_stream_mutex);
   }
   tvh_mutex_unlock(&mi->mi_output_lock);
@@ -2096,7 +2096,7 @@ mpegts_input_create0
   mi->mi_stopping_mux         = mpegts_input_stopping_mux;
   mi->mi_stopped_mux          = mpegts_input_stopped_mux;
   mi->mi_has_subscription     = mpegts_input_has_subscription;
-  mi->mi_tuning_error         = mpegts_input_tuning_error;
+  mi->mi_error                = mpegts_input_error;
   mi->ti_get_streams          = mpegts_input_get_streams;
   mi->ti_clear_stats          = mpegts_input_clear_stats;
 
diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index c0cbb5ba5..c34d8013e 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -1484,7 +1484,7 @@ mpegts_mux_tuning_error ( const char *mux_uuid, mpegts_mux_instance_t *mmi_match
     if (mm) {
       if ((mmi = mm->mm_active) != NULL && mmi == mmi_match)
         if (mmi->mmi_input)
-          mmi->mmi_input->mi_tuning_error(mmi->mmi_input, mm);
+          mmi->mmi_input->mi_error(mmi->mmi_input, mm, TSS_TUNING);
     }
     tvh_mutex_unlock(&global_lock);
   }