From 6f7d09ce4582ee7114985de5f3ef75d8d3299d51 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 6 Dec 2017 18:34:45 -1000 Subject: [PATCH] Fix amuseplay build --- driver/amuseplay.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/driver/amuseplay.cpp b/driver/amuseplay.cpp index 3cf63bc..5505372 100644 --- a/driver/amuseplay.cpp +++ b/driver/amuseplay.cpp @@ -56,8 +56,8 @@ struct AppCallback : boo::IApplicationCallback std::shared_ptr m_win; /* Amuse engine */ - std::experimental::optional m_booBackend; - std::experimental::optional m_engine; + std::unique_ptr m_booBackend; + std::unique_ptr m_engine; int m_groupId = -1; bool m_sfxGroup; @@ -910,8 +910,8 @@ struct AppCallback : boo::IApplicationCallback /* Build voice engine */ std::unique_ptr voxEngine = boo::NewAudioVoiceEngine(); - m_booBackend.emplace(*voxEngine); - m_engine.emplace(*m_booBackend, amuse::AmplitudeMode::PerSample); + m_booBackend.reset(new amuse::BooBackendVoiceAllocator(*voxEngine)); + m_engine.reset(new amuse::Engine(*m_booBackend, amuse::AmplitudeMode::PerSample)); /* Load group into engine */ const amuse::AudioGroup* group = m_engine->addAudioGroup(*selData); @@ -927,8 +927,8 @@ struct AppCallback : boo::IApplicationCallback else SongLoop(*songIndex, *voxEngine); - m_engine = std::experimental::nullopt; - m_booBackend = std::experimental::nullopt; + m_engine.reset(); + m_booBackend.reset(); printf("\n\n"); }