Merge pull request #12325 from AlwinEsch/change-inputstream

[inputstream] change addon interface to new C++ style
xbmc · Jun 22, 2017 · 506419b · 506419b
2 parents 1de7be4 + 428b378
commit 506419b
Show file tree

Hide file tree

Showing 15 changed files with 940 additions and 1,328 deletions.
diff --git a/xbmc/addons/AddonBuilder.cpp b/xbmc/addons/AddonBuilder.cpp
@@ -24,7 +24,6 @@
 #include "addons/GameResource.h"
 #include "addons/ImageDecoder.h"
 #include "addons/ImageResource.h"
-#include "addons/InputStream.h"
 #include "addons/LanguageResource.h"
 #include "addons/PluginSource.h"
 #include "addons/Repository.h"
@@ -125,15 +124,14 @@ std::shared_ptr<IAddon> CAddonBuilder::Build()
     case ADDON_ADSPDLL:
     case ADDON_AUDIOENCODER:
     case ADDON_IMAGEDECODER:
+    case ADDON_INPUTSTREAM:
     case ADDON_VIZ:
     case ADDON_SCREENSAVER:
       return std::make_shared<CAddonDll>(std::move(m_addonInfo));
     case ADDON_PVRDLL:
       return std::make_shared<PVR::CPVRClient>(std::move(m_addonInfo));
     case ADDON_AUDIODECODER:
       return CAudioDecoder::FromExtension(std::move(m_addonInfo), m_extPoint);
-    case ADDON_INPUTSTREAM:
-      return CInputStream::FromExtension(std::move(m_addonInfo), m_extPoint);
     case ADDON_PERIPHERALDLL:
       return PERIPHERALS::CPeripheralAddon::FromExtension(std::move(m_addonInfo), m_extPoint);
     case ADDON_GAMEDLL:
@@ -195,6 +193,7 @@ AddonPtr CAddonBuilder::FromProps(CAddonInfo addonInfo)
     case ADDON_ADSPDLL:
     case ADDON_AUDIOENCODER:
     case ADDON_IMAGEDECODER:
+    case ADDON_INPUTSTREAM:
     case ADDON_VIZ:
     case ADDON_SCREENSAVER:
       return AddonPtr(new CAddonDll(std::move(addonInfo)));
@@ -214,8 +213,6 @@ AddonPtr CAddonBuilder::FromProps(CAddonInfo addonInfo)
       return AddonPtr(new CRepository(std::move(addonInfo)));
     case ADDON_CONTEXT_ITEM:
       return AddonPtr(new CContextMenuAddon(std::move(addonInfo)));
-    case ADDON_INPUTSTREAM:
-      return AddonPtr(new CInputStream(std::move(addonInfo)));
     case ADDON_PERIPHERALDLL:
       return AddonPtr(new PERIPHERALS::CPeripheralAddon(std::move(addonInfo), false, false)); //! @todo implement
     case ADDON_GAME_CONTROLLER:

diff --git a/xbmc/addons/BinaryAddonCache.cpp b/xbmc/addons/BinaryAddonCache.cpp
@@ -34,7 +34,6 @@ void CBinaryAddonCache::Init()
 {
   m_addonsToCache = {
     ADDON_AUDIODECODER,
-    ADDON_INPUTSTREAM,
     ADDON_PVRDLL,
     ADDON_GAMEDLL,
     ADDON_VFS,

diff --git a/xbmc/addons/CMakeLists.txt b/xbmc/addons/CMakeLists.txt
@@ -19,7 +19,6 @@ set(SOURCES Addon.cpp
             GUIWindowAddonBrowser.cpp
             ImageDecoder.cpp
             ImageResource.cpp
-            InputStream.cpp
             LanguageResource.cpp
             PluginSource.cpp
             PVRClient.cpp
@@ -58,7 +57,6 @@ set(HEADERS Addon.h
             IAddon.h
             ImageDecoder.h
             ImageResource.h
-            InputStream.h
             LanguageResource.h
             PluginSource.h
             PVRClient.h