From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 20 Sep 2016 15:45:01 +0000 (+0200)
Subject: linuxdvb: do not use international diseqc type names internally
X-Git-Tag: v4.2.1~306
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf4880da201bcf714526f0e87a8ba7edd1574ec7;p=thirdparty%2Ftvheadend.git

linuxdvb: do not use international diseqc type names internally
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_en50494.c b/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
index 8e317a298..dd92d98fc 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
@@ -382,9 +382,9 @@ htsmsg_t *
 linuxdvb_en50494_list ( void *o, const char *lang )
 {
   htsmsg_t *m = htsmsg_create_list();
-  htsmsg_add_str(m, NULL, tvh_gettext_lang(lang, N_("None")));
-  htsmsg_add_str(m, NULL, tvh_gettext_lang(lang, N_(UNICABLE_I_NAME)));
-  htsmsg_add_str(m, NULL, tvh_gettext_lang(lang, N_(UNICABLE_II_NAME)));
+  htsmsg_add_msg(m, NULL, htsmsg_create_key_val("", tvh_gettext_lang(lang, N_("None"))));
+  htsmsg_add_msg(m, NULL, htsmsg_create_key_val(UNICABLE_I_NAME, tvh_gettext_lang(lang, N_(UNICABLE_I_NAME))));
+  htsmsg_add_msg(m, NULL, htsmsg_create_key_val(UNICABLE_II_NAME, tvh_gettext_lang(lang, N_(UNICABLE_II_NAME))));
   return m;
 }
 
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_rotor.c b/src/input/mpegts/linuxdvb/linuxdvb_rotor.c
index 84e22e502..698dce91c 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_rotor.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_rotor.c
@@ -483,9 +483,9 @@ linuxdvb_rotor_list ( void *o, const char *lang )
 {
   int i;
   htsmsg_t *m = htsmsg_create_list(); 
-  htsmsg_add_str(m, NULL, tvh_gettext_lang(lang, N_("None")));
+  htsmsg_add_msg(m, NULL, htsmsg_create_key_val("", tvh_gettext_lang(lang, N_("None"))));
   for (i = 0; i < ARRAY_SIZE(linuxdvb_rotor_all); i++)
-    htsmsg_add_str(m, NULL, tvh_gettext_lang(lang, linuxdvb_rotor_all[i].name));
+    htsmsg_add_msg(m, NULL, htsmsg_create_key_val(linuxdvb_rotor_all[i].name, tvh_gettext_lang(lang, linuxdvb_rotor_all[i].name)));
   return m;
 }
 
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_switch.c b/src/input/mpegts/linuxdvb/linuxdvb_switch.c
index 3043d69f3..e53279a2c 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_switch.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_switch.c
@@ -259,8 +259,8 @@ htsmsg_t *
 linuxdvb_switch_list ( void *o, const char *lang )
 {
   htsmsg_t *m = htsmsg_create_list();
-  htsmsg_add_str(m, NULL, tvh_gettext_lang(lang, N_("None")));
-  htsmsg_add_str(m, NULL, tvh_gettext_lang(lang, N_("Generic")));
+  htsmsg_add_msg(m, NULL, htsmsg_create_key_val("", tvh_gettext_lang(lang, N_("None"))));
+  htsmsg_add_msg(m, NULL, htsmsg_create_key_val("Generic", tvh_gettext_lang(lang, N_("Generic"))));
   return m;
 }