-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9173 from FernetMenta/inputstream
Add binary addon InputStream
- Loading branch information
Showing
45 changed files
with
2,142 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <addon id="kodi.inputstream" version="1.0.0" provider-name="Team Kodi"> | ||
| <backwards-compatibility abi="1.0.0"/> | ||
| <requires> | ||
| <import addon="xbmc.core" version="0.1.0"/> | ||
| </requires> | ||
| </addon> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Ignore everything in this directory | ||
| * | ||
| # Except this file | ||
| !.gitignore | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| ARCH=@ARCH@ | ||
| INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc | ||
| DEFINES+= | ||
| CXXFLAGS=-fPIC | ||
| LIBNAME=libKODI_inputstream | ||
| OBJS=$(LIBNAME).o | ||
|
|
||
| ifeq ($(findstring osx,$(ARCH)), osx) | ||
| LIB_SHARED=../../../addons/library.kodi.inputstream/$(LIBNAME)-$(ARCH).dylib | ||
| else | ||
| LIB_SHARED=../../../addons/library.kodi.inputstream/$(LIBNAME)-$(ARCH).so | ||
| endif | ||
|
|
||
| all: $(LIB_SHARED) | ||
|
|
||
| $(LIB_SHARED): $(OBJS) | ||
| ifeq ($(findstring osx,$(ARCH)), osx) | ||
| $(CXX) $(CXXFLAGS) $(LDFLAGS) -dynamiclib -o $@ $(OBJS) | ||
| else | ||
| $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) | ||
| endif | ||
|
|
||
| CLEAN_FILES = \ | ||
| $(LIB_SHARED) \ | ||
|
|
||
| DISTCLEAN_FILES= \ | ||
| Makefile \ | ||
|
|
||
| include ../../../Makefile.include |
77 changes: 77 additions & 0 deletions
77
lib/addons/library.kodi.inputstream/libKODI_inputstream.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (C) 2012-2013 Team XBMC | ||
| * http://www.xbmc.org | ||
| * | ||
| * This Program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This Program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with XBMC; see the file COPYING. If not, write to | ||
| * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| * http://www.gnu.org/copyleft/gpl.html | ||
| * | ||
| */ | ||
|
|
||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <stdarg.h> | ||
| #include <string> | ||
| #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h" | ||
| #include "addons/AddonCallbacks.h" | ||
|
|
||
| #ifdef _WIN32 | ||
| #include <windows.h> | ||
| #define DLLEXPORT __declspec(dllexport) | ||
| #else | ||
| #define DLLEXPORT | ||
| #endif | ||
|
|
||
| using namespace std; | ||
|
|
||
| extern "C" | ||
| { | ||
|
|
||
| DLLEXPORT void* INPUTSTREAM_register_me(void *hdl) | ||
| { | ||
| CB_INPUTSTREAMLib *cb = nullptr; | ||
| if (!hdl) | ||
| fprintf(stderr, "libKODI_inputstream-ERROR: %s is called with NULL handle\n", __FUNCTION__); | ||
| else | ||
| { | ||
| cb = ((AddonCB*)hdl)->INPUTSTREAMLib_RegisterMe(((AddonCB*)hdl)->addonData); | ||
| if (!cb) | ||
| fprintf(stderr, "libKODI_inputstream--ERROR: %s can't get callback table from KODI\n", __FUNCTION__); | ||
| } | ||
| return cb; | ||
| } | ||
|
|
||
| DLLEXPORT void INPUTSTREAM_unregister_me(void *hdl, void* cb) | ||
| { | ||
| if (hdl && cb) | ||
| ((AddonCB*)hdl)->INPUTSTREAMLib_UnRegisterMe(((AddonCB*)hdl)->addonData, (CB_INPUTSTREAMLib*)cb); | ||
| } | ||
|
|
||
| DLLEXPORT DemuxPacket* INPUTSTREAM_allocate_demux_packet(void *hdl, void* cb, int iDataSize) | ||
| { | ||
| if (cb == NULL) | ||
| return NULL; | ||
|
|
||
| return ((CB_INPUTSTREAMLib*)cb)->AllocateDemuxPacket(((AddonCB*)hdl)->addonData, iDataSize); | ||
| } | ||
|
|
||
| DLLEXPORT void INPUTSTREAM_free_demux_packet(void *hdl, void* cb, DemuxPacket* pPacket) | ||
| { | ||
| if (cb == NULL) | ||
| return; | ||
|
|
||
| ((CB_INPUTSTREAMLib*)cb)->FreeDemuxPacket(((AddonCB*)hdl)->addonData, pPacket); | ||
| } | ||
|
|
||
| }; |
88 changes: 88 additions & 0 deletions
88
lib/addons/library.kodi.inputstream/project/VS2010Express/libKODI_inputstream.vcxproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|Win32"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|Win32"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="..\..\libKODI_inputstream.cpp" /> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}</ProjectGuid> | ||
| <RootNamespace>XBMC_INPUTSTREAM</RootNamespace> | ||
| <Keyword>Win32Proj</Keyword> | ||
| </PropertyGroup> | ||
| <Import Project="$(SolutionDir)\XBMC.core-defaults.props" /> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| <UseDebugLibraries>false</UseDebugLibraries> | ||
| <CharacterSet>MultiByte</CharacterSet> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| <UseDebugLibraries>true</UseDebugLibraries> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets"> | ||
| <Import Project="$(SolutionDir)\XBMC.defaults.props" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <PropertyGroup> | ||
| <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | ||
| <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\addons\library.kodi.inputstream\</OutDir> | ||
| <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> | ||
| <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\addons\library.kodi.inputstream\</OutDir> | ||
| <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> | ||
| <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\addons\library.xbmc.addon\;$(IncludePath)</IncludePath> | ||
| <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\addons\library.xbmc.addon\;$(IncludePath)</IncludePath> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <ClCompile> | ||
| <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <PreprocessorDefinitions>INPUTSTREAM_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <ExceptionHandling>Sync</ExceptionHandling> | ||
| <PrecompiledHeader> | ||
| </PrecompiledHeader> | ||
| </ClCompile> | ||
| <Link> | ||
| <OutputFile>..\..\..\..\..\addons\library.kodi.inputstream\$(ProjectName).dll</OutputFile> | ||
| </Link> | ||
| <PostBuildEvent> | ||
| <Command> | ||
| </Command> | ||
| </PostBuildEvent> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <ClCompile> | ||
| <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\VideoPlayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <PreprocessorDefinitions>HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <ExceptionHandling>Sync</ExceptionHandling> | ||
| <PrecompiledHeader> | ||
| </PrecompiledHeader> | ||
| </ClCompile> | ||
| <Link> | ||
| <OutputFile>../../../../../addons/library.kodi.inputstream/$(ProjectName).dll</OutputFile> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| </ImportGroup> | ||
| </Project> |
Oops, something went wrong.