OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved the sound system's sound stream for the music out of the song objects.

Browse source 
It is now being handled by the controlling code.
While of no benefit for GZDoom itself, this finally allows to separate the entire music code into a separate, engine independent project that merely provides streamed music data when not playing on a hardware device (WinMM Midi or CD Audio.)
The tight coupling of the music code with the sound backend made this nearly impossible before
This commit is contained in:
Christoph Oelckers 2019-09-30 00:02:31 +02:00
commit 7c27cd0c57
6 changed files with 71 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/sound/s_music.cpp
View file

@ -150,6 +150,55 @@ void S_ShutdownMusic ()
LastSong = "";
}
//==========================================================================
//
//
//
// Create a sound system stream for the currently playing song
//==========================================================================
static std::unique_ptr<SoundStream> musicStream;
static bool FillStream(SoundStream* stream, void* buff, int len, void* userdata)
{
bool written = mus_playing.handle? mus_playing.handle->ServiceStream(buff, len) : 0;
if (!written)
{
memset((char*)buff, 0, len);
return false;
}
return true;
}
void S_CreateStream()
{
if (!mus_playing.handle) return;
auto fmt = mus_playing.handle->GetStreamInfo();
if (fmt.mBufferSize > 0)
{
int flags = fmt.mNumChannels < 0 ? 0 : SoundStream::Float;
if (abs(fmt.mNumChannels) < 2) flags |= SoundStream::Mono;
musicStream.reset(GSnd->CreateStream(FillStream, fmt.mBufferSize, flags, fmt.mSampleRate, nullptr));
if (musicStream) musicStream->Play(true, 1);
}
}
void S_PauseStream(bool paused)
{
if (musicStream) musicStream->SetPaused(paused);
}
void S_StopStream()
{
if (musicStream)
{
musicStream->Stop();
musicStream.reset();
}
}
//==========================================================================
//
// S_PauseSound
@ -162,6 +211,7 @@ void S_PauseMusic ()
if (mus_playing.handle && !MusicPaused)
{
mus_playing.handle->Pause();
S_PauseStream(true);
MusicPaused = true;
}
}
@ -178,6 +228,7 @@ void S_ResumeMusic ()
if (mus_playing.handle && MusicPaused)
{
mus_playing.handle->Resume();
S_PauseStream(false);
MusicPaused = false;
}
}
@ -375,6 +426,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
try
{
mus_playing.handle->Play(looping, order);
S_CreateStream();
}
catch (const std::runtime_error& err)
{
@ -479,6 +531,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
try
{
mus_playing.handle->Start(looping, S_GetMusicVolume(musicname), order);
S_CreateStream();
mus_playing.baseorder = order;
}
catch (const std::runtime_error& err)
@ -530,8 +583,8 @@ void S_MIDIDeviceChanged()
{
try
{
mus_playing.handle->Stop();
mus_playing.handle->Start(mus_playing.loop, -1, mus_playing.baseorder);
S_CreateStream();
}
catch (const std::runtime_error& err)
{
@ -579,9 +632,8 @@ void S_StopMusic (bool force)
{
if (mus_playing.handle != nullptr)
{
if (MusicPaused)
mus_playing.handle->Resume();
S_ResumeMusic();
S_StopStream();
mus_playing.handle->Stop();
delete mus_playing.handle;
mus_playing.handle = nullptr;