From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 22 Oct 2014 14:28:22 +0000 (+0200)
Subject: mpegts: allow to remove dvb service
X-Git-Tag: v4.1~927
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e21b2207cc29f5385841463ade2ee1c4bd67142b;p=thirdparty%2Ftvheadend.git

mpegts: allow to remove dvb service
---

diff --git a/src/service.c b/src/service.c
index 9622bcd38..7c51c8112 100644
--- a/src/service.c
+++ b/src/service.c
@@ -48,6 +48,7 @@
 #include "esfilter.h"
 
 static void service_data_timeout(void *aux);
+static void service_class_delete(struct idnode *self);
 static void service_class_save(struct idnode *self);
 
 struct service_queue service_all;
@@ -171,6 +172,7 @@ const idclass_t service_class = {
   .ic_caption    = "Service",
   .ic_event      = "service",
   .ic_perm_def   = ACCESS_ADMIN,
+  .ic_delete     = service_class_delete,
   .ic_save       = service_class_save,
   .ic_get_title  = service_class_get_title,
   .ic_properties = (const property_t[]){
@@ -1257,6 +1259,15 @@ service_request_save(service_t *t, int restart)
 }
 
 
+/**
+ *
+ */
+static void
+service_class_delete(struct idnode *self)
+{
+  service_destroy((service_t *)self, 1);
+}
+
 /**
  *
  */
diff --git a/src/webui/static/app/mpegts.js b/src/webui/static/app/mpegts.js
index cdbc25743..9261daea2 100644
--- a/src/webui/static/app/mpegts.js
+++ b/src/webui/static/app/mpegts.js
@@ -260,7 +260,7 @@ tvheadend.services = function(panel, index)
         tabIndex: index,
         hidemode: true,
         add: false,
-        del: false,
+        del: true,
         help: function() {
             new tvheadend.help('Services', 'config_services.html');
         },