diff options
| author | Markus Pfau <pfau@peak3d.de> | 2017-08-18 20:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-18 20:47:49 +0200 |
| commit | e6b0c83ddc28282d858796bc474b0d4ea1c8c52c (patch) | |
| tree | 4ea5fe6d87612e0ae6d4269a865ab0cf24c6e689 | |
| parent | 4c43b6a414458648b24a960ae35448388f131570 (diff) | |
| parent | d144fb0ec011cb8f771af4c85a447ff8cc609700 (diff) | |
Merge pull request #12690 from peak3d/impaired
Add EFlags to inputstream API interface
3 files changed, 20 insertions, 4 deletions
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h index 36d5c5ea4a..8db17c0fb1 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h @@ -109,11 +109,26 @@ extern "C" { TYPE_TELETEXT } m_streamType; - enum Codec_FEATURES + enum Codec_FEATURES : uint32_t { FEATURE_DECODE = 1 }; - unsigned int m_features; + uint32_t m_features; + + enum STREAM_FLAGS : uint32_t + { + FLAG_NONE = 0x0000, + FLAG_DEFAULT = 0x0001, + FLAG_DUB = 0x0002, + FLAG_ORIGINAL = 0x0004, + FLAG_COMMENT = 0x0008, + FLAG_LYRICS = 0x0010, + FLAG_KARAOKE = 0x0020, + FLAG_FORCED = 0x0040, + FLAG_HEARING_IMPAIRED = 0x0080, + FLAG_VISUAL_IMPAIRED = 0x0100 + }; + uint32_t m_flags; char m_codecName[32]; /*!< @brief (required) name of codec according to ffmpeg */ char m_codecInternalName[32]; /*!< @brief (optional) internal name of codec (selectionstream info) */ diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h index a35093eadd..c99e6b7782 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h @@ -102,8 +102,8 @@ #define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID "kodi.binary.instance.imagedecoder" #define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS "addon-instance/ImageDecoder.h" -#define ADDON_INSTANCE_VERSION_INPUTSTREAM "2.0.3" -#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN "2.0.3" +#define ADDON_INSTANCE_VERSION_INPUTSTREAM "2.0.4" +#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN "2.0.4" #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID "kodi.binary.instance.inputstream" #define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS "addon-instance/Inputstream.h" diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp index 545ed4b426..23616b5d91 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp @@ -371,6 +371,7 @@ CDemuxStream* CInputStreamAddon::GetStream(int streamId) const { demuxStream->ExtraData = new uint8_t[stream.m_ExtraSize]; demuxStream->ExtraSize = stream.m_ExtraSize; + demuxStream->flags = static_cast<CDemuxStream::EFlags>(stream.m_flags); for (unsigned int j = 0; j < stream.m_ExtraSize; ++j) demuxStream->ExtraData[j] = stream.m_ExtraData[j]; } |