From 81aa02e29b3b0992b0b5f12b13f4b0c8fe088df3 Mon Sep 17 00:00:00 2001
From: Ethan Lee <flibitijibibo@gmail.com>
Date: Sun, 26 Dec 2021 08:57:38 -0500
Subject: [PATCH] SDL_mixer is now entirely contained in Music.cpp.

This meant making the track vectors static, but that's kind of what we do with musicclass anyway?

In any case, this will make the transition to FAudio MUCH less invasive.
---
 desktop_version/src/Music.cpp | 21 +++++++++++++++++++++
 desktop_version/src/Music.h   | 24 ------------------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index 7c031b49..6e32fcbe 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -15,6 +15,24 @@
 
 /* Begin SDL_mixer wrapper */
 
+#include <SDL_mixer.h>
+#include <vector>
+
+class MusicTrack
+{
+public:
+    MusicTrack(SDL_RWops *rw);
+    Mix_Music *m_music;
+    bool m_isValid;
+};
+
+class SoundTrack
+{
+public:
+    SoundTrack(const char* fileName);
+    Mix_Chunk *sound;
+};
+
 MusicTrack::MusicTrack(SDL_RWops *rw)
 {
     m_music = Mix_LoadMUS_RW(rw, 1);
@@ -50,6 +68,9 @@ SoundTrack::SoundTrack(const char* fileName)
     }
 }
 
+static std::vector<MusicTrack> musicTracks;
+static std::vector<SoundTrack> soundTracks;
+
 /* End SDL_mixer wrapper */
 
 musicclass::musicclass(void)
diff --git a/desktop_version/src/Music.h b/desktop_version/src/Music.h
index 65859416..ce2aed30 100644
--- a/desktop_version/src/Music.h
+++ b/desktop_version/src/Music.h
@@ -1,29 +1,7 @@
 #ifndef MUSIC_H
 #define MUSIC_H
 
-#include <vector>
-
 #include "BinaryBlob.h"
-#include <SDL_mixer.h>
-
-/* SDL_mixer object wrappers, do NOT reference these!!! */
-
-class MusicTrack
-{
-public:
-    MusicTrack(SDL_RWops *rw);
-    Mix_Music *m_music;
-    bool m_isValid;
-};
-
-class SoundTrack
-{
-public:
-    SoundTrack(const char* fileName);
-    Mix_Chunk *sound;
-};
-
-/* End SDL_mixer object wrappers */
 
 #define musicroom(rx, ry) ((rx) + ((ry) * 20))
 
@@ -66,8 +44,6 @@ public:
     bool halted(void);
     void updatemutestate(void);
 
-    std::vector<SoundTrack> soundTracks;
-    std::vector<MusicTrack> musicTracks;
     bool safeToProcessMusic;
 
     int nicechange; // -1 if no song queued