Skip to content

Commit 5ab3cc4

Browse files
committed
Former-commit-id: 5070761
1 parent ba381ee commit 5ab3cc4

5 files changed

Lines changed: 13 additions & 8 deletions

File tree

MediaRouter.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ Global
3131
{2855EFF4-F528-4380-BB3E-EB753293218E}.Debug|x64.Build.0 = Debug|x64
3232
{2855EFF4-F528-4380-BB3E-EB753293218E}.Debug|x86.ActiveCfg = Debug|x86
3333
{2855EFF4-F528-4380-BB3E-EB753293218E}.Debug|x86.Build.0 = Debug|x86
34-
{2855EFF4-F528-4380-BB3E-EB753293218E}.Release|Any CPU.ActiveCfg = Release|x86
34+
{2855EFF4-F528-4380-BB3E-EB753293218E}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{2855EFF4-F528-4380-BB3E-EB753293218E}.Release|Any CPU.Build.0 = Release|Any CPU
3536
{2855EFF4-F528-4380-BB3E-EB753293218E}.Release|x64.ActiveCfg = Release|x64
37+
{2855EFF4-F528-4380-BB3E-EB753293218E}.Release|x64.Build.0 = Release|x64
3638
{2855EFF4-F528-4380-BB3E-EB753293218E}.Release|x86.ActiveCfg = Release|x86
3739
{2855EFF4-F528-4380-BB3E-EB753293218E}.Release|x86.Build.0 = Release|x86
3840
{ECCBD1D8-001E-4E60-9494-8EF7892F1D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

MediaRouter/MediaRouter.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<ItemGroup>
8080
<Reference Include="FFmpeg.AutoGen">
8181
<HintPath>Libraries\Codecs\FFmpeg\FFmpeg.AutoGen.dll</HintPath>
82+
<Private>False</Private>
8283
</Reference>
8384
<Reference Include="System" />
8485
<Reference Include="System.Core" />
@@ -131,7 +132,9 @@ echo "x86 -------------"
131132
if $(PlatformName) == x64 (
132133
echo "x64 -------------"
133134
xcopy $(ProjectDir)Libraries\Codecs\FFmpeg\x64\* $(TargetDir)\Codecs\FFmpeg\x64\ /E /Y
134-
)</PostBuildEvent>
135+
)
136+
137+
xcopy $(ProjectDir)Libraries\Codecs\FFmpeg\* $(TargetDir)\Codecs\FFmpeg\ /Y</PostBuildEvent>
135138
</PropertyGroup>
136139
<PropertyGroup>
137140
<PreBuildEvent>del /S /F /Q "$(TargetDir)"</PreBuildEvent>

UI Example/UI Example.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PlatformTarget>x86</PlatformTarget>
3131
<DebugType>pdbonly</DebugType>
3232
<Optimize>true</Optimize>
33-
<OutputPath>bin\$(MonoGamePlatform)\$(Platform)\$(Configuration)\</OutputPath>
33+
<OutputPath>bin\Release\x86\</OutputPath>
3434
<DefineConstants>TRACE;WINDOWS</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
@@ -51,7 +51,7 @@
5151
<Prefer32Bit>true</Prefer32Bit>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
54-
<OutputPath>bin\x64\Release\</OutputPath>
54+
<OutputPath>bin\Release\x64\</OutputPath>
5555
<DefineConstants>TRACE;WINDOWS</DefineConstants>
5656
<Optimize>true</Optimize>
5757
<DebugType>pdbonly</DebugType>
@@ -73,7 +73,7 @@
7373
<Prefer32Bit>false</Prefer32Bit>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
76-
<OutputPath>bin\Release\</OutputPath>
76+
<OutputPath>bin\Release\anycpu\</OutputPath>
7777
<DefineConstants>TRACE;WINDOWS</DefineConstants>
7878
<Optimize>true</Optimize>
7979
<DebugType>pdbonly</DebugType>
@@ -153,7 +153,7 @@
153153
<Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
154154
<PropertyGroup>
155155
<PostBuildEvent>xcopy "$(ProjectDir)"Libraries\* "$(TargetDir)" /E /Y
156-
xcopy "$(SolutionDir)"\MediaRouter\bin\Debug\$(PlatformName)\* "$(TargetDir)" /E /Y
156+
xcopy "$(SolutionDir)"\MediaRouter\bin\$(ConfigurationName)\$(PlatformName)\* "$(TargetDir)" /E /Y
157157
del "$(TargetDir)"*.pdb</PostBuildEvent>
158158
</PropertyGroup>
159159
<PropertyGroup>

UI Example/UserInterface.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class UserInterface
6666
const int RESIZE_CURSOR_DISTANCE = 6;
6767
const int IDLE_TIME_MS = 7000; // Hide Cursor / Clock etc..
6868
const int INFO_TIME_MS = 2000; // Show Audio/Subs/Volume Adjustments Info
69-
const int NAUDIO_DELAY_MS = -330; // Probably waits to fill it's buffer?
69+
const int NAUDIO_DELAY_MS = -330; // Probably waits to fill it's buffer? had to use this for sync https://www.youtube.com/watch?v=ucZl6vQ_8Uo
7070

7171
System.Drawing.Color TRANSPARENCY_KEY_COLOR = System.Drawing.Color.FromArgb(1,1,1); // Form Control Transparency
7272

UI Example/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<probing privatePath="Codecs;Codecs\FFmpeg\x64;Monogame;Other"/>
5+
<probing privatePath="Codecs\FFmpeg;Monogame;Other"/>
66
</assemblyBinding>
77
</runtime>
88
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>

0 commit comments

Comments
 (0)