Merge pull request #14 from sandsmark/martin/subgain

add support for changing sub gain
janbar · Sep 22, 2021 · 7f24654 · 7f24654
2 parents 136297c + b958479
commit 7f24654
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 9 deletions.
diff --git a/noson/src/renderingcontrol.cpp b/noson/src/renderingcontrol.cpp
@@ -123,7 +123,7 @@ bool RenderingControl::SetMute(uint8_t value, const char* channel)
   return false;
 }
 
-bool RenderingControl::GetNightmode(uint8_t *value)
+bool RenderingControl::GetNightmode(int16_t *value)
 {
   ElementList args;
   args.push_back(ElementPtr(new Element("InstanceID", "0")));
@@ -132,12 +132,12 @@ bool RenderingControl::GetNightmode(uint8_t *value)
   {
     ElementList::const_iterator it = vars.FindKey("NightMode");
     if (it != vars.end())
-      return (string_to_uint8((*it)->c_str(), value) == 0);
+      return (string_to_int16((*it)->c_str(), value) == 0);
   }
   return false;
 }
 
-bool RenderingControl::SetNightmode(uint8_t value)
+bool RenderingControl::SetNightmode(int16_t value)
 {
   ElementList args;
   args.push_back(ElementPtr(new Element("InstanceID", "0")));
@@ -149,6 +149,32 @@ bool RenderingControl::SetNightmode(uint8_t value)
   return false;
 }
 
+bool RenderingControl::GetSubGain(int16_t *value)
+{
+  ElementList args;
+  args.push_back(ElementPtr(new Element("InstanceID", "0")));
+  ElementList vars = Request("GetEQ", args);
+  if (!vars.empty() && vars[0]->compare("GetEQResponse") == 0)
+  {
+    ElementList::const_iterator it = vars.FindKey("SubGain");
+    if (it != vars.end())
+      return (string_to_int16((*it)->c_str(), value) == 0);
+  }
+  return false;
+}
+
+bool RenderingControl::SetSubGain(int16_t value)
+{
+  ElementList args;
+  args.push_back(ElementPtr(new Element("InstanceID", "0")));
+  args.push_back(ElementPtr(new Element("EQType", "SubGain")));
+  args.push_back(ElementPtr(new Element("DesiredValue", std::to_string(value))));
+  ElementList vars = Request("SetEQ", args);
+  if (!vars.empty() && vars[0]->compare("SetEQResponse") == 0)
+    return true;
+  return false;
+}
+
 bool RenderingControl::GetTreble(int8_t* value)
 {
   ElementList args;
@@ -334,6 +360,11 @@ void RenderingControl::HandleEventMessage(EventMessagePtr msg)
             if (string_to_int32((*++it).c_str(), &num) == 0)
               prop->NightMode = num;
           }
+          else if (*it == "SubGain")
+          {
+            if (string_to_int32((*++it).c_str(), &num) == 0)
+              prop->SubGain = num;
+          }
           else if (*it == "Bass")
           {
             if (string_to_int32((*++it).c_str(), &num) == 0)

diff --git a/noson/src/renderingcontrol.h b/noson/src/renderingcontrol.h
@@ -63,9 +63,13 @@ namespace NSROOT
 
     bool SetMute(uint8_t value, const char* channel = CH_MASTER);
 
-    bool GetNightmode(uint8_t* value);
+    bool GetNightmode(int16_t* value);
 
-    bool SetNightmode(uint8_t value);
+    bool SetNightmode(int16_t value);
+
+    bool GetSubGain(int16_t* value);
+
+    bool SetSubGain(int16_t value);
 
     bool GetTreble(int8_t* value);
 

diff --git a/noson/src/sonosplayer.cpp b/noson/src/sonosplayer.cpp
@@ -336,7 +336,7 @@ bool Player::SetMute(const std::string& uuid, uint8_t value)
   return false;
 }
 
-bool Player::GetNightmode(const std::string &uuid, uint8_t *value)
+bool Player::GetNightmode(const std::string &uuid, int16_t *value)
 {
   for (RCTable::const_iterator it = m_RCTable.begin(); it != m_RCTable.end(); ++it)
   {
@@ -346,7 +346,7 @@ bool Player::GetNightmode(const std::string &uuid, uint8_t *value)
   return false;
 }
 
-bool Player::SetNightmode(const std::string &uuid, uint8_t value)
+bool Player::SetNightmode(const std::string &uuid, int16_t value)
 {
   for (RCTable::const_iterator it = m_RCTable.begin(); it != m_RCTable.end(); ++it)
   {
@@ -376,6 +376,26 @@ bool Player::SetLoudness(const std::string &uuid, uint8_t value)
   return false;
 }
 
+bool Player::GetSubGain(const std::string &uuid, int16_t *value)
+{
+  for (RCTable::const_iterator it = m_RCTable.begin(); it != m_RCTable.end(); ++it)
+  {
+    if (it->uuid == uuid)
+      return it->renderingControl->GetSubGain(value);
+  }
+  return false;
+}
+
+bool Player::SetSubGain(const std::string &uuid, int16_t value)
+{
+  for (RCTable::const_iterator it = m_RCTable.begin(); it != m_RCTable.end(); ++it)
+  {
+    if (it->uuid == uuid)
+      return it->renderingControl->SetSubGain(value);
+  }
+  return false;
+}
+
 bool Player::GetBass(const std::string &uuid, int8_t* value)
 {
   for (RCTable::const_iterator it = m_RCTable.begin(); it != m_RCTable.end(); ++it)

diff --git a/noson/src/sonosplayer.h b/noson/src/sonosplayer.h
@@ -95,10 +95,12 @@ namespace NSROOT
     bool GetMute(const std::string& uuid, uint8_t* value);
     bool SetMute(const std::string& uuid, uint8_t value);
 
-    bool GetNightmode(const std::string& uuid, uint8_t* value);
-    bool SetNightmode(const std::string& uuid, uint8_t value);
+    bool GetNightmode(const std::string& uuid, int16_t* value);
+    bool SetNightmode(const std::string& uuid, int16_t value);
     bool GetLoudness(const std::string& uuid, uint8_t* value);
     bool SetLoudness(const std::string& uuid, uint8_t value);
+    bool GetSubGain(const std::string& uuid, int16_t* value);
+    bool SetSubGain(const std::string& uuid, int16_t value);
 
     bool GetBass(const std::string& uuid, int8_t* value);
     bool SetBass(const std::string& uuid, int8_t value);

diff --git a/noson/src/sonostypes.h b/noson/src/sonostypes.h
@@ -192,6 +192,7 @@ namespace NSROOT
     , MuteLF(0)
     , MuteRF(0)
     , NightMode(0)
+    , SubGain(0)
     , Treble(0)
     , Bass(0)
     , OutputFixed(0)
@@ -209,6 +210,7 @@ namespace NSROOT
     int MuteLF;
     int MuteRF;
     int NightMode;
+    int SubGain;
     int Treble;
     int Bass;
     int OutputFixed;