Move subtitles default to Config

diff --git a/config.cc b/config.cc
index f1879102e174c6c61baffe0ef47d64dc1515dc8d..fe8a32f0ada8ef5bc0942f946487c59a403abd74 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -50,6 +50,9 @@ void Config::applyDefaults()
   insertBool("input", "mod_lirc_enabled", false);
 
   insertInt("server-discovery", "prefer-ipv", 6);
+
+  // Not in config.json.sample - VDR login always sets this
+  insertInt("subtitles", "default", 0);
 }
 
 bool Config::loadFile()

diff --git a/control.h b/control.h
index 694d8cd1e2ab488f56cdf36cadd23eedc2e2e232..6bb6cae17ff6ff69a6e8066dc1e6a29120bdfabd 100644 (file)
--- a/control.h
+++ b/control.h
@@ -69,8 +69,6 @@ class Control : public MessageQueue
     void setAdvMenus(bool adv) { advMenus = adv; };
     bool isAdvMenus() { return advMenus; };
     int getLangPref(bool subtitle,const char* langcode);
-    void setSubDefault(int subon) { subdefault = subon; };    // NCONFIG
-    int getSubDefault() { return subdefault; };
     ASLPrefList &getASLList() { return langcodes; };
 
   private:
@@ -114,7 +112,6 @@ class Control : public MessageQueue
 
     bool advMenus{};
     ASLPrefList langcodes;
-    int subdefault;               // NCONFIG
         
     void processMessage(Message* m);
 };

diff --git a/playervideolive.cc b/playervideolive.cc
index 0ca002595a512c5aab00c3e2ac2b4a09d55b89d7..0667fee7aa2057a81a59f20603c0519d44d72d2e 100644 (file)
--- a/playervideolive.cc
+++ b/playervideolive.cc
@@ -25,6 +25,7 @@
 
 #include "defines.h"
 #include "log.h"
+#include "config.h"
 #include "audio.h"
 #include "video.h"
 #include "demuxerts.h"
@@ -818,7 +819,9 @@ void PlayerVideoLive::threadMethod()
             {
               firstStart = false;
 
-              if (control->getSubDefault())
+              int subDefault;
+              Config::getInstance()->getInt("subtitles", "default", subDefault);
+              if (subDefault)
                 turnSubtitlesOn(true);
               else
                 turnSubtitlesOn(false);

diff --git a/playervideorec.cc b/playervideorec.cc
index 046346bfb98adf51be31511758e61a1654850f35..12ace2284930d60cc66f686312ffe5c53ccf6c7b 100644 (file)
--- a/playervideorec.cc
+++ b/playervideorec.cc
@@ -18,6 +18,7 @@
 */
 
 #include "log.h"
+#include "config.h"
 #include "audio.h"
 #include "video.h"
 #include "demuxervdr.h"
@@ -94,7 +95,9 @@ int PlayerVideoRec::init(bool p_isPesRecording, double framespersecond)
   video->blank();
   audio->stop();
 
-  if (Control::getInstance()->getSubDefault())
+  int subDefault;
+  Config::getInstance()->getInt("subtitles", "default", subDefault);
+  if (subDefault)
     turnSubtitlesOn(true);
   else
     turnSubtitlesOn(false);

diff --git a/vconnect.cc b/vconnect.cc
index 593a0c1131575b16618cf022fb50023a525acde5..d416358711af1c08462355b4e9f97e97e6545b91 100644 (file)
--- a/vconnect.cc
+++ b/vconnect.cc
@@ -286,7 +286,7 @@ bool VConnect::attemptConnect(const VDRServer* vdrServer)
 
   logger->debug(TAG, "VDR login ok");
 
-  Control::getInstance()->setSubDefault(subtitles);
+  Config::getInstance()->set("subtitles", "default", subtitles);
   Wol::getInstance()->setWakeUpIP(vdrServer->ip.c_str());
 
   logger->info(TAG, "Send VDR connected message");

diff --git a/vdr.cc b/vdr.cc
index d8af43bee56fe7029bad892a9355dcce3608492a..2a077a1ec3370b33e3e6b219225365f8b81548ae 100644 (file)
--- a/vdr.cc
+++ b/vdr.cc
@@ -664,7 +664,7 @@ bool VDR::doLogin(unsigned int* v_server_min, unsigned int* v_server_max, unsign
                  newpref.audiopref = vresp->extractLONG();
                  newpref.subtitlepref = vresp->extractLONG();
                  newpref.langcode = vresp->extractStdString();
-                 //logger->debug(TAG, "Langpref {} {} {}", newpref.langcode.c_str(),  newpref.audiopref,  newpref.subtitlepref);
+                 //logger->debug(TAG, "Langpref {} {} {} {}", subtitles, newpref.langcode,  newpref.audiopref, newpref.subtitlepref);
                  list.push_back(newpref);
          }
   }