FTA options patch by davep

diff --git a/mvpclient.c b/mvpclient.c
index 14f053020f1614746ca8820eccaa3af50f277442..94430ccdefe2f6d215df81d4a37ccffe5db54204 100644 (file)
--- a/mvpclient.c
+++ b/mvpclient.c
@@ -366,18 +366,17 @@ void MVPClient::processGetChannelsList(UCHAR* data, int length)
   char* point;
   ULONG type;
 
+  char* chanConfig = config.getValueString("General", "Channels");
+  int allChans = 1;
+  if (chanConfig) allChans = strcasecmp(chanConfig, "FTA only");
+
   for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel))
   {
-
-// Re-enable later with some client side option
-//#if VDRVERSNUM < 10300
-//    if (!channel->GroupSep() && !channel->Ca())
-//#else
-//    if (!channel->GroupSep() && !channel->Ca(0))
-//#endif
-//    {
-
-    if (!channel->GroupSep())
+#if VDRVERSNUM < 10300
+    if (!channel->GroupSep() && (!channel->Ca() || allChans))
+#else
+    if (!channel->GroupSep() && (!channel->Ca(0) || allChans))
+#endif
     {
       log->log("Client", Log::DEBUG, "name: '%s'", channel->Name());