Commit e42a5754 authored by Martin Finkel's avatar Martin Finkel

renaming to avoid namespace conflict with LibVLCSharp.Forms.MediaElement

# Conflicts:
#	samples/Forms/LibVLCSharp.Forms.MediaElement/LibVLCSharp.Forms.Sample.MediaElement.Android/Assets/PlaybackControlsIcons.ttf
parent 5345c348
......@@ -7,8 +7,8 @@
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
<OutputType>Library</OutputType>
<RootNamespace>LibVLCSharp.Forms.MediaPlayerElement.Sample.Android</RootNamespace>
<AssemblyName>LibVLCSharp.Forms.MediaPlayerElement.Sample.Android</AssemblyName>
<RootNamespace>LibVLCSharp.Forms.Sample.MediaPlayerElement.Android</RootNamespace>
<AssemblyName>LibVLCSharp.Forms.Sample.MediaPlayerElement.Android</AssemblyName>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
......@@ -36,6 +36,7 @@
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
<EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......@@ -109,9 +110,9 @@
<Project>{06814458-c8b4-4d50-86e2-904e6a9e3499}</Project>
<Name>LibVLCSharp.Forms</Name>
</ProjectReference>
<ProjectReference Include="..\LibVLCSharp.Forms.MediaElement.Sample\LibVLCSharp.Forms.MediaElement.Sample.csproj">
<ProjectReference Include="..\LibVLCSharp.Forms.Sample.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.csproj">
<Project>{537a70a3-6565-41e2-8c65-5198e0f4eb45}</Project>
<Name>LibVLCSharp.Forms.MediaElement.Sample</Name>
<Name>LibVLCSharp.Forms.Sample.MediaElement</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
......
......@@ -4,7 +4,7 @@ using Android.OS;
using LibVLCSharp.Forms.Platforms.Android;
using LibVLCSharp.Forms.Sample.MediaPlayerElement;
namespace LibVLCSharp.Forms.MediaPlayerElement.Sample.Android
namespace LibVLCSharp.Forms.Sample.MediaPlayerElement.Android
{
/// <summary>
/// Represents the main activity.
......
......@@ -2,5 +2,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application android:label="LibVLCSharp.Forms.MediaPlayerElement.Sample.Android"></application>
<application android:label="LibVLCSharp.Forms.Sample.MediaPlayerElement.Android"></application>
</manifest>
\ No newline at end of file
......@@ -3,7 +3,7 @@ using LibVLCSharp.Forms.Sample.MediaPlayerElement;
using LibVLCSharp.Forms.Shared;
using UIKit;
namespace LibVLCSharp.Forms.MediaElement.Sample.iOS
namespace LibVLCSharp.Forms.Sample.MediaElement.iOS
{
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
......
......@@ -23,7 +23,7 @@
<key>MinimumOSVersion</key>
<string>11.3</string>
<key>CFBundleDisplayName</key>
<string>LibVLCSharp.Forms.MediaElement.Sample</string>
<string>LibVLCSharp.Forms.Sample.MediaElement</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.LibVLCSharp.Forms.MediaElement.Sample</string>
<key>CFBundleVersion</key>
......
......@@ -136,9 +136,9 @@
<Project>{06814458-c8b4-4d50-86e2-904e6a9e3499}</Project>
<Name>LibVLCSharp.Forms</Name>
</ProjectReference>
<ProjectReference Include="..\LibVLCSharp.Forms.MediaElement.Sample\LibVLCSharp.Forms.MediaElement.Sample.csproj">
<ProjectReference Include="..\LibVLCSharp.Forms.Sample.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.csproj">
<Project>{537a70a3-6565-41e2-8c65-5198e0f4eb45}</Project>
<Name>LibVLCSharp.Forms.MediaElement.Sample</Name>
<Name>LibVLCSharp.Forms.Sample.MediaElement</Name>
</ProjectReference>
</ItemGroup>
</Project>
\ No newline at end of file
using UIKit;
namespace LibVLCSharp.Forms.MediaElement.Sample.iOS
namespace LibVLCSharp.Forms.Sample.MediaElement.iOS
{
public class Application
{
......
......@@ -3,8 +3,8 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>latest</LangVersion>
<RootNamespace>LibVLCSharp.Forms.MediaPlayerElement.Sample</RootNamespace>
<AssemblyName>LibVLCSharp.Forms.MediaPlayerElement.Sample</AssemblyName>
<RootNamespace>LibVLCSharp.Forms.Sample.MediaPlayerElement</RootNamespace>
<AssemblyName>LibVLCSharp.Forms.Sample.MediaPlayerElement</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
......
......@@ -45,11 +45,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibVLCSharp.GTK", "LibVLCSh
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaElement", "MediaElement", "{5E512888-485B-438A-AA4A-1B1EF50FD49F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibVLCSharp.Forms.MediaElement.Sample", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.MediaElement.Sample\LibVLCSharp.Forms.MediaElement.Sample.csproj", "{537A70A3-6565-41E2-8C65-5198E0F4EB45}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibVLCSharp.Forms.MediaElement.Sample", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.Sample.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.csproj", "{537A70A3-6565-41E2-8C65-5198E0F4EB45}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.MediaElement.Sample.Android", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.MediaElement.Sample.Android\LibVLCSharp.Forms.MediaElement.Sample.Android.csproj", "{315BB606-A490-4CFB-8DFC-313563C330AE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.MediaElement.Sample.Android", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.Android\LibVLCSharp.Forms.Sample.MediaElement.Android.csproj", "{315BB606-A490-4CFB-8DFC-313563C330AE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.MediaElement.Sample.iOS", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.MediaElement.Sample.iOS\LibVLCSharp.Forms.MediaElement.Sample.iOS.csproj", "{6C9DE381-A32F-41CB-BCDA-551BE90B5A60}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.MediaElement.Sample.iOS", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.iOS\LibVLCSharp.Forms.Sample.MediaElement.iOS.csproj", "{6C9DE381-A32F-41CB-BCDA-551BE90B5A60}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibVLCSharp.Uno", "LibVLCSharp.Uno\LibVLCSharp.Uno.csproj", "{82AB6F00-B0CC-4B88-8D09-CD95789E6C38}"
EndProject
......
......@@ -67,11 +67,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.UWP.Sample", ".
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaElement", "MediaElement", "{5E512888-485B-438A-AA4A-1B1EF50FD49F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibVLCSharp.Forms.MediaElement.Sample", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.MediaElement.Sample\LibVLCSharp.Forms.MediaElement.Sample.csproj", "{537A70A3-6565-41E2-8C65-5198E0F4EB45}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibVLCSharp.Forms.Sample.MediaElement", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.Sample.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.csproj", "{537A70A3-6565-41E2-8C65-5198E0F4EB45}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.MediaElement.Sample.Android", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.MediaElement.Sample.Android\LibVLCSharp.Forms.MediaElement.Sample.Android.csproj", "{315BB606-A490-4CFB-8DFC-313563C330AE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.Sample.MediaElement.Android", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.Android\LibVLCSharp.Forms.Sample.MediaElement.Android.csproj", "{315BB606-A490-4CFB-8DFC-313563C330AE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.MediaElement.Sample.iOS", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.MediaElement.Sample.iOS\LibVLCSharp.Forms.MediaElement.Sample.iOS.csproj", "{6C9DE381-A32F-41CB-BCDA-551BE90B5A60}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.Sample.MediaElement.iOS", "..\samples\Forms\LibVLCSharp.Forms.MediaElement\LibVLCSharp.Forms.Sample.MediaElement.iOS\LibVLCSharp.Forms.Sample.MediaElement.iOS.csproj", "{6C9DE381-A32F-41CB-BCDA-551BE90B5A60}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibVLCSharp.Uno", "LibVLCSharp.Uno\LibVLCSharp.Uno.csproj", "{82AB6F00-B0CC-4B88-8D09-CD95789E6C38}"
EndProject
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment