Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[inputstream] change addon interface to new C++ style #12325

Merged
merged 1 commit into from
Jun 22, 2017
Merged

[inputstream] change addon interface to new C++ style #12325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions xbmc/addons/AddonBuilder.cpp
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)));
Expand All @@ -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:
Expand Down
1 change: 0 additions & 1 deletion xbmc/addons/BinaryAddonCache.cpp
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@ void CBinaryAddonCache::Init()
{
m_addonsToCache = {
ADDON_AUDIODECODER,
ADDON_INPUTSTREAM,
ADDON_PVRDLL,
ADDON_GAMEDLL,
ADDON_VFS,
Expand Down
2 changes: 0 additions & 2 deletions xbmc/addons/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@ set(SOURCES Addon.cpp
GUIWindowAddonBrowser.cpp
ImageDecoder.cpp
ImageResource.cpp
InputStream.cpp
LanguageResource.cpp
PluginSource.cpp
PVRClient.cpp
Expand Down Expand Up @@ -58,7 +57,6 @@ set(HEADERS Addon.h
IAddon.h
ImageDecoder.h
ImageResource.h
InputStream.h
LanguageResource.h
PluginSource.h
PVRClient.h
Expand Down