Merge remote-tracking branch 'origin/pr/318'

Conflicts:
	src/input/mpegts/linuxdvb/linuxdvb_satconf.c

diff --cc Makefile
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb.c
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb_private.h
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb_satconf.c
index d376621e2d11aa7e99789b54333caf2a2b139edc,b192d56f63444fbbfbab246a9fa3a19d9a7404eb..a7f2361799db03ba4fb13d1c999c94b69e92f266
--- 1/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
--- 2/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
@@@ -973,24 -1246,21 +1235,26 @@@ linuxdvb_satconf_ele_create
  }
  
  void
 -linuxdvb_satconf_delete ( linuxdvb_satconf_t *ls )
 +linuxdvb_satconf_delete ( linuxdvb_satconf_t *ls, int delconf )
  {
 -#if TODO
 +  linuxdvb_satconf_ele_t *lse, *nxt;
    const char *uuid = idnode_uuid_as_str(&ls->ls_id);
 -  hts_settings_remove("input/linuxdvb/satconfs/%s", uuid);
 -  if (ls->ls_lnb)
 -    linuxdvb_lnb_destroy(ls->ls_lnb);
 -  if (ls->ls_switch)
 -    linuxdvb_switch_destroy(ls->ls_switch);
 -  if (ls->ls_rotor)
 -    linuxdvb_rotor_destroy(ls->ls_rotor);
 -  if (ls->ls_en50494)
 -    linuxdvb_en50494_destroy(ls->ls_en50494);
 -  mpegts_input_delete((mpegts_input_t*)ls);
 -#endif
 +  if (delconf)
 +    hts_settings_remove("input/linuxdvb/satconfs/%s", uuid);
 +  gtimer_disarm(&ls->ls_diseqc_timer);
 +  for (lse = TAILQ_FIRST(&ls->ls_elements); lse != NULL; lse = nxt) {
 +    nxt = TAILQ_NEXT(lse, ls_link);
 +    TAILQ_REMOVE(&ls->ls_elements, lse, ls_link);
 +    if (lse->ls_lnb)
 +      linuxdvb_lnb_destroy(lse->ls_lnb);
 +    if (lse->ls_switch)
 +      linuxdvb_switch_destroy(lse->ls_switch);
 +    if (lse->ls_rotor)
 +      linuxdvb_rotor_destroy(lse->ls_rotor);
++    if (lse->ls_en50494)
++      linuxdvb_en50494_destroy(lse->ls_en50494);
 +    mpegts_input_delete((mpegts_input_t*)lse);
 +  }
  }
  
  /******************************************************************************