Skip to content

Commit

Permalink
Merge pull request #55 from SALT-AND-PEPPER/feature/repair_demo
Browse files Browse the repository at this point in the history 
Repair the demo
  • Loading branch information
@martijn00
martijn00 authored Sep 13, 2017
2 parents a5518af + 545565b commit 658ca78
Show file tree
Hide file tree
Showing 39 changed files with 2,740 additions and 2,831 deletions.
3 changes: 2 additions & 1 deletion ExoPlayer.Ext.Ima/Transforms/Metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-->
</metadata>
<remove-node path="/api/package[@name='com.google.android.exoplayer2.ext.ima']/interface[@name='ImaAdsLoader.EventListener']" />
</metadata>
2 changes: 2 additions & 0 deletions ExoPlayer.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{05CAE29B-694A-4AA9-AC07-F6F2F6B1C857}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05CAE29B-694A-4AA9-AC07-F6F2F6B1C857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05CAE29B-694A-4AA9-AC07-F6F2F6B1C857}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B871C50-6D5D-45D0-B32D-84E25ADB869A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B871C50-6D5D-45D0-B32D-84E25ADB869A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B871C50-6D5D-45D0-B32D-84E25ADB869A}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
180 changes: 90 additions & 90 deletions ExoPlayer/ExoPlayer.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{0B871C50-6D5D-45D0-B32D-84E25ADB869A}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>ExoPlayer</RootNamespace>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AssemblyName>ExoPlayer</AssemblyName>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<ReleaseVersion>2.5.1</ReleaseVersion>
<AndroidTlsProvider>
</AndroidTlsProvider>
<AndroidClassParser>class-parse</AndroidClassParser>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<ConsolePause>false</ConsolePause>
<AndroidClassParser>class-parse</AndroidClassParser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
</ItemGroup>
<ItemGroup>
<Compile Include="Additions\IExoMediaDrmOnEventListener.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\EnumFields.xml">
<SubType>Designer</SubType>
</TransformFile>
<TransformFile Include="Transforms\EnumMethods.xml" />
<TransformFile Include="Transforms\Metadata.xml">
<SubType>Designer</SubType>
</TransformFile>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="Jars\" />
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="Jars\exoplayer-r2.5.1.aar" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">
<Project>{3CFF9208-5DAB-4377-B7E5-F4407FF5BD46}</Project>
<Name>ExoPlayer.Core</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.Dash\ExoPlayer.Dash.csproj">
<Project>{ED6BE01E-8554-4BFA-8925-D39AFAF789F9}</Project>
<Name>ExoPlayer.Dash</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.Hls\ExoPlayer.Hls.csproj">
<Project>{C8A41AD7-09D3-44B3-975E-D8AA58965C6C}</Project>
<Name>ExoPlayer.Hls</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.SmoothStreaming\ExoPlayer.SmoothStreaming.csproj">
<Project>{632D0085-1F2B-42EC-B4FC-D32A11E8A669}</Project>
<Name>ExoPlayer.SmoothStreaming</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.UI\ExoPlayer.UI.csproj">
<Project>{F9E526F9-5985-478F-BA44-35D82D00DD33}</Project>
<Name>ExoPlayer.UI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{0B871C50-6D5D-45D0-B32D-84E25ADB869A}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>ExoPlayer</RootNamespace>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AssemblyName>ExoPlayer</AssemblyName>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<ReleaseVersion>2.5.1</ReleaseVersion>
<AndroidTlsProvider>
</AndroidTlsProvider>
<AndroidClassParser>class-parse</AndroidClassParser>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<ConsolePause>false</ConsolePause>
<AndroidClassParser>class-parse</AndroidClassParser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
</ItemGroup>
<ItemGroup>
<Compile Include="Additions\IExoMediaDrmOnEventListener.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\EnumFields.xml">
<SubType>Designer</SubType>
</TransformFile>
<TransformFile Include="Transforms\EnumMethods.xml" />
<TransformFile Include="Transforms\Metadata.xml">
<SubType>Designer</SubType>
</TransformFile>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="Jars\" />
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="Jars\exoplayer-r2.5.1.aar" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">
<Project>{3CFF9208-5DAB-4377-B7E5-F4407FF5BD46}</Project>
<Name>ExoPlayer.Core</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.Dash\ExoPlayer.Dash.csproj">
<Project>{ED6BE01E-8554-4BFA-8925-D39AFAF789F9}</Project>
<Name>ExoPlayer.Dash</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.Hls\ExoPlayer.Hls.csproj">
<Project>{C8A41AD7-09D3-44B3-975E-D8AA58965C6C}</Project>
<Name>ExoPlayer.Hls</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.SmoothStreaming\ExoPlayer.SmoothStreaming.csproj">
<Project>{632D0085-1F2B-42EC-B4FC-D32A11E8A669}</Project>
<Name>ExoPlayer.SmoothStreaming</Name>
</ProjectReference>
<ProjectReference Include="..\ExoPlayer.UI\ExoPlayer.UI.csproj">
<Project>{F9E526F9-5985-478F-BA44-35D82D00DD33}</Project>
<Name>ExoPlayer.UI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
</Project>
Loading

0 comments on commit 658ca78

Please sign in to comment.