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

Update audio integration

This commit is contained in:
Jack Andersen 2016-03-23 14:05:56 -10:00
parent 6301af3133
commit 42f7cbe4b5
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Editor/ViewManager.cpp
View File

@ -38,7 +38,7 @@ void ViewManager::BuildTestPART(urde::IObjectStore& objStore)
testRSF.SyncRead(m_rsfBuf.get(), rsfLen); testRSF.SyncRead(m_rsfBuf.get(), rsfLen);
//CMoviePlayer::SetStaticAudio(m_rsfBuf.get(), rsfLen, 416480, 1973664); //CMoviePlayer::SetStaticAudio(m_rsfBuf.get(), rsfLen, 416480, 1973664);
m_videoVoice = m_voiceAllocator->allocateNewVoice(m_audioSet, 32000, &m_voiceCallback); m_videoVoice = m_voiceEngine->allocateNewStereoVoice(32000, &m_voiceCallback);
m_videoVoice->start(); m_videoVoice->start();
//m_rootView->accessContentViews().clear(); //m_rootView->accessContentViews().clear();
@ -253,10 +253,7 @@ void ViewManager::init(boo::IApplication* app)
m_mainWindow->setWaitCursor(false); m_mainWindow->setWaitCursor(false);
m_voiceAllocator = boo::NewAudioVoiceAllocator(); m_voiceEngine = boo::NewAudioVoiceEngine();
m_audioSet = m_voiceAllocator->getAvailableSet();
m_stereoMatrix.setAudioChannelSet(m_audioSet);
m_stereoMatrix.setDefaultMatrixCoefficients();
CGraphics::InitializeBoo(gf, m_mainWindow->getCommandQueue(), root->renderTex()); CGraphics::InitializeBoo(gf, m_mainWindow->getCommandQueue(), root->renderTex());
CElementGen::Initialize(); CElementGen::Initialize();
CMoviePlayer::Initialize(); CMoviePlayer::Initialize();
@ -305,7 +302,7 @@ bool ViewManager::proc()
m_rootView->draw(gfxQ); m_rootView->draw(gfxQ);
CGraphics::EndScene(); CGraphics::EndScene();
gfxQ->execute(); gfxQ->execute();
m_voiceAllocator->pumpVoices(); m_voiceEngine->pumpAndMixVoices();
m_mainWindow->waitForRetrace(); m_mainWindow->waitForRetrace();
return true; return true;

18
Editor/ViewManager.hpp
View File

@ -2,8 +2,7 @@
#define URDE_VIEW_MANAGER_HPP #define URDE_VIEW_MANAGER_HPP
#include "hecl/CVarManager.hpp" #include "hecl/CVarManager.hpp"
#include "boo/audiodev/IAudioVoiceAllocator.hpp" #include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "boo/audiodev/AudioMatrix.hpp"
#include "ProjectManager.hpp" #include "ProjectManager.hpp"
#include "Space.hpp" #include "Space.hpp"
@ -52,22 +51,17 @@ class ViewManager : public specter::IViewManager
std::unique_ptr<CLineRenderer> m_lineRenderer; std::unique_ptr<CLineRenderer> m_lineRenderer;
std::unique_ptr<CMoviePlayer> m_moviePlayer; std::unique_ptr<CMoviePlayer> m_moviePlayer;
std::unique_ptr<u8[]> m_rsfBuf; std::unique_ptr<u8[]> m_rsfBuf;
std::unique_ptr<boo::IAudioVoiceAllocator> m_voiceAllocator; std::unique_ptr<boo::IAudioVoiceEngine> m_voiceEngine;
boo::AudioChannelSet m_audioSet = boo::AudioChannelSet::Unknown;
std::unique_ptr<boo::IAudioVoice> m_videoVoice; std::unique_ptr<boo::IAudioVoice> m_videoVoice;
boo::AudioMatrixStereo m_stereoMatrix;
struct AudioVoiceCallback : boo::IAudioVoiceCallback struct AudioVoiceCallback : boo::IAudioVoiceCallback
{ {
ViewManager& m_vm; ViewManager& m_vm;
std::vector<s16> m_stereoBuf; size_t supplyAudio(boo::IAudioVoice& voice, size_t frames, int16_t* data)
void needsNextBuffer(boo::IAudioVoice& voice, size_t frames)
{ {
m_stereoBuf.clear();
m_stereoBuf.resize(frames * 2);
if (m_vm.m_moviePlayer) if (m_vm.m_moviePlayer)
m_vm.m_moviePlayer->MixAudio(m_stereoBuf.data(), nullptr, frames); m_vm.m_moviePlayer->MixAudio(data, nullptr, frames);
CMoviePlayer::MixStaticAudio(m_stereoBuf.data(), m_stereoBuf.data(), frames); CMoviePlayer::MixStaticAudio(data, data, frames);
m_vm.m_stereoMatrix.bufferStereoSampleData(voice, m_stereoBuf.data(), frames); return frames;
} }
AudioVoiceCallback(ViewManager& vm) : m_vm(vm) {} AudioVoiceCallback(ViewManager& vm) : m_vm(vm) {}
} m_voiceCallback; } m_voiceCallback;

1
Runtime/Graphics/CMoviePlayer.cpp
View File

@ -539,6 +539,7 @@ void CMoviePlayer::MixAudio(s16* out, const s16* in, u32 samples)
tex = &x80_textures[xd4_audioSlot]; tex = &x80_textures[xd4_audioSlot];
thisSamples = std::min(tex->audioSamples - tex->playedSamples, samples); thisSamples = std::min(tex->audioSamples - tex->playedSamples, samples);
} }
if (thisSamples) if (thisSamples)
{ {
/* mix samples with `in` or no mix */ /* mix samples with `in` or no mix */

2
hecl

@ -1 +1 @@
Subproject commit 420a3b078b9532f382028a3890fa47c7e870f0c8 Subproject commit 40ff62ad7eacddecb1473ae00e7ce632f120486b