diff options
| author | John Peterson <jpeterson57@gmail.com> | 2008-11-27 07:52:18 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2008-11-27 07:52:18 +0000 |
| commit | 7a72ed3e4a6fd936d995e1cbeff93c60a1b26dbd (patch) | |
| tree | 241e04fc6492978af00455bdbb18e5c07134cf2e /Source | |
| parent | af46362f3413e2f90f36b1b86968dac05bbf4b3a (diff) | |
Fixed accidental DSP HLE change that broke the music in games that don't use SRC
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1312 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp | 5 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp index 9a1b4ae9e7..b4656c4524 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp @@ -94,7 +94,8 @@ void startConsoleWin(int width, int height, char* fname) // File printf function
int aprintf(int a, char *fmt, ...)
{
-#if defined(DEBUG_HLE) && defined(_WIN32) && (defined(_DEBUG) || defined(DEBUGFAST))
+#if defined(DEBUG_HLE) && defined(_WIN32)
+
if(m_frame->gSaveFile)
{
char s[5000]; // WARNING: mind this value
@@ -128,7 +129,7 @@ int aprintf(int a, char *fmt, ...) // Printf to screen function
int wprintf(const char *fmt, ...)
{
-#if defined(DEBUG_HLE) && defined(_WIN32) && (defined(_DEBUG) || defined(DEBUGFAST))
+#if defined(DEBUG_HLE) && defined(_WIN32)
char s[1024*20]; // Warning, mind this value
va_list argptr;
int cnt;
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h index e2ee053243..330a799cd0 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h @@ -131,7 +131,7 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer, // =============
// =======================================================================================
- // Handle no-src streams - No src streams have pb.src_type == 2 and have pb.src.ratio_hi = 0
+ // Handle No-SRC streams - No src streams have pb.src_type == 2 and have pb.src.ratio_hi = 0
// and pb.src.ratio_lo = 0. We handle that by setting the sampling ratio integer to 1. This
// makes samplePos update in the correct way. I'm unsure how we are actually supposed to
// detect that this setting. Updates did not fix this automatically.
@@ -143,12 +143,12 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer, // Baten Kaitos - Eternal Wings (2003)
// Baten Kaitos - Origins (2006)?
// Soul Calibur 2: The movie music use src_type 2 but it needs no adjustment, perhaps
- // the sound format plays in to, Baten use ADPCM SC2 use PCM16
+ // the sound format plays in to, Baten use ADPCM, SC2 use PCM16
// ------------
//if (pb.src_type == 2 && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0))
if (pb.running && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0))
{
- //pb.src.ratio_hi = 1;
+ pb.src.ratio_hi = 1;
}
// =============
|