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

Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/amuse

This commit is contained in:
Jack Andersen 2018-08-29 22:16:53 -10:00
parent 68f0f2e769 1884e0ca7a
commit 3d29005567
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

@ -127,7 +127,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSongDisplay(); UpdateSongDisplay();
} }
void SongLoop(const amuse::SongGroupIndex& index, boo::IAudioVoiceEngine& booEngine) void SongLoop(const amuse::SongGroupIndex& index)
{ {
printf( printf(
"░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░\n" "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░\n"
@ -204,7 +204,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSongDisplay(); UpdateSongDisplay();
} }
m_win->waitForRetrace(&booEngine); m_win->waitForRetrace();
size_t voxCount; size_t voxCount;
int8_t progId; int8_t progId;
@ -274,7 +274,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSFXDisplay(); UpdateSFXDisplay();
} }
void SFXLoop(const amuse::SFXGroupIndex& index, boo::IAudioVoiceEngine& booEngine) void SFXLoop(const amuse::SFXGroupIndex& index)
{ {
printf("<space>: keyon/keyoff, <left/right>: cycle SFX, <up/down>: volume, <Q>: quit\n"); printf("<space>: keyon/keyoff, <left/right>: cycle SFX, <up/down>: volume, <Q>: quit\n");
@ -338,7 +338,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSFXDisplay(); UpdateSFXDisplay();
} }
m_win->waitForRetrace(&booEngine); m_win->waitForRetrace();
if (m_vox && m_vox->state() == amuse::VoiceState::Dead) if (m_vox && m_vox->state() == amuse::VoiceState::Dead)
{ {
@ -923,9 +923,9 @@ struct AppCallback : boo::IApplicationCallback
/* Enter playback loop */ /* Enter playback loop */
if (m_sfxGroup) if (m_sfxGroup)
SFXLoop(*sfxIndex, *voxEngine); SFXLoop(*sfxIndex);
else else
SongLoop(*songIndex, *voxEngine); SongLoop(*songIndex);
m_vox.reset(); m_vox.reset();
m_seq.reset(); m_seq.reset();