Moves song to SoundEffect

5 files changed, 11 insertions, 16 deletions

diff --git a/SuperPolarity/Content/Sound/polaritytheme.wav b/SuperPolarity/Content/Sound/polaritytheme.wav
deleted file mode 100644
index 28a6bce..0000000
--- a/SuperPolarity/Content/Sound/polaritytheme.wav
+++ /dev/null
diff --git a/SuperPolarity/Content/Sound/polaritytheme.wma b/SuperPolarity/Content/Sound/polaritytheme.wma
deleted file mode 100644
index e4ea8b8..0000000
--- a/SuperPolarity/Content/Sound/polaritytheme.wma
+++ /dev/null
diff --git a/SuperPolarity/Content/Sound/polaritytheme.xnb b/SuperPolarity/Content/Sound/polaritytheme.xnb
index d2c29f9..8d20f40 100644
--- a/SuperPolarity/Content/Sound/polaritytheme.xnb
+++ b/SuperPolarity/Content/Sound/polaritytheme.xnb
diff --git a/SuperPolarity/SuperPolarity.cs b/SuperPolarity/SuperPolarity.cs
index 12303a0..7fa387c 100644
--- a/SuperPolarity/SuperPolarity.cs
+++ b/SuperPolarity/SuperPolarity.cs
@@ -29,8 +29,8 @@ namespace SuperPolarity
 
         Screen EntryScreen;
 
-        protected Song TitleSong;
-        protected Song GameSong;
+        protected SoundEffect GameSong;
+        protected SoundEffectInstance GameSongHandle;
         protected SoundEffect GameOverSound;
 
         public SuperPolarity()
@@ -39,6 +39,11 @@ namespace SuperPolarity
             graphics = new GraphicsDeviceManager(this);
             Components.Add(new GamerServicesComponent(this));
 
+            graphics.PreferMultiSampling = true;
+            graphics.PreferredBackBufferHeight = 720;
+            graphics.PreferredBackBufferWidth = 1280;
+            //graphics.ToggleFullScreen();
+
             Content.RootDirectory = "Content";
             ActorFactory.SetGame(this);
             ParticleEffectFactory.SetGame(this);
@@ -58,11 +63,6 @@ namespace SuperPolarity
         {
             base.Initialize();
 
-            graphics.PreferMultiSampling = true;
-			graphics.PreferredBackBufferHeight = 720;
-            graphics.PreferredBackBufferWidth = 1280;
-            //graphics.ToggleFullScreen();
-
             InputController.RegisterEventForKey("fullScreenToggle", Keys.F11);
             InputController.Bind("fullScreenToggle", HandleFullScreenToggle);
 
@@ -85,7 +85,8 @@ namespace SuperPolarity
         {
 
             MediaPlayer.IsRepeating = true;
-            GameSong = Content.Load<Song>("Sound\\polaritytheme");
+            GameSong = Content.Load<SoundEffect>("Sound\\polaritytheme");
+            GameSongHandle = GameSong.CreateInstance();
             GameOverSound = Content.Load<SoundEffect>("Sound\\gameover");
 
             // Create a new SpriteBatch, which can be used to draw textures.
@@ -144,7 +145,7 @@ namespace SuperPolarity
             // temp stuff before media manager is in
             if (songName == "game")
             {
-                MediaPlayer.Play(GameSong);
+                GameSongHandle.Play();
             }
         }
 
@@ -153,7 +154,7 @@ namespace SuperPolarity
             var scoreScreen = new ScoreScreen(this);
             scoreScreen.Initialize();
 
-            MediaPlayer.Stop();
+            GameSongHandle.Stop();
             GameOverSound.Play();
             ScreenManager.Pop();
             ScreenManager.Push(scoreScreen);
diff --git a/SuperPolarity/SuperPolarity.csproj b/SuperPolarity/SuperPolarity.csproj
index b998b92..6dbd4ba 100644
--- a/SuperPolarity/SuperPolarity.csproj
+++ b/SuperPolarity/SuperPolarity.csproj
@@ -94,12 +94,6 @@
     <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\Sound\polaritytheme.wav">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Sound\polaritytheme.wma">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Icon.ico" />
     <Content Include="..\..\..\..\..\..\..\..\..\..\Program Files %28x86%29\MonoGame\v3.0\Assemblies\WindowsGL\SDL.dll">
       <Link>SDL.dll</Link>