Updates per Flibi's comments

flibitijibibo · Apr 24, 2014 · 8ff2f5f · 8ff2f5f
1 parent 6f66149
commit 8ff2f5f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 14 deletions.
diff --git a/MonoGame.Framework/Media/MediaPlayer.cs b/MonoGame.Framework/Media/MediaPlayer.cs
@@ -291,7 +291,6 @@ private static void NextSong(int direction)
 
 		private static void PlaySong(Song song)
 		{
-			song.SetEventHandler(OnSongFinishedPlaying);
 			song.Volume = IsMuted ? 0.0f : Volume;
 			song.Play();
 			State = MediaState.Playing;

diff --git a/MonoGame.Framework/SDL2/Media/Song.cs b/MonoGame.Framework/SDL2/Media/Song.cs
@@ -229,18 +229,6 @@ internal void Stop()
 
 		#region Internal Event Handler Methods
 
-		/// <summary>
-		/// Set the event handler for "Finished Playing". Done this way to prevent multiple bindings.
-		/// </summary>
-		internal void SetEventHandler(FinishedPlayingHandler handler)
-		{
-			// No-op.  We always use MediaPlayer.OnSongFinishedPlaying as handler.
-
-			/* TODO:  Remove this function, and the call in Song.cs, since we've
-			 * completely forked MediaPlayer.cs?
-			 */
-		}
-
 		internal void OnFinishedPlaying()
 		{
 			MediaPlayer.OnSongFinishedPlaying(null, null);

diff --git a/MonoGame.Framework/SDL2/Media/Video.cs b/MonoGame.Framework/SDL2/Media/Video.cs
@@ -170,7 +170,7 @@ internal static string Normalize(string FileName)
 				return FileName + ".ogg";
 			}
 
-			return null;	// File not found with supported extension.
+			return null; // File not found with supported extension.
 		}
 
 		#endregion