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

Merge branch 'master' into cmake_dist

Browse Source 
# Conflicts:
#	include/ConfigManager.h
#	include/Engine.h
#	plugins/CMakeLists.txt
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/Win64/CMakeLists.txt
#	src/core/Engine.cpp
This commit is contained in:
Lukas W
2015-05-30 22:59:06 +02:00
parent e0f077ba02 f403299460
commit 422fbbc8d3
95 changed files with 1439 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/Engine.cpp
View File

@@ -52,9 +52,13 @@ DummyTrackContainer * Engine::s_dummyTC = NULL;
void Engine::init()
{
Engine *engine = inst();
emit engine->initProgress(tr("Generating wavetables"));
// generate (load from file) bandlimited wavetables
BandLimitedWave::generateWaves();
emit engine->initProgress(tr("Initializing data structures"));
s_projectJournal = new ProjectJournal;
s_mixer = new Mixer;
s_song = new Song;
@@ -65,11 +69,13 @@ void Engine::init()
s_projectJournal->setJournalling( true );
emit engine->initProgress(tr("Opening audio and midi devices"));
s_mixer->initDevices();
PresetPreviewPlayHandle::init();
s_dummyTC = new DummyTrackContainer;
emit engine->initProgress(tr("Launching mixer threads"));
s_mixer->startProcessing();
}
@@ -114,3 +120,5 @@ void Engine::updateFramesPerTick()
s_framesPerTick = s_mixer->processingSampleRate() * 60.0f * 4 /
DefaultTicksPerTact / s_song->getTempo();
}
Engine * Engine::s_instanceOfMe = NULL;