ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'support_loop_start_music'

Browse Source
This commit is contained in:
Benau 2016-07-11 09:09:06 +08:00
commit 08f2437754
4 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/audio/music_information.cpp
View File

@ -72,33 +72,37 @@ MusicInformation *MusicInformation::create(const std::string &filename)
MusicInformation::MusicInformation(const XMLNode *root,
const std::string &filename)
{
m_title = "";
m_mode = SOUND_NORMAL;
m_composer = "";
//m_numLoops = LOOP_FOREVER;
m_normal_filename = "";
m_fast_filename = "";
m_normal_music = NULL;
m_fast_music = NULL;
m_enable_fast = false;
m_music_waiting = false;
m_faster_time = 1.0f;
m_max_pitch = 0.1f;
m_gain = 1.0f;
m_title = "";
m_mode = SOUND_NORMAL;
m_composer = "";
//m_numLoops = LOOP_FOREVER;
m_normal_filename = "";
m_fast_filename = "";
m_normal_music = NULL;
m_fast_music = NULL;
m_normal_loop_start = 0.0f;
m_fast_loop_start = 0.0f;
m_enable_fast = false;
m_music_waiting = false;
m_faster_time = 1.0f;
m_max_pitch = 0.1f;
m_gain = 1.0f;
// Otherwise read config file
// --------------------------
std::string s;
root->get("title", &s );
root->get("title", &s );
m_title = StringUtils::xmlDecode(s);
root->get("composer", &s );
root->get("composer", &s );
m_composer = StringUtils::xmlDecode(s);
root->get("file", &m_normal_filename);
root->get("gain", &m_gain );
root->get("tracks", &m_all_tracks );
root->get("fast", &m_enable_fast );
root->get("fast-filename", &m_fast_filename );
root->get("file", &m_normal_filename );
root->get("gain", &m_gain );
root->get("tracks", &m_all_tracks );
root->get("fast", &m_enable_fast );
root->get("fast-filename", &m_fast_filename );
root->get("loop-start", &m_normal_loop_start);
root->get("fast-loop-start", &m_fast_loop_start );
// Get the path from the filename and add it to the ogg filename
std::string path = StringUtils::getPath(filename);
@ -155,7 +159,7 @@ void MusicInformation::startMusic()
if (m_normal_music) delete m_normal_music;
#if HAVE_OGGVORBIS
m_normal_music = new MusicOggStream();
m_normal_music = new MusicOggStream(m_normal_loop_start);
#else
m_normal_music = new MusicDummy();
#endif
@ -190,7 +194,7 @@ void MusicInformation::startMusic()
}
#if HAVE_OGGVORBIS
m_fast_music = new MusicOggStream();
m_fast_music = new MusicOggStream(m_fast_loop_start);
#else
m_fast_music = new MusicDummy();
#endif

3
src/audio/music_information.hpp
View File

@ -58,6 +58,9 @@ private:
float m_gain;
float m_normal_loop_start;
float m_fast_loop_start;
/** Either time for fading faster music in, or time to change pitch. */
float m_faster_time;
/** Maximum pitch for faster music. */

7
src/audio/music_ogg.cpp
View File

@ -32,13 +32,14 @@
#include "utils/constants.hpp"
#include "utils/log.hpp"
MusicOggStream::MusicOggStream()
MusicOggStream::MusicOggStream(float loop_start)
{
//m_oggStream= NULL;
m_soundBuffers[0] = m_soundBuffers[1]= 0;
m_soundSource = -1;
m_pausedMusic = true;
m_playing = false;
m_loop_start = loop_start;
} // MusicOggStream
//-----------------------------------------------------------------------------
@ -289,8 +290,8 @@ void MusicOggStream::update()
active = streamIntoBuffer(buffer);
if(!active)
{
// no more data. Seek to beginning (causes the sound to loop)
ov_time_seek(&m_oggStream, 0);
// no more data. Seek to loop start (causes the sound to loop)
ov_time_seek(&m_oggStream, m_loop_start);
active = streamIntoBuffer(buffer);//now there really should be data
}

3
src/audio/music_ogg.hpp
View File

@ -47,7 +47,7 @@
class MusicOggStream : public Music
{
public:
MusicOggStream();
MusicOggStream(float loop_start);
virtual ~MusicOggStream();
virtual void update();
@ -71,6 +71,7 @@ private:
bool release();
bool streamIntoBuffer(ALuint buffer);
float m_loop_start;
std::string m_fileName;
FILE* m_oggFile;
OggVorbis_File m_oggStream;