mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Inline SoundSystem into musicclass constructor

Browse source
This commit is contained in:
Ethan Lee 2021-12-26 08:41:01 -05:00
parent c87f0e1a0c
commit 230859f8f9
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop_version/src/Music.cpp
View file

@ -50,7 +50,9 @@ SoundTrack::SoundTrack(const char* fileName)
} }
} }
SoundSystem::SoundSystem(void) /* End SDL_mixer wrapper */
musicclass::musicclass(void)
{ {
int audio_rate = 44100; int audio_rate = 44100;
Uint16 audio_format = AUDIO_S16SYS; Uint16 audio_format = AUDIO_S16SYS;
@ -62,12 +64,7 @@ SoundSystem::SoundSystem(void)
vlog_error("Unable to initialize audio: %s", Mix_GetError()); vlog_error("Unable to initialize audio: %s", Mix_GetError());
SDL_assert(0 && "Unable to initialize audio!"); SDL_assert(0 && "Unable to initialize audio!");
} }
}
/* End SDL_mixer wrapper */
musicclass::musicclass(void)
{
safeToProcessMusic= false; safeToProcessMusic= false;
m_doFadeInVol = false; m_doFadeInVol = false;
m_doFadeOutVol = false; m_doFadeOutVol = false;

7
desktop_version/src/Music.h
View file

@ -25,12 +25,6 @@ public:
/* SDL_mixer init wrapper */ /* SDL_mixer init wrapper */
class SoundSystem
{
public:
SoundSystem(void);
};
#define musicroom(rx, ry) ((rx) + ((ry) * 20)) #define musicroom(rx, ry) ((rx) + ((ry) * 20))
/* The amount of "space" for the scale of the user-set volume. */ /* The amount of "space" for the scale of the user-set volume. */
@ -73,7 +67,6 @@ public:
std::vector<SoundTrack> soundTracks; std::vector<SoundTrack> soundTracks;
std::vector<MusicTrack> musicTracks; std::vector<MusicTrack> musicTracks;
SoundSystem soundSystem;
bool safeToProcessMusic; bool safeToProcessMusic;
int nicechange; // -1 if no song queued int nicechange; // -1 if no song queued