mirror of
https://github.com/ZDoom/gzdoom.git
synced 2025-01-09 03:21:03 +00:00
2b721975dd
for FMOD Ex while at the same time removing support for FMOD 3. Be sure to update your SDKs. GCC users, be sure to do a "make cleandep && make clean" before building, or you will likely get inexplicable errors. - Fixed: If you wanted to make cleandep with MinGW, you had to specifically specify Makefile.mingw as the makefile to use. - Added a normalizer to the OPL synth. It helped bring up the volume a little, but not nearly as much as I would have liked. - Removed MIDI Mapper references. It doesn't work with the stream API, and it doesn't really exist on NT kernels, either. - Reworked music volume: Except for MIDI, all music volume is controlled through GSnd and not at the individual song level. - Removed the mididevice global variable. - Removed snd_midivolume. Now that all music uses a linear volume scale, there's no need for two separate music volume controls. - Increased snd_samplerate default up to 48000. - Added snd_format, defaulting to "PCM-16". - Added snd_speakermode, defaulting to "Auto". - Replaced snd_fpu with snd_resampler, defaulting to "Linear". - Bumped the snd_channels default up from a pitiful 12 to 32. - Changed snd_3d default to true. The new cvar snd_hw3d determines if hardware 3D support is used and default to false. - Removed the libFLAC source, since FMOD Ex has native FLAC support. - Removed the altsound code, since it was terribly gimped in comparison to the FMOD code. It's original purpose was to have been as a springboard for writing a non-FMOD sound system for Unix-y systems, but that never happened. - Finished preliminary FMOD Ex support. SVN r789 (trunk)
87 lines
1.4 KiB
C++
87 lines
1.4 KiB
C++
#include "i_musicinterns.h"
|
|
|
|
void StreamSong::Play (bool looping)
|
|
{
|
|
m_Status = STATE_Stopped;
|
|
m_Looping = looping;
|
|
|
|
if (m_Stream->Play (m_Looping, 1, false))
|
|
{
|
|
m_Status = STATE_Playing;
|
|
m_LastPos = 0;
|
|
}
|
|
}
|
|
|
|
void StreamSong::Pause ()
|
|
{
|
|
if (m_Status == STATE_Playing && m_Stream != NULL)
|
|
{
|
|
if (m_Stream->SetPaused (true))
|
|
m_Status = STATE_Paused;
|
|
}
|
|
}
|
|
|
|
void StreamSong::Resume ()
|
|
{
|
|
if (m_Status == STATE_Paused && m_Stream != NULL)
|
|
{
|
|
if (m_Stream->SetPaused (false))
|
|
m_Status = STATE_Playing;
|
|
}
|
|
}
|
|
|
|
void StreamSong::Stop ()
|
|
{
|
|
if (m_Status != STATE_Stopped && m_Stream)
|
|
{
|
|
m_Stream->Stop ();
|
|
}
|
|
m_Status = STATE_Stopped;
|
|
}
|
|
|
|
StreamSong::~StreamSong ()
|
|
{
|
|
Stop ();
|
|
if (m_Stream != NULL)
|
|
{
|
|
delete m_Stream;
|
|
m_Stream = NULL;
|
|
}
|
|
}
|
|
|
|
StreamSong::StreamSong (const char *filename_or_data, int offset, int len)
|
|
{
|
|
m_Stream = GSnd->OpenStream (filename_or_data, SoundStream::Loop, offset, len);
|
|
}
|
|
|
|
bool StreamSong::IsPlaying ()
|
|
{
|
|
if (m_Status != STATE_Stopped)
|
|
{
|
|
if (m_Looping)
|
|
return true;
|
|
|
|
int pos = m_Stream->GetPosition ();
|
|
|
|
if (pos < m_LastPos)
|
|
{
|
|
Stop ();
|
|
return false;
|
|
}
|
|
|
|
m_LastPos = pos;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
//
|
|
// StreamSong :: SetPosition
|
|
//
|
|
// Sets the current order number for a MOD-type song, or the position in ms
|
|
// for anything else.
|
|
|
|
bool StreamSong::SetPosition(int order)
|
|
{
|
|
return m_Stream->SetPosition(order);
|
|
}
|