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;
|
bool Sound::enabled_flag = false;
|
||||||
std::vector<ChannelInfo> Sound::Channels{};
|
std::vector<ChannelInfo> Sound::Channels{};
|
||||||
int Sound::Volume = MIX_MAX_VOLUME;
|
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;
|
Volume = volume;
|
||||||
Mix_Init(MIX_INIT_MID_Proxy);
|
|
||||||
auto result = Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024);
|
|
||||||
SetChannels(channels);
|
SetChannels(channels);
|
||||||
Enable(enableFlag);
|
Enable(enableFlag);
|
||||||
return !result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::Enable(bool enableFlag)
|
void Sound::Enable(bool enableFlag)
|
||||||
{
|
{
|
||||||
enabled_flag = enableFlag;
|
enabled_flag = enableFlag;
|
||||||
if (!enableFlag)
|
if (MixOpen && !enableFlag)
|
||||||
Mix_HaltChannel(-1);
|
Mix_HaltChannel(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::Activate()
|
void Sound::Activate()
|
||||||
{
|
{
|
||||||
Mix_Resume(-1);
|
if (MixOpen)
|
||||||
|
Mix_Resume(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::Deactivate()
|
void Sound::Deactivate()
|
||||||
{
|
{
|
||||||
Mix_Pause(-1);
|
if (MixOpen)
|
||||||
|
Mix_Pause(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::Close()
|
void Sound::Close()
|
||||||
{
|
{
|
||||||
|
Enable(false);
|
||||||
Channels.clear();
|
Channels.clear();
|
||||||
Mix_CloseAudio();
|
|
||||||
Mix_Quit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::PlaySound(Mix_Chunk* wavePtr, int time, TPinballComponent* soundSource, const char* info)
|
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)
|
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)
|
Mix_Chunk* Sound::LoadWaveFile(const std::string& lpName)
|
||||||
{
|
{
|
||||||
|
if (!MixOpen)
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
auto wavFile = fopenu(lpName.c_str(), "r");
|
auto wavFile = fopenu(lpName.c_str(), "r");
|
||||||
if (!wavFile)
|
if (!wavFile)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
@ -127,7 +130,7 @@ Mix_Chunk* Sound::LoadWaveFile(const std::string& lpName)
|
|||||||
|
|
||||||
void Sound::FreeSound(Mix_Chunk* wave)
|
void Sound::FreeSound(Mix_Chunk* wave)
|
||||||
{
|
{
|
||||||
if (wave)
|
if (MixOpen && wave)
|
||||||
Mix_FreeChunk(wave);
|
Mix_FreeChunk(wave);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,12 +141,14 @@ void Sound::SetChannels(int channels)
|
|||||||
|
|
||||||
num_channels = channels;
|
num_channels = channels;
|
||||||
Channels.resize(num_channels);
|
Channels.resize(num_channels);
|
||||||
Mix_AllocateChannels(num_channels);
|
if (MixOpen)
|
||||||
|
Mix_AllocateChannels(num_channels);
|
||||||
SetVolume(Volume);
|
SetVolume(Volume);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::SetVolume(int volume)
|
void Sound::SetVolume(int volume)
|
||||||
{
|
{
|
||||||
Volume = volume;
|
Volume = volume;
|
||||||
Mix_Volume(-1, volume);
|
if (MixOpen)
|
||||||
|
Mix_Volume(-1, volume);
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@ class Sound
|
|||||||
public:
|
public:
|
||||||
static std::vector<ChannelInfo> Channels;
|
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 Enable(bool enableFlag);
|
||||||
static void Activate();
|
static void Activate();
|
||||||
static void Deactivate();
|
static void Deactivate();
|
||||||
@ -27,4 +27,5 @@ private:
|
|||||||
static int num_channels;
|
static int num_channels;
|
||||||
static bool enabled_flag;
|
static bool enabled_flag;
|
||||||
static int Volume;
|
static int Volume;
|
||||||
|
static bool MixOpen;
|
||||||
};
|
};
|
||||||
|
@ -5,7 +5,11 @@ int main(int argc, char* argv[])
|
|||||||
{
|
{
|
||||||
std::string cmdLine;
|
std::string cmdLine;
|
||||||
for (int i = 1; i < argc; i++)
|
for (int i = 1; i < argc; i++)
|
||||||
|
{
|
||||||
|
if (i > 1)
|
||||||
|
cmdLine += " ";
|
||||||
cmdLine += argv[i];
|
cmdLine += argv[i];
|
||||||
|
}
|
||||||
|
|
||||||
return winmain::WinMain(cmdLine.c_str());
|
return winmain::WinMain(cmdLine.c_str());
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ std::vector<Mix_Music*> midi::LoadedTracks{};
|
|||||||
Mix_Music* midi::track1, * midi::track2, * midi::track3;
|
Mix_Music* midi::track1, * midi::track2, * midi::track3;
|
||||||
MidiTracks midi::active_track, midi::NextTrack;
|
MidiTracks midi::active_track, midi::NextTrack;
|
||||||
int midi::Volume = MIX_MAX_VOLUME;
|
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)
|
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 (active_track != MidiTracks::None)
|
||||||
{
|
{
|
||||||
Mix_HaltMusic();
|
if (MixOpen)
|
||||||
|
Mix_HaltMusic();
|
||||||
active_track = MidiTracks::None;
|
active_track = MidiTracks::None;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int midi::music_init(int volume)
|
int midi::music_init(bool mixOpen, int volume)
|
||||||
{
|
{
|
||||||
|
MixOpen = mixOpen;
|
||||||
SetVolume(volume);
|
SetVolume(volume);
|
||||||
active_track = MidiTracks::None;
|
active_track = MidiTracks::None;
|
||||||
NextTrack = MidiTracks::None;
|
NextTrack = MidiTracks::None;
|
||||||
@ -102,11 +104,15 @@ void midi::music_shutdown()
|
|||||||
void midi::SetVolume(int volume)
|
void midi::SetVolume(int volume)
|
||||||
{
|
{
|
||||||
Volume = volume;
|
Volume = volume;
|
||||||
Mix_VolumeMusic(volume);
|
if (MixOpen)
|
||||||
|
Mix_VolumeMusic(volume);
|
||||||
}
|
}
|
||||||
|
|
||||||
Mix_Music* midi::load_track(std::string fileName)
|
Mix_Music* midi::load_track(std::string fileName)
|
||||||
{
|
{
|
||||||
|
if (!MixOpen || pb::quickFlag)
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
if (pb::FullTiltMode)
|
if (pb::FullTiltMode)
|
||||||
{
|
{
|
||||||
// FT sounds are in SOUND subfolder
|
// FT sounds are in SOUND subfolder
|
||||||
@ -184,7 +190,7 @@ bool midi::play_track(MidiTracks track, bool replay)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Mix_PlayMusic(midi, -1))
|
if (MixOpen && Mix_PlayMusic(midi, -1))
|
||||||
{
|
{
|
||||||
active_track = MidiTracks::None;
|
active_track = MidiTracks::None;
|
||||||
return false;
|
return false;
|
||||||
|
@ -94,7 +94,7 @@ enum class MidiTracks
|
|||||||
class midi
|
class midi
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static int music_init(int volume);
|
static int music_init(bool mixOpen, int volume);
|
||||||
static void music_shutdown();
|
static void music_shutdown();
|
||||||
static void music_play();
|
static void music_play();
|
||||||
static void music_stop();
|
static void music_stop();
|
||||||
@ -106,7 +106,7 @@ private:
|
|||||||
static Mix_Music* track1, * track2, * track3;
|
static Mix_Music* track1, * track2, * track3;
|
||||||
static MidiTracks active_track, NextTrack;
|
static MidiTracks active_track, NextTrack;
|
||||||
static int Volume;
|
static int Volume;
|
||||||
static bool IsPlaying;
|
static bool IsPlaying, MixOpen;
|
||||||
|
|
||||||
static void StopPlayback();
|
static void StopPlayback();
|
||||||
static Mix_Music* load_track(std::string fileName);
|
static Mix_Music* load_track(std::string fileName);
|
||||||
|
@ -52,6 +52,7 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
|||||||
std::set_new_handler(memalloc_failure);
|
std::set_new_handler(memalloc_failure);
|
||||||
|
|
||||||
printf("Game version: %s\n", Version);
|
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("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(" SDL_mixer %d.%d.%d;", SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL);
|
||||||
printf(" ImGui %s\n", IMGUI_VERSION);
|
printf(" ImGui %s\n", IMGUI_VERSION);
|
||||||
@ -107,6 +108,25 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
|||||||
|
|
||||||
auto prefPath = SDL_GetPrefPath("", "SpaceCadetPinball");
|
auto prefPath = SDL_GetPrefPath("", "SpaceCadetPinball");
|
||||||
auto basePath = SDL_GetBasePath();
|
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
|
do
|
||||||
{
|
{
|
||||||
restart = false;
|
restart = false;
|
||||||
@ -171,10 +191,11 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
|||||||
// Second step: run updates that depend on .DAT file selection
|
// Second step: run updates that depend on .DAT file selection
|
||||||
options::InitSecondary();
|
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;
|
Options.Sounds = false;
|
||||||
|
|
||||||
if (!pb::quickFlag && !midi::music_init(Options.MusicVolume))
|
if (!midi::music_init(mixOpened, Options.MusicVolume))
|
||||||
Options.Music = false;
|
Options.Music = false;
|
||||||
|
|
||||||
if (pb::init())
|
if (pb::init())
|
||||||
@ -219,8 +240,8 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
|||||||
|
|
||||||
options::uninit();
|
options::uninit();
|
||||||
midi::music_shutdown();
|
midi::music_shutdown();
|
||||||
pb::uninit();
|
|
||||||
Sound::Close();
|
Sound::Close();
|
||||||
|
pb::uninit();
|
||||||
|
|
||||||
ImGuiSDL::Deinitialize();
|
ImGuiSDL::Deinitialize();
|
||||||
ImGui_ImplSDL2_Shutdown();
|
ImGui_ImplSDL2_Shutdown();
|
||||||
@ -228,6 +249,13 @@ int winmain::WinMain(LPCSTR lpCmdLine)
|
|||||||
}
|
}
|
||||||
while (restart);
|
while (restart);
|
||||||
|
|
||||||
|
if (!noAudio)
|
||||||
|
{
|
||||||
|
if (mixOpened)
|
||||||
|
Mix_CloseAudio();
|
||||||
|
Mix_Quit();
|
||||||
|
}
|
||||||
|
|
||||||
SDL_free(basePath);
|
SDL_free(basePath);
|
||||||
SDL_free(prefPath);
|
SDL_free(prefPath);
|
||||||
delete gfr_display;
|
delete gfr_display;
|
||||||
|
Loading…
Reference in New Issue
Block a user