From a18cda8e065020b86b24d058ff64a7b266881e09 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Sat, 2 Nov 2013 20:13:53 +0000
Subject: [PATCH] api webui: remove all references to the old satconf grid

---
 src/api/api_mpegts.c              | 44 -------------------------------
 src/webui/static/app/mpegts.js    | 18 -------------
 src/webui/static/app/tvheadend.js |  1 -
 3 files changed, 63 deletions(-)

diff --git a/src/api/api_mpegts.c b/src/api/api_mpegts.c
index f67b9a94..30a179fd 100644
--- a/src/api/api_mpegts.c
+++ b/src/api/api_mpegts.c
@@ -253,47 +253,7 @@ api_mpegts_service_grid
   }
 }
 
-/*
- * Satconfs
- */
 #if ENABLE_LINUXDVB
-static void
-api_linuxdvb_satconf_grid
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
-{
-  mpegts_input_t *mi;
-  extern const idclass_t linuxdvb_satconf_class;
-
-  LIST_FOREACH(mi, &mpegts_input_all, mi_global_link)
-    if (idnode_is_instance((idnode_t*)mi, &linuxdvb_satconf_class))
-      idnode_set_add(ins, (idnode_t*)mi, &conf->filter);
-}
-
-static int
-api_linuxdvb_satconf_create
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
-{
-  int err;
-  htsmsg_t *conf;
-  idnode_t *in;
-
-  if (!(conf  = htsmsg_get_map(args, "conf")))
-    return -EINVAL;
-
-  pthread_mutex_lock(&global_lock);
-  in = NULL;//TODO:(idnode_t*)linuxdvb_satconf_create0(NULL, conf);
-  if (in) {
-    err = 0;
-    in->in_class->ic_save(in);
-    *resp = htsmsg_create_map();
-  } else {
-    err = -EINVAL;
-  }
-  pthread_mutex_unlock(&global_lock);
-
-  return err;
-}
-
 static int
 api_linuxdvb_scanfile_list
   ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
@@ -350,7 +310,6 @@ api_mpegts_init ( void )
   extern const idclass_t mpegts_network_class;
   extern const idclass_t mpegts_mux_class;
   extern const idclass_t mpegts_service_class;
-  extern const idclass_t linuxdvb_satconf_class;
 
   static api_hook_t ah[] = {
     { "mpegts/input/network_list", ACCESS_ANONYMOUS, api_mpegts_input_network_list, NULL },
@@ -365,9 +324,6 @@ api_mpegts_init ( void )
     { "mpegts/service/grid",       ACCESS_ANONYMOUS, api_idnode_grid,  api_mpegts_service_grid },
     { "mpegts/service/class",      ACCESS_ANONYMOUS, api_idnode_class, (void*)&mpegts_service_class },
 #if ENABLE_LINUXDVB
-    { "linuxdvb/satconf/grid",     ACCESS_ANONYMOUS, api_idnode_grid,  api_linuxdvb_satconf_grid },
-    { "linuxdvb/satconf/class",    ACCESS_ANONYMOUS, api_idnode_class, (void*)&linuxdvb_satconf_class },
-    { "linuxdvb/satconf/create",   ACCESS_ANONYMOUS, api_linuxdvb_satconf_create, NULL },
     { "linuxdvb/scanfile/list",    ACCESS_ANONYMOUS, api_linuxdvb_scanfile_list, NULL },
 #endif
     { NULL },
diff --git a/src/webui/static/app/mpegts.js b/src/webui/static/app/mpegts.js
index 00cf2059..8f1fa4c5 100644
--- a/src/webui/static/app/mpegts.js
+++ b/src/webui/static/app/mpegts.js
@@ -123,21 +123,3 @@ tvheadend.services = function(panel)
     ]
   });
 }
-
-tvheadend.satconfs = function(panel)
-{
-  tvheadend.idnode_grid(panel, {
-    url      : 'api/linuxdvb/satconf',
-    comet    : 'linuxdvb_satconf',
-    titleS   : 'Satconf',
-    titleP   : 'Satconfs',
-    tabIndex : 4,
-    add      : {
-      titleS : 'Satconf',
-      url    : 'api/linuxdvb/satconf',
-      create : {}
-    },
-    del      : true,
-    edittree : true,
-  });
-}
diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index 49ecb8f8..2fe9ec87 100644
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -280,7 +280,6 @@ function accessUpdate(o) {
     tvheadend.networks(tvheadend.conf_dvbin);
     tvheadend.muxes(tvheadend.conf_dvbin);
     tvheadend.services(tvheadend.conf_dvbin);
-    tvheadend.satconfs(tvheadend.conf_dvbin);
     tabs1.push(tvheadend.conf_dvbin);
 
     /* Channel / EPG */