[vlc-devel] [PATCH] dtv multisat: Extend support for up to 16 uncommitted ports.

[Zoran Turalija]

On Wed, Nov 23, 2016 at 11:09:21AM +0200, Rémi Denis-Courmont wrote:
> Hello,
> 
> Use an integer range instead of a table of contiguous values... ?

I just noticed the same myself. :) Thanks for point it out.

I can ditch uncommitted_vlc and uncommitted_user, or...?

Maybe something like:

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 4a47b18..5c346bc 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -215,13 +215,6 @@ static const char *const satno_user[] = { N_("Unspecified"),
     "DiSEqC 1.1 uncommitted switch and DiSEqC 1.0 committed switch, " \
     "the correct uncommitted port can be selected " \
     "If there is no uncommitted switch, this parameter should be 0.")
-#ifdef HAVE_LINUX_DVB
-static const int uncommitted_vlc[] = { 0,
-    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-static const char *const uncommitted_user[] = { N_("Unspecified"),
-    "1",  "2",  "3",  "4",  "5",  "6",  "7",  "8",
-    "9", "10", "11", "12", "13", "14", "15", "16" };
-#endif

 /* BDA module additional DVB-S Parameters */
 #define NETID_TEXT N_("Network identifier")
@@ -410,7 +403,8 @@ vlc_module_begin ()
         change_integer_list (satno_vlc, satno_user)
         change_safe ()
     add_integer ("dvb-uncommitted", 0, UNCOMMITTED_TEXT, UNCOMMITTED_LONGTEXT, true)
-        change_integer_list (uncommitted_vlc, uncommitted_user)
+        change_integer_range (0, 16)
         change_safe ()
     add_integer ("dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT, true)
         change_integer_list (auto_off_on_vlc, auto_off_on_user)

-- 
Kind regards,
Zoran Turalija