From 2b6a8c1cf829bdef03c102081c55cb0b89b5e35f Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 22 Feb 2011 14:06:06 +0000 Subject: [PATCH] Build Speaker.cpp. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7226 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/LogManager.cpp | 2 +- Source/Core/Core/CMakeLists.txt | 2 +- Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp | 1 - Source/Core/Core/Src/SConscript | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index b0eae86504..a328887209 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -69,7 +69,7 @@ LogManager::LogManager() { m_Log[LogTypes::DYNA_REC] = new LogContainer("JIT", "Dynamic Recompiler"); m_Log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console"); m_Log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport"); - m_Log[LogTypes::WIIMOTE] = new LogContainer("Wiimote", "Wiimote Plugin"); + m_Log[LogTypes::WIIMOTE] = new LogContainer("Wiimote", "Wiimote"); m_Log[LogTypes::WII_IOB] = new LogContainer("WII_IOB", "WII IO Bridge"); m_Log[LogTypes::WII_IPC] = new LogContainer("WII_IPC", "WII IPC"); m_Log[LogTypes::WII_IPC_HLE] = new LogContainer("WII_IPC_HLE", "WII IPC HLE"); diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 7ac38e3eee..f9ac5bbb4d 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -124,7 +124,7 @@ set(SRCS Src/ActionReplay.cpp Src/HW/WiimoteEmu/Attachment/Turntable.cpp Src/HW/WiimoteEmu/EmuSubroutines.cpp Src/HW/WiimoteEmu/Encryption.cpp - #Src/HW/WiimoteEmu/Speaker.cpp + Src/HW/WiimoteEmu/Speaker.cpp Src/HW/WiimoteReal/WiimoteReal.cpp Src/IPC_HLE/WII_IPC_HLE.cpp Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp index 108a111950..0db7b09fe8 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp @@ -70,7 +70,6 @@ ADPCMChannelStatus cs; void Wiimote::SpeakerData(wm_speaker_data* sd) { s16 samples[40]; - u16 sampleRate = 6000000 / Common::swap16(m_reg_speaker.sample_rate); if (m_reg_speaker.format == 0x40) { diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index 6fe7fd339f..19fdc48909 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -118,7 +118,7 @@ files += [ "HW/WiimoteEmu/Attachment/Turntable.cpp", "HW/WiimoteEmu/EmuSubroutines.cpp", "HW/WiimoteEmu/Encryption.cpp", - #"HW/WiimoteEmu/Speaker.cpp", + "HW/WiimoteEmu/Speaker.cpp", "HW/WiimoteReal/WiimoteReal.cpp", "HW/GCPadEmu.cpp", "HW/HW.cpp",