mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-14 00:21:34 +00:00
e7ff22457e
FMOD_INIT_ENABLE_PROFILE. Renamed the corresponding cvar to snd_profile. - Removed the normalize parameter from SoundStream::Play(). - Disabled the chorus and reverb effects added to SDL_mixer's Timidity, because they were probably never tested well, either. Thanks to the bug in vc_alloc(), they were never even activated. - Restored the exact frequency range search that was missing from SDL_mixer's verion of select_sample(). - Fixed: vc_alloc(), kill_others(), and note_on() treated Voice::status as a bit mask, when it's not. These were changes made to SDL_mixer's Timidity. - Restored the original Timidity volume equation. The other louder one was put in when I didn't realize all channels were mono and many notes sounded too quiet because they never completed their attack phase. - Fixed: FileReader::Gets() acted as if fgets() always read the maximum number of characters. - Fixed: FileReader::Open() did not set FilePos and StartPos to 0. SVN r908 (trunk)
94 lines
1.9 KiB
C++
94 lines
1.9 KiB
C++
#include "i_musicinterns.h"
|
|
|
|
static bool OPL_Active;
|
|
|
|
CUSTOM_CVAR (Bool, opl_onechip, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
|
{
|
|
if (OPL_Active && currSong != NULL)
|
|
{
|
|
static_cast<OPLMUSSong *>(currSong)->ResetChips ();
|
|
}
|
|
}
|
|
|
|
OPLMUSSong::OPLMUSSong (FILE *file, char *musiccache, int len)
|
|
{
|
|
int samples = int(OPL_SAMPLE_RATE / 14);
|
|
|
|
Music = new OPLmusicFile (file, musiccache, len);
|
|
|
|
m_Stream = GSnd->CreateStream (FillStream, samples*4,
|
|
SoundStream::Mono | SoundStream::Float, int(OPL_SAMPLE_RATE), this);
|
|
if (m_Stream == NULL)
|
|
{
|
|
Printf (PRINT_BOLD, "Could not create music stream.\n");
|
|
delete Music;
|
|
return;
|
|
}
|
|
OPL_Active = true;
|
|
}
|
|
|
|
OPLMUSSong::~OPLMUSSong ()
|
|
{
|
|
OPL_Active = false;
|
|
Stop ();
|
|
if (Music != NULL)
|
|
{
|
|
delete Music;
|
|
}
|
|
}
|
|
|
|
bool OPLMUSSong::IsValid () const
|
|
{
|
|
return m_Stream != NULL;
|
|
}
|
|
|
|
void OPLMUSSong::ResetChips ()
|
|
{
|
|
Music->ResetChips ();
|
|
}
|
|
|
|
bool OPLMUSSong::IsPlaying ()
|
|
{
|
|
return m_Status == STATE_Playing;
|
|
}
|
|
|
|
void OPLMUSSong::Play (bool looping)
|
|
{
|
|
m_Status = STATE_Stopped;
|
|
m_Looping = looping;
|
|
|
|
Music->SetLooping (looping);
|
|
Music->Restart ();
|
|
|
|
if (m_Stream == NULL || m_Stream->Play (true, snd_musicvolume))
|
|
{
|
|
m_Status = STATE_Playing;
|
|
}
|
|
}
|
|
|
|
bool OPLMUSSong::FillStream (SoundStream *stream, void *buff, int len, void *userdata)
|
|
{
|
|
OPLMUSSong *song = (OPLMUSSong *)userdata;
|
|
return song->Music->ServiceStream (buff, len);
|
|
}
|
|
|
|
MusInfo *OPLMUSSong::GetOPLDumper(const char *filename)
|
|
{
|
|
return new OPLMUSDumper(this, filename);
|
|
}
|
|
|
|
OPLMUSSong::OPLMUSSong(const OPLMUSSong *original, const char *filename)
|
|
{
|
|
Music = new OPLmusicFile(original->Music, filename);
|
|
m_Stream = NULL;
|
|
}
|
|
|
|
OPLMUSDumper::OPLMUSDumper(const OPLMUSSong *original, const char *filename)
|
|
: OPLMUSSong(original, filename)
|
|
{
|
|
}
|
|
|
|
void OPLMUSDumper::Play(bool looping)
|
|
{
|
|
Music->Dump();
|
|
}
|