Server name!

aassif · Apr 27, 2020 · 6ed104c · 6ed104c
1 parent abebf03
commit 6ed104c
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 3 deletions.
diff --git a/pvr.freebox/resources/language/resource.language.en_gb/strings.po b/pvr.freebox/resources/language/resource.language.en_gb/strings.po
@@ -116,3 +116,11 @@ msgctxt "#30024"
 msgid "Convert French categories into standard categories."
 msgstr ""
 
+msgctxt "#30025"
+msgid "Server"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Server name or IP address."
+msgstr ""
+
diff --git a/pvr.freebox/resources/language/resource.language.fr_fr/strings.po b/pvr.freebox/resources/language/resource.language.fr_fr/strings.po
@@ -116,3 +116,11 @@ msgctxt "#30024"
 msgid "Convert French categories into standard categories."
 msgstr "Conversion des catégories françaises en catégories standard."
 
+msgctxt "#30025"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "#30026"
+msgid "Server name or IP address."
+msgstr "Nom du serveur ou adresse IP."
+
diff --git a/pvr.freebox/resources/settings.xml b/pvr.freebox/resources/settings.xml
@@ -3,6 +3,11 @@
   <section id="section" label="30002" description="30002">
     <category id="category" label="30002" description="30002">
       <group id="pvr.freebox.general" label="30002">
+        <setting id="server" type="string" label="30025" help="30026">
+          <level>2</level>
+          <default>mafreebox.freebox.fr</default>
+          <control type="edit" format="string" />
+        </setting>
         <setting id="delay" type="integer" label="30003" help="30004">
           <level>0</level>
           <default>10</default>

diff --git a/src/Freebox.cpp b/src/Freebox.cpp
@@ -876,14 +876,15 @@ bool Freebox::ProcessChannels ()
 }
 
 Freebox::Freebox (const string & path,
+                  const string & server,
                   int source,
                   int quality,
                   int days,
                   bool extended,
                   bool colors,
                   int delay) :
   m_path (path),
-  m_server ("mafreebox.freebox.fr"),
+  m_server (server),
   m_delay (delay),
   m_app_token (),
   m_track_id (),
@@ -916,6 +917,12 @@ Freebox::~Freebox ()
   CloseSession ();
 }
 
+void Freebox::SetServer (const string & server)
+{
+  P8PLATFORM::CLockObject lock (m_mutex);
+  m_server = server;
+}
+
 string Freebox::GetServer () const
 {
   P8PLATFORM::CLockObject lock (m_mutex);

diff --git a/src/Freebox.h b/src/Freebox.h
@@ -316,10 +316,11 @@ class Freebox :
     };
 
   public:
-    Freebox (const std::string & path, int source, int quality, int days, bool extended, bool colors, int delay);
+    Freebox (const std::string & path, const std::string & server, int source, int quality, int days, bool extended, bool colors, int delay);
     virtual ~Freebox ();
 
     // Freebox Server.
+    void SetServer (const std::string &);
     std::string GetServer () const;
 
     // Source setting.

diff --git a/src/client.cpp b/src/client.cpp
@@ -37,6 +37,7 @@ using namespace ADDON;
 #endif
 
 std::string  path;
+std::string  server   = "mafreebox.freebox.fr";
 int          delay    = 0;
 int          source   = 1;
 int          quality  = 1;
@@ -54,6 +55,7 @@ extern "C" {
 
 void ADDON_ReadSettings ()
 {
+  if (! XBMC->GetSetting ("server",   &server))   server   = "mafreebox.freebox.fr";
   if (! XBMC->GetSetting ("delay",    &delay))    delay    = 0;
   if (! XBMC->GetSetting ("source",   &source))   source   = 1;
   if (! XBMC->GetSetting ("quality",  &quality))  quality  = 1;
@@ -112,7 +114,7 @@ ADDON_STATUS ADDON_Create (void * callbacks, void * properties)
   for (PVR_MENUHOOK & h : HOOKS)
     PVR->AddMenuHook (&h);
 
-  data   = new Freebox (p->strUserPath, source, quality, p->iEpgMaxDays, extended, colors, delay);
+  data   = new Freebox (p->strUserPath, server, source, quality, p->iEpgMaxDays, extended, colors, delay);
   status = ADDON_STATUS_OK;
   init   = true;
 
@@ -135,6 +137,12 @@ ADDON_STATUS ADDON_SetSetting (const char * name, const void * value)
 {
   if (data)
   {
+    if (! strcmp (name, "server"))
+    {
+      data->SetServer ((char *) value);
+      return ADDON_STATUS_NEED_RESTART;
+    }
+
     if (! strcmp (name, "delay"))
       data->SetDelay (*((int *) value));