tsfile: removed config saving and redundant file

diff --git a/src/input/mpegts/tsfile/tsfile.c b/src/input/mpegts/tsfile/tsfile.c
index f6b1d4e4c8d4ae85525c463e1270a48deefa221b..ed4448e0010643c573983cb3ee386d23ff034fae 100644 (file)
--- a/src/input/mpegts/tsfile/tsfile.c
+++ b/src/input/mpegts/tsfile/tsfile.c
@@ -33,6 +33,11 @@ tsfile_input_list_t      tsfile_inputs;
 extern const idclass_t mpegts_service_class;
 extern const idclass_t mpegts_network_class;
 
+static void
+tsfile_service_config_save ( service_t *s )
+{
+}
+
 /*
  * Network definition
  */
@@ -42,6 +47,7 @@ tsfile_network_create_service
 {
   pthread_mutex_lock(&tsfile_lock);
   mpegts_service_t *s = mpegts_service_create1(NULL, mm, sid, pmt_pid, NULL);
+  s->s_config_save = tsfile_service_config_save;
   pthread_mutex_unlock(&tsfile_lock);
 
   // TODO: HACK: REMOVE ME

diff --git a/src/input/mpegts/tsfile/tsfile_mux.c b/src/input/mpegts/tsfile/tsfile_mux.c
index 380175ea41fd04343ca095bb534f14304ffd4308..000ae3e15f4ec4e51a50841828111d2c55c5e434 100644 (file)
--- a/src/input/mpegts/tsfile/tsfile_mux.c
+++ b/src/input/mpegts/tsfile/tsfile_mux.c
@@ -36,11 +36,17 @@ tsfile_mux_instance_create
   return mmi;
 }
 
+static void
+iptv_mux_config_save ( mpegts_mux_t *m )
+{
+}
+
 mpegts_mux_t *
 tsfile_mux_create ( mpegts_network_t *mn )
 {
   mpegts_mux_t *mm 
     = mpegts_mux_create1(NULL, mn, MPEGTS_ONID_NONE, MPEGTS_TSID_NONE, NULL);
+  mm->mm_config_save = iptv_mux_config_save;
   tvhtrace("tsfile", "mm created %p", mm);
   return mm;
 }

diff --git a/src/input/mpegts/tsfile/tsfile_service.c b/src/input/mpegts/tsfile/tsfile_service.c
deleted file mode 100644 (file)
index 70999e2..0000000
--- a/src/input/mpegts/tsfile/tsfile_service.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Tvheadend - TS file input service
- *
- *  Copyright (C) 2013 Adam Sutton
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-mpegts_service_t *tsfile_service_create ( const char *path )
-{
-  mpegts_service_t *s = mpegts_service_create(NULL);
-  
-  s->s_dvb_service_id = 0;
-  s->s_dvb_pmt_pid    = 0;
-  s->s_dvb_
-}
-
-
-/******************************************************************************
- * Editor Configuration
- *
- * vim:sts=2:ts=2:sw=2:et
- *****************************************************************************/