mirror of
https://github.com/k4zmu2a/SpaceCadetPinball.git
synced 2023-12-30 21:52:56 +00:00
Moved SDL mixer initialization out of partial restart loop.
This might help with issue #167.
This commit is contained in:
parent
8e43d06e84
commit
2162cac977
@ -7,44 +7,44 @@ int Sound::num_channels;
|
||||
bool Sound::enabled_flag = false;
|
||||
std::vector<ChannelInfo> Sound::Channels{};
|
||||
int Sound::Volume = MIX_MAX_VOLUME;
|
||||
bool Sound::MixOpen = false;
|
||||
|
||||
bool Sound::Init(int channels, bool enableFlag, int volume)
|
||||
void Sound::Init(bool mixOpen, int channels, bool enableFlag, int volume)
|
||||
{
|
||||
MixOpen = mixOpen;
|
||||
Volume = volume;
|
||||
Mix_Init(MIX_INIT_MID_Proxy);
|
||||
auto result = Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024);
|
||||
SetChannels(channels);
|
||||
Enable(enableFlag);
|
||||
return !result;
|
||||
}
|
||||
|
||||
void Sound::Enable(bool enableFlag)
|
||||
{
|
||||
enabled_flag = enableFlag;
|
||||
if (!enableFlag)
|
||||
if (MixOpen && !enableFlag)
|
||||
Mix_HaltChannel(-1);
|
||||
}
|
||||
|
||||
void Sound::Activate()
|
||||
{
|
||||
if (MixOpen)
|
||||
Mix_Resume(-1);
|
||||
}
|
||||
|
||||
void Sound::Deactivate()
|
||||
{
|
||||
if (MixOpen)
|
||||
Mix_Pause(-1);
|
||||
}
|
||||
|
||||
void Sound::Close()
|
||||
{
|
||||
Enable(false);
|
||||
Channels.clear();
|
||||
Mix_CloseAudio();
|
||||
Mix_Quit();
|
||||
}
|
||||
|
||||
void Sound::PlaySound(Mix_Chunk* wavePtr, int time, TPinballComponent* soundSource, const char* info)
|
||||
{
|
||||
if (wavePtr && enabled_flag)
|
||||
if (MixOpen && wavePtr && enabled_flag)
|
||||
{
|
||||
if (Mix_Playing(-1) == num_channels)
|
||||
{
|
||||
@ -117,6 +117,9 @@ void Sound::PlaySound(Mix_Chunk* wavePtr, int time, TPinballComponent* soundSour
|
||||
|
||||
Mix_Chunk* Sound::LoadWaveFile(const std::string& lpName)
|
||||
{
|
||||
if (!MixOpen)
|
||||
return nullptr;
|
||||
|
||||
auto wavFile = fopenu(lpName.c_str(), "r");
|
||||
if (!wavFile)
|
||||
return nullptr;
|
||||
@ -127,7 +130,7 @@ Mix_Chunk* Sound::LoadWaveFile(const std::string& lpName)
|
||||
|
||||
void Sound::FreeSound(Mix_Chunk* wave)
|
||||
{
|
||||
if (wave)
|
||||
if (MixOpen && wave)
|
||||
Mix_FreeChunk(wave);
|
||||
}
|
||||
|
||||
@ -138,6 +141,7 @@ void Sound::SetChannels(int channels)
|
||||
|
||||
num_channels = channels;
|
||||
Channels.resize(num_channels);
|
||||
if (MixOpen)
|
||||
Mix_AllocateChannels(num_channels);
|
||||
SetVolume(Volume);
|
||||
}
|
||||
@ -145,5 +149,6 @@ void Sound::SetChannels(int channels)
|
||||
void Sound::SetVolume(int volume)
|
||||
{
|
||||
Volume = volume;
|
||||
if (MixOpen)
|
||||
Mix_Volume(-1, volume);
|
||||
}
|
||||
|
@ -13,7 +13,7 @@ class Sound
|
||||
public:
|
||||
static std::vector<ChannelInfo> Channels;
|
||||
|
||||
static bool Init(int channels, bool enableFlag, int volume);
|
||||
static void Init(bool mixOpen, int channels, bool enableFlag, int volume);
|
||||
static void Enable(bool enableFlag);
|
||||
static void Activate();
|
||||
static void Deactivate();
|
||||
@ -27,4 +27,5 @@ private:
|
||||
static int num_channels;
|
||||
static bool enabled_flag;
|
||||
static int Volume;
|
||||
static bool MixOpen;
|
||||
};
|
||||
|
@ -5,7 +5,11 @@ int main(int argc, char* argv[])
|
||||
{
|
||||
std::string cmdLine;
|
||||
for (int i = 1; i < argc; i++)
|
||||
{
|
||||
if (i > 1)
|
||||
cmdLine += " ";
|
||||
cmdLine += argv[i];
|
||||
}
|
||||
|
||||
return winmain::WinMain(cmdLine.c_str());
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ std::vector<Mix_Music*> midi::LoadedTracks{};
|
||||
Mix_Music* midi::track1, * midi::track2, * midi::track3;
|
||||
MidiTracks midi::active_track, midi::NextTrack;
|
||||
int midi::Volume = MIX_MAX_VOLUME;
|
||||
bool midi::IsPlaying = false;
|
||||
bool midi::IsPlaying = false, midi::MixOpen = false;
|
||||
|
||||
constexpr uint32_t FOURCC(uint8_t a, uint8_t b, uint8_t c, uint8_t d)
|
||||
{
|
||||
@ -55,13 +55,15 @@ void midi::StopPlayback()
|
||||
{
|
||||
if (active_track != MidiTracks::None)
|
||||
{
|
||||
if (MixOpen)
|
||||
Mix_HaltMusic();
|
||||
active_track = MidiTracks::None;
|
||||
}
|
||||
}
|
||||
|
||||
int midi::music_init(int volume)
|
||||
int midi::music_init(bool mixOpen, int volume)
|
||||
{
|
||||
MixOpen = mixOpen;
|
||||
SetVolume(volume);
|
||||
active_track = MidiTracks::None;
|
||||
NextTrack = MidiTracks::None;
|
||||
@ -102,11 +104,15 @@ void midi::music_shutdown()
|
||||
void midi::SetVolume(int volume)
|
||||
{
|
||||
Volume = volume;
|
||||
if (MixOpen)
|
||||
Mix_VolumeMusic(volume);
|
||||
}
|
||||
|
||||
Mix_Music* midi::load_track(std::string fileName)
|
||||
{
|
||||
if (!MixOpen || pb::quickFlag)
|
||||
return nullptr;
|
||||
|
||||
if (pb::FullTiltMode)
|
||||
{
|
||||
// FT sounds are in SOUND subfolder
|
||||
@ -184,7 +190,7 @@ bool midi::play_track(MidiTracks track, bool replay)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (Mix_PlayMusic(midi, -1))
|
||||
if (MixOpen && Mix_PlayMusic(midi, -1))
|
||||
{
|
||||
active_track = MidiTracks::None;
|
||||
return false;
|
||||
|
@ -94,7 +94,7 @@ enum class MidiTracks
|
||||
class midi
|
||||
{
|
||||
public:
|
||||
static int music_init(int volume);
|
||||
static int music_init(bool mixOpen, int volume);
|
||||
static void music_shutdown();
|
||||
static void music_play();
|
||||
static void music_stop();
|
||||
@ -106,7 +106,7 @@ private:
|
||||
static Mix_Music* track1, * track2, * track3;
|
||||
static MidiTracks active_track, NextTrack;
|
||||
static int Volume;
|
||||
static bool IsPlaying;
|
||||
static bool IsPlaying, MixOpen;
|
||||
|
||||
static void StopPlayback();
|
||||
static Mix_Music* load_track(std::string fileName);
|
||||
|
@ -52,6 +52,7 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
||||
std::set_new_handler(memalloc_failure);
|
||||
|
||||
printf("Game version: %s\n", Version);
|
||||
printf("Command line: %s\n", lpCmdLine);
|
||||
printf("Compiled with: SDL %d.%d.%d;", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
|
||||
printf(" SDL_mixer %d.%d.%d;", SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL);
|
||||
printf(" ImGui %s\n", IMGUI_VERSION);
|
||||
@ -107,6 +108,25 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
||||
|
||||
auto prefPath = SDL_GetPrefPath("", "SpaceCadetPinball");
|
||||
auto basePath = SDL_GetBasePath();
|
||||
|
||||
// SDL mixer init
|
||||
bool mixOpened = false, noAudio = strstr(lpCmdLine, "-noaudio") != nullptr;
|
||||
if (!noAudio)
|
||||
{
|
||||
if ((Mix_Init(MIX_INIT_MID_Proxy) & MIX_INIT_MID_Proxy) == 0)
|
||||
{
|
||||
printf("Could not initialize SDL MIDI, music might not work.\nSDL Error: %s\n", SDL_GetError());
|
||||
SDL_ClearError();
|
||||
}
|
||||
if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024) != 0)
|
||||
{
|
||||
printf("Could not open audio device, continuing without audio.\nSDL Error: %s\n", SDL_GetError());
|
||||
SDL_ClearError();
|
||||
}
|
||||
else
|
||||
mixOpened = true;
|
||||
}
|
||||
|
||||
do
|
||||
{
|
||||
restart = false;
|
||||
@ -171,10 +191,11 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
||||
// Second step: run updates that depend on .DAT file selection
|
||||
options::InitSecondary();
|
||||
|
||||
if (!Sound::Init(Options.SoundChannels, Options.Sounds, Options.SoundVolume))
|
||||
Sound::Init(mixOpened, Options.SoundChannels, Options.Sounds, Options.SoundVolume);
|
||||
if (!mixOpened)
|
||||
Options.Sounds = false;
|
||||
|
||||
if (!pb::quickFlag && !midi::music_init(Options.MusicVolume))
|
||||
if (!midi::music_init(mixOpened, Options.MusicVolume))
|
||||
Options.Music = false;
|
||||
|
||||
if (pb::init())
|
||||
@ -219,8 +240,8 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
||||
|
||||
options::uninit();
|
||||
midi::music_shutdown();
|
||||
pb::uninit();
|
||||
Sound::Close();
|
||||
pb::uninit();
|
||||
|
||||
ImGuiSDL::Deinitialize();
|
||||
ImGui_ImplSDL2_Shutdown();
|
||||
@ -228,6 +249,13 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
||||
}
|
||||
while (restart);
|
||||
|
||||
if (!noAudio)
|
||||
{
|
||||
if (mixOpened)
|
||||
Mix_CloseAudio();
|
||||
Mix_Quit();
|
||||
}
|
||||
|
||||
SDL_free(basePath);
|
||||
SDL_free(prefPath);
|
||||
delete gfr_display;
|
||||
|
Loading…
Reference in New Issue
Block a user