Merge pull request #9673 from stefansaraev/pvr-needsconfig

[pvr] needs_configuration is deadcode now
xbmc · Apr 27, 2016 · 019a119 · 019a119
2 parents d3a657d + 336f1bf
commit 019a119
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/xbmc/addons/PVRClient.cpp b/xbmc/addons/PVRClient.cpp
@@ -57,27 +57,24 @@ std::unique_ptr<CPVRClient> CPVRClient::FromExtension(AddonProps props, const cp
   std::string strAvahiType = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_type");
   std::string strAvahiIpSetting = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_ip_setting");
   std::string strAvahiPortSetting = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_port_setting");
-  bool bNeedsConfiguration = !(CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@needs_configuration") == "false");
   return std::unique_ptr<CPVRClient>(new CPVRClient(std::move(props), strAvahiType,
-      strAvahiIpSetting, strAvahiPortSetting, bNeedsConfiguration));
+      strAvahiIpSetting, strAvahiPortSetting));
 }
 
 CPVRClient::CPVRClient(AddonProps props)
   : CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>(std::move(props)),
-    m_bNeedsConfiguration(false),
     m_apiVersion("0.0.0"),
     m_bAvahiServiceAdded(false)
 {
   ResetProperties();
 }
 
 CPVRClient::CPVRClient(AddonProps props, const std::string& strAvahiType, const std::string& strAvahiIpSetting,
-    const std::string& strAvahiPortSetting, bool bNeedsConfiguration)
+    const std::string& strAvahiPortSetting)
   : CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>(std::move(props)),
     m_strAvahiType(strAvahiType),
     m_strAvahiIpSetting(strAvahiIpSetting),
     m_strAvahiPortSetting(strAvahiPortSetting),
-    m_bNeedsConfiguration(bNeedsConfiguration),
     m_apiVersion("0.0.0"),
     m_bAvahiServiceAdded(false)
 {

diff --git a/xbmc/addons/PVRClient.h b/xbmc/addons/PVRClient.h
@@ -63,7 +63,7 @@ namespace PVR
 
     explicit CPVRClient(ADDON::AddonProps props);
     CPVRClient(ADDON::AddonProps props, const std::string& strAvahiType,
-        const std::string& strAvahiIpSetting, const std::string& strAvahiPortSetting, bool bNeedsConfiguration);
+        const std::string& strAvahiIpSetting, const std::string& strAvahiPortSetting);
 
     ~CPVRClient(void);
 
@@ -74,8 +74,6 @@ namespace PVR
     virtual void OnPreUnInstall() override;
     virtual void OnPostUnInstall() override;
 
-    bool NeedsConfiguration(void) const { return m_bNeedsConfiguration; }
-
     /** @name PVR add-on methods */
     //@{
 
@@ -730,7 +728,6 @@ namespace PVR
     std::string                                    m_strAvahiType;        /*!< avahi service type */
     std::string                                    m_strAvahiIpSetting;   /*!< add-on setting name to change to the found ip address */
     std::string                                    m_strAvahiPortSetting; /*!< add-on setting name to change to the found port number */
-    bool                                           m_bNeedsConfiguration; /*!< add-on needs a user set configuration */
     std::vector<CZeroconfBrowser::ZeroconfService> m_rejectedAvahiHosts;  /*!< hosts that were rejected by the user */
 
     CCriticalSection m_critSection;