Renamed IVideoPlayerImpl to IVideoPlayerCodec, made interface internal

kiddkaffeine · kiddkaffeine · commit 46bd4bea1e6f · 2026-01-11T18:29:29.000-05:00
diff --git a/FNA.Core.csproj b/FNA.Core.csproj
@@ -328,7 +328,7 @@
 		<Compile Include="src\Media\VideoSoundtrackType.cs" />
 		<Compile Include="src\Media\VisualizationData.cs" />
 		<Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
-		<Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
+		<Compile Include="src\Media\Xiph\IVideoPlayerCodec.cs" />
 		<Compile Include="src\Media\Xiph\Video.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayer.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
diff --git a/FNA.NetFramework.csproj b/FNA.NetFramework.csproj
@@ -329,7 +329,7 @@
 		<Compile Include="src\Media\VideoSoundtrackType.cs" />
 		<Compile Include="src\Media\VisualizationData.cs" />
 		<Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
-		<Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
+		<Compile Include="src\Media\Xiph\IVideoPlayerCodec.cs" />
 		<Compile Include="src\Media\Xiph\Video.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayer.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
diff --git a/FNA.NetStandard.csproj b/FNA.NetStandard.csproj
@@ -327,7 +327,7 @@
 		<Compile Include="src\Media\VideoSoundtrackType.cs" />
 		<Compile Include="src\Media\VisualizationData.cs" />
 		<Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
-		<Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
+		<Compile Include="src\Media\Xiph\IVideoPlayerCodec.cs" />
 		<Compile Include="src\Media\Xiph\Video.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayer.cs" />
 		<Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
diff --git a/FNA.csproj b/FNA.csproj
@@ -399,7 +399,7 @@
     <Compile Include="src\Media\VideoSoundtrackType.cs" />
     <Compile Include="src\Media\VisualizationData.cs" />
     <Compile Include="src\Media\Xiph\BaseYUVPlayer.cs" />
-    <Compile Include="src\Media\Xiph\IVideoPlayerImpl.cs" />
+    <Compile Include="src\Media\Xiph\IVideoPlayerCodec.cs" />
     <Compile Include="src\Media\Xiph\Video.cs" />
     <Compile Include="src\Media\Xiph\VideoPlayer.cs" />
     <Compile Include="src\Media\Xiph\VideoPlayerTheora.cs" />
diff --git a/Makefile b/Makefile
@@ -311,7 +311,7 @@ SRC = \
 	src/Media/SongCollection.cs \
 	src/Media/VideoSoundtrackType.cs \
 	src/Media/VisualizationData.cs \
-	src/Media/Xiph/IVideoPlayerImpl.cs \
+	src/Media/Xiph/IVideoPlayerCodec.cs \
 	src/Media/Xiph/BaseYUVPlayer.cs \
 	src/Media/Xiph/Video.cs \
 	src/Media/Xiph/VideoPlayer.cs \
diff --git a/src/Media/Xiph/IVideoPlayerCodec.cs b/src/Media/Xiph/IVideoPlayerCodec.cs
@@ -14,7 +14,7 @@
 
 namespace Microsoft.Xna.Framework.Media
 {
-	public interface IVideoPlayerImpl : IDisposable
+	internal interface IVideoPlayerCodec : IDisposable
 	{
 		#region Public Member Data: XNA VideoPlayer Implementation
 
diff --git a/src/Media/Xiph/Video.cs b/src/Media/Xiph/Video.cs
@@ -175,7 +175,7 @@ public static Video FromUriEXT(Uri uri, GraphicsDevice graphicsDevice)
 
 		internal int audioTrack = -1;
 		internal int videoTrack = -1;
-		internal IVideoPlayerImpl parent;
+		internal IVideoPlayerCodec parent;
 
 		public void SetAudioTrackEXT(int track)
 		{
diff --git a/src/Media/Xiph/VideoPlayer.cs b/src/Media/Xiph/VideoPlayer.cs
@@ -116,7 +116,7 @@ public float Volume
 
 		#region Private Member Data: Implementation
 
-		private IVideoPlayerImpl impl;
+		private IVideoPlayerCodec impl;
 
 		internal static Dictionary<string, string> codecExtensions =
 			new Dictionary<string, string>
@@ -130,8 +130,8 @@ public float Volume
 				{ "Theora", VideoPlayerTheora.ReadInfo }
 			};
 
-		internal static Dictionary<string, Func<IVideoPlayerImpl>> codecPlayers =
-			new Dictionary<string, Func<IVideoPlayerImpl>>
+		internal static Dictionary<string, Func<IVideoPlayerCodec>> codecPlayers =
+			new Dictionary<string, Func<IVideoPlayerCodec>>
 			{
 				{ "Theora", () => new VideoPlayerTheora() },
 			};
@@ -250,16 +250,9 @@ public void SetVideoTrackEXT(int track)
 			}
 		}
 
-		public static void AddCodecEXT(string codecName, List<String> extensions, Func<string, VideoInfo> reader,
-			Func<IVideoPlayerImpl> implementation)
-		{
-			foreach (String extension in extensions)
-			{
-				codecExtensions.Add(extension.ToLower(), codecName);
-			}
-			codecInfoReaders.Add(codecName, reader);
-			codecPlayers.Add(codecName, implementation);
-		}
+		#endregion
+
+		#region Structs for Internal Use
 
 		public struct VideoInfo
 		{
diff --git a/src/Media/Xiph/VideoPlayerTheora.cs b/src/Media/Xiph/VideoPlayerTheora.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.Xna.Framework.Media
 {
-	public sealed class VideoPlayerTheora : IVideoPlayerImpl, IDisposable
+	public sealed class VideoPlayerTheora : IVideoPlayerCodec, IDisposable
 	{
 		#region Hardware-accelerated YUV -> RGBA
 
@@ -937,7 +937,6 @@ private void InitializeTheoraStream()
 
 		#endregion
 
-
 		#region Video support methods
 
 		internal static VideoPlayer.VideoInfo ReadInfo(string fileName)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace Microsoft.Xna.Framework.Media`
`16`	`16`	`{`
`17`		`- public interface IVideoPlayerImpl : IDisposable`
	`17`	`+ internal interface IVideoPlayerCodec : IDisposable`
`18`	`18`	`{`
`19`	`19`	`#region Public Member Data: XNA VideoPlayer Implementation`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public static Video FromUriEXT(Uri uri, GraphicsDevice graphicsDevice)`
`175`	`175`
`176`	`176`	`internal int audioTrack = -1;`
`177`	`177`	`internal int videoTrack = -1;`
`178`		`- internal IVideoPlayerImpl parent;`
	`178`	`+ internal IVideoPlayerCodec parent;`
`179`	`179`
`180`	`180`	`public void SetAudioTrackEXT(int track)`
`181`	`181`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`namespace Microsoft.Xna.Framework.Media`
`20`	`20`	`{`
`21`		`- public sealed class VideoPlayerTheora : IVideoPlayerImpl, IDisposable`
	`21`	`+ public sealed class VideoPlayerTheora : IVideoPlayerCodec, IDisposable`
`22`	`22`	`{`
`23`	`23`	`#region Hardware-accelerated YUV -> RGBA`
`24`	`24`
`@@ -937,7 +937,6 @@ private void InitializeTheoraStream()`
`937`	`937`
`938`	`938`	`#endregion`
`939`	`939`
`940`		`-`
`941`	`940`	`#region Video support methods`
`942`	`941`
`943`	`942`	`internal static VideoPlayer.VideoInfo ReadInfo(string fileName)`