AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix amuseplay build

This commit is contained in:
Jack Andersen 2017-12-06 18:34:45 -10:00
parent 5caf6bf017
commit 6f7d09ce45
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
driver/amuseplay.cpp
View File

@ -56,8 +56,8 @@ struct AppCallback : boo::IApplicationCallback
std::shared_ptr<boo::IWindow> m_win; std::shared_ptr<boo::IWindow> m_win;
/* Amuse engine */ /* Amuse engine */
std::experimental::optional<amuse::BooBackendVoiceAllocator> m_booBackend; std::unique_ptr<amuse::BooBackendVoiceAllocator> m_booBackend;
std::experimental::optional<amuse::Engine> m_engine; std::unique_ptr<amuse::Engine> m_engine;
int m_groupId = -1; int m_groupId = -1;
bool m_sfxGroup; bool m_sfxGroup;
@ -910,8 +910,8 @@ struct AppCallback : boo::IApplicationCallback
/* Build voice engine */ /* Build voice engine */
std::unique_ptr<boo::IAudioVoiceEngine> voxEngine = boo::NewAudioVoiceEngine(); std::unique_ptr<boo::IAudioVoiceEngine> voxEngine = boo::NewAudioVoiceEngine();
m_booBackend.emplace(*voxEngine); m_booBackend.reset(new amuse::BooBackendVoiceAllocator(*voxEngine));
m_engine.emplace(*m_booBackend, amuse::AmplitudeMode::PerSample); m_engine.reset(new amuse::Engine(*m_booBackend, amuse::AmplitudeMode::PerSample));
/* Load group into engine */ /* Load group into engine */
const amuse::AudioGroup* group = m_engine->addAudioGroup(*selData); const amuse::AudioGroup* group = m_engine->addAudioGroup(*selData);
@ -927,8 +927,8 @@ struct AppCallback : boo::IApplicationCallback
else else
SongLoop(*songIndex, *voxEngine); SongLoop(*songIndex, *voxEngine);
m_engine = std::experimental::nullopt; m_engine.reset();
m_booBackend = std::experimental::nullopt; m_booBackend.reset();
printf("\n\n"); printf("\n\n");
} }