mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 13:57:57 -07:00
4dba267775
Generic code cleanup. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3458 8ced0084-cf51-0410-be5f-012b33b47a6e
43 lines
1.3 KiB
C++
43 lines
1.3 KiB
C++
// Copyright (C) 2003-2009 Dolphin Project.
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, version 2.0.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
// Official SVN repository and contact information can be found at
|
|
// http://code.google.com/p/dolphin-emu/
|
|
|
|
#include "Config.h" // Local
|
|
#include "Globals.h"
|
|
#include "DSPHandler.h"
|
|
#include "HLEMixer.h"
|
|
|
|
void HLEMixer::MixUCode(short *samples, int numSamples) {
|
|
// if this was called directly from the HLE, and not by timeout
|
|
if (g_Config.m_EnableHLEAudio && IsHLEReady()) {
|
|
IUCode* pUCode = CDSPHandler::GetInstance().GetUCode();
|
|
if (pUCode != NULL)
|
|
pUCode->MixAdd(samples, numSamples);
|
|
}
|
|
}
|
|
|
|
void HLEMixer::Premix(short *samples, int numSamples) {
|
|
|
|
// first get the DTK Music
|
|
// if (g_Config.m_EnableDTKMusic) {
|
|
// g_dspInitialize.pGetAudioStreaming(samples, numSamples);
|
|
// }
|
|
|
|
MixUCode(samples, numSamples);
|
|
}
|
|
|
|
|