Removed media classes.

PixelVision8 · May 21, 2020 · 0718791 · 0718791
1 parent 4c78655
commit 0718791
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/MonoGame/MonoGame.Framework/MonoGame.Framework.DesktopGL.csproj b/MonoGame/MonoGame.Framework/MonoGame.Framework.DesktopGL.csproj
@@ -24,17 +24,23 @@ This package provides you with MonoGame Framework that uses OpenGL for rendering
   <ItemGroup>
     <Compile Remove="bin\**\*" />
     <Compile Remove="Content\**" />
+    <Compile Remove="Media\**" />
     <Compile Remove="obj\**\*" />
     <Compile Remove="Platform\**\*" />
+    <Compile Remove="Platform\Media\**" />
     <Compile Remove="Properties\**\*" />
     <Compile Remove="Utilities\LzxStream\**" />
     <EmbeddedResource Remove="Content\**" />
+    <EmbeddedResource Remove="Media\**" />
+    <EmbeddedResource Remove="Platform\Media\**" />
     <EmbeddedResource Remove="Utilities\LzxStream\**" />
   </ItemGroup>
 
   <ItemGroup>
     <None Remove="Content\**" />
+    <None Remove="Media\**" />
     <None Remove="Platform\**\*" />
+    <None Remove="Platform\Media\**" />
     <None Remove="Utilities\LzxStream\**" />
   </ItemGroup>
 
@@ -57,8 +63,6 @@ This package provides you with MonoGame Framework that uses OpenGL for rendering
     <Compile Remove="IGameComponent.cs" />
     <Compile Remove="IPlatformBackButton.cs" />
     <Compile Remove="IUpdateable.cs" />
-    <Compile Remove="Media\Video.cs" />
-    <Compile Remove="Media\VideoPlayer.cs" />
     <Compile Remove="Input\MessageBox.cs" />
     <Compile Remove="Input\KeyboardInput.cs" />
     <Compile Remove="Plane.cs" />
@@ -70,7 +74,6 @@ This package provides you with MonoGame Framework that uses OpenGL for rendering
 
   <ItemGroup>
     <Compile Include="Platform\TitleContainer.Desktop.cs" />
-    <Compile Include="Platform\Audio\OggStream.cs" />
     <Compile Include="Platform\Graphics\OpenGL.Common.cs" />
     <Compile Include="Platform\Graphics\Texture2D.StbSharp.cs" />    
     <Compile Include="Platform\SDL\SDL2.cs" />
@@ -81,9 +84,6 @@ This package provides you with MonoGame Framework that uses OpenGL for rendering
     <Compile Include="Platform\Utilities\FuncLoader.Desktop.cs" />
     <Compile Include="Platform\Utilities\InteropHelpers.cs" />
     <Compile Include="Platform\Utilities\ReflectionHelpers.Default.cs" />
-    <Compile Include="Platform\Media\MediaLibrary.Default.cs" />
-    <Compile Include="Platform\Media\MediaPlayer.Default.cs" />
-    <Compile Include="Platform\Media\Song.NVorbis.cs" />
     <Compile Include="Platform\Input\GamePad.SDL.cs" />
     <Compile Include="Platform\Input\InputKeyEventArgs.cs" />
     <Compile Include="Platform\Input\Joystick.SDL.cs" />
@@ -101,9 +101,6 @@ This package provides you with MonoGame Framework that uses OpenGL for rendering
 
     <Compile Include="..\ThirdParty\StbImageSharp\src\StbImageSharp\**\*.cs" LinkBase="Utilities\StbImageSharp" />
     <Compile Include="..\ThirdParty\StbImageWriteSharp\src\StbImageWriteSharp\**\*.cs" LinkBase="Utilities\StbImageWriteSharp" />
-
-    <Compile Include="..\ThirdParty\NVorbis\NVorbis\**\*.cs" LinkBase="ThirdParty\NVorbis" />
-    <Compile Remove="..\ThirdParty\NVorbis\NVorbis\Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MonoGame/MonoGame.Framework/Platform/Audio/OpenALSoundController.cs b/MonoGame/MonoGame.Framework/Platform/Audio/OpenALSoundController.cs
@@ -92,8 +92,8 @@ internal sealed class OpenALSoundController : IDisposable
         private const int DEFAULT_FREQUENCY = 48000;
         private const int DEFAULT_UPDATE_SIZE = 512;
         private const int DEFAULT_UPDATE_BUFFER_COUNT = 2;
-#elif DESKTOPGL
-        private static OggStreamer _oggstreamer;
+// #elif DESKTOPGL
+//         private static OggStreamer _oggstreamer;
 #endif
         private List<int> availableSourcesCollection;
         private List<int> inUseSourcesCollection;
@@ -266,9 +266,9 @@ private bool OpenSoundController()
 #endif
 
                 _context = Alc.CreateContext(_device, attribute);
-#if DESKTOPGL
-                _oggstreamer = new OggStreamer();
-#endif
+// #if DESKTOPGL
+//                 _oggstreamer = new OggStreamer();
+// #endif
 
                 AlcHelper.CheckError("Could not create OpenAL context");
 
@@ -382,10 +382,10 @@ void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-#if DESKTOPGL
-                    if(_oggstreamer != null)
-                        _oggstreamer.Dispose();
-#endif
+// #if DESKTOPGL
+//                     if(_oggstreamer != null)
+//                         _oggstreamer.Dispose();
+// #endif
                     for (int i = 0; i < allSourcesArray.Length; i++)
                     {
                         AL.DeleteSource(allSourcesArray[i]);