mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-13 11:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename Engine to LmmsCore, but typedef'd as Engine to prevent name conflicts with ZASFx

Browse Source 
Document the Engine renaming better & link to relevant issues/PRs
This commit is contained in:
Colin Wallace
2015-06-20 00:19:40 +00:00
parent d31ac1773b
commit c519921306
6 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/Engine.cpp
View File

@@ -38,21 +38,21 @@
#include "GuiApplication.h"
float Engine::s_framesPerTick;
Mixer* Engine::s_mixer = NULL;
FxMixer * Engine::s_fxMixer = NULL;
BBTrackContainer * Engine::s_bbTrackContainer = NULL;
Song * Engine::s_song = NULL;
ProjectJournal * Engine::s_projectJournal = NULL;
Ladspa2LMMS * Engine::s_ladspaManager = NULL;
DummyTrackContainer * Engine::s_dummyTC = NULL;
float LmmsCore::s_framesPerTick;
Mixer* LmmsCore::s_mixer = NULL;
FxMixer * LmmsCore::s_fxMixer = NULL;
BBTrackContainer * LmmsCore::s_bbTrackContainer = NULL;
Song * LmmsCore::s_song = NULL;
ProjectJournal * LmmsCore::s_projectJournal = NULL;
Ladspa2LMMS * LmmsCore::s_ladspaManager = NULL;
DummyTrackContainer * LmmsCore::s_dummyTC = NULL;
void Engine::init( bool renderOnly )
void LmmsCore::init( bool renderOnly )
{
Engine *engine = inst();
LmmsCore *engine = inst();
emit engine->initProgress(tr("Generating wavetables"));
// generate (load from file) bandlimited wavetables
@@ -82,7 +82,7 @@ void Engine::init( bool renderOnly )
void Engine::destroy()
void LmmsCore::destroy()
{
s_projectJournal->stopAllJournalling();
s_mixer->stopProcessing();
@@ -110,10 +110,10 @@ void Engine::destroy()
void Engine::updateFramesPerTick()
void LmmsCore::updateFramesPerTick()
{
s_framesPerTick = s_mixer->processingSampleRate() * 60.0f * 4 /
DefaultTicksPerTact / s_song->getTempo();
}
Engine * Engine::s_instanceOfMe = NULL;
LmmsCore * LmmsCore::s_instanceOfMe = NULL;