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

Update amuseplay for boo changes

This commit is contained in:
Jack Andersen 2017-07-16 16:55:14 -10:00
parent 0bace131e8
commit aef2b2a707
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
driver/amuseplay.cpp
View File

@ -60,9 +60,10 @@ struct AppCallback : boo::IApplicationCallback
/* Boo window and events */ /* Boo window and events */
EventCallback m_eventRec; EventCallback m_eventRec;
boo::DeferredWindowEvents<EventCallback> m_events; boo::DeferredWindowEvents<EventCallback> m_events;
boo::IWindow* m_win = nullptr; std::shared_ptr<boo::IWindow> m_win;
/* Amuse engine */ /* Amuse engine */
std::experimental::optional<amuse::BooBackendVoiceAllocator> m_booBackend;
std::experimental::optional<amuse::Engine> m_engine; std::experimental::optional<amuse::Engine> m_engine;
int m_groupId = -1; int m_groupId = -1;
bool m_sfxGroup; bool m_sfxGroup;
@ -859,8 +860,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();
amuse::BooBackendVoiceAllocator booBackend(*voxEngine); m_booBackend.emplace(*voxEngine);
m_engine.emplace(booBackend, amuse::AmplitudeMode::PerSample); m_engine.emplace(*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);
@ -876,6 +877,8 @@ struct AppCallback : boo::IApplicationCallback
else else
SongLoop(*songIndex, *voxEngine); SongLoop(*songIndex, *voxEngine);
m_engine = std::experimental::nullopt;
m_booBackend = std::experimental::nullopt;
printf("\n\n"); printf("\n\n");
} }