AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-09 13:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

New engine event interface

Browse Source
This commit is contained in:
Jack Andersen
2017-02-14 20:01:39 -10:00
parent aff8880595
commit 5c8fa2e8ab
7 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
driver/amuseplay.cpp
View File

@@ -125,7 +125,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSongDisplay();
}
void SongLoop(const amuse::SongGroupIndex& index)
void SongLoop(const amuse::SongGroupIndex& index, boo::IAudioVoiceEngine& booEngine)
{
printf(
"░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░\n"
@@ -202,7 +202,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSongDisplay();
}
m_engine->pumpEngine();
m_win->waitForRetrace(&booEngine);
size_t voxCount;
int8_t progId;
@@ -231,8 +231,6 @@ struct AppCallback : boo::IApplicationCallback
m_seq.reset();
break;
}
m_win->waitForRetrace();
}
}
@@ -260,7 +258,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSFXDisplay();
}
void SFXLoop(const amuse::SFXGroupIndex& index)
void SFXLoop(const amuse::SFXGroupIndex& index, boo::IAudioVoiceEngine& booEngine)
{
printf("<space>: keyon/keyoff, <left/right>: cycle SFX, <up/down>: volume, <Q>: quit\n");
@@ -306,7 +304,7 @@ struct AppCallback : boo::IApplicationCallback
UpdateSFXDisplay();
}
m_engine->pumpEngine();
m_win->waitForRetrace(&booEngine);
if (m_vox && m_vox->state() == amuse::VoiceState::Dead)
{
@@ -322,8 +320,6 @@ struct AppCallback : boo::IApplicationCallback
m_seq.reset();
break;
}
m_win->waitForRetrace();
}
}
@@ -876,9 +872,9 @@ struct AppCallback : boo::IApplicationCallback
/* Enter playback loop */
if (m_sfxGroup)
SFXLoop(*sfxIndex);
SFXLoop(*sfxIndex, *voxEngine);
else
SongLoop(*songIndex);
SongLoop(*songIndex, *voxEngine);
printf("\n\n");
}