Permalink
Browse files

V2Edit/dsio_cpp: Use 44.1kHz (same as ASM ver) instead of 48000.

  • Loading branch information...
1 parent 732e4ba commit a30e873f5ba4b14b30a07bb78d4e9023a0554fc4 @rygorous rygorous committed Jul 17, 2012
Showing with 5 additions and 6 deletions.
  1. +3 −4 v2/dsio_cpp.cpp
  2. +1 −1 v2/standalone/midi.cpp
  3. +1 −1 v2/synth_core.cpp
View
@@ -6,8 +6,7 @@
#pragma comment(lib, "dsound.lib")
-//static const int BUFFERLEN = 0x10000; // bytes
-static const int BUFFERLEN = 0x4000; // bytes
+static const int BUFFERLEN = 0x10000; // bytes
static struct DSData
{
@@ -103,8 +102,8 @@ static DWORD WINAPI threadfunc(void *param)
sU32 __stdcall dsInit(DSIOCALLBACK *callback, void *parm, void *hwnd)
{
- //static const WAVEFORMATEX wfxprimary = { WAVE_FORMAT_PCM, 2, 44100, 44100*2*2, 2*2, 16, 0 };
- static const WAVEFORMATEX wfxprimary = { WAVE_FORMAT_PCM, 2, 48000, 48000*2*2, 2*2, 16, 0 };
+ static const WAVEFORMATEX wfxprimary = { WAVE_FORMAT_PCM, 2, 44100, 44100*2*2, 2*2, 16, 0 };
+ //static const WAVEFORMATEX wfxprimary = { WAVE_FORMAT_PCM, 2, 48000, 48000*2*2, 2*2, 16, 0 };
static const DSBUFFERDESC primdesc = { sizeof(DSBUFFERDESC), DSBCAPS_PRIMARYBUFFER, 0, 0, 0 };
static const DSBUFFERDESC streamdesc = { sizeof(DSBUFFERDESC), DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS, BUFFERLEN, 0, (WAVEFORMATEX*)&wfxprimary };
@@ -241,7 +241,7 @@ void msStartAudio(HWND hwnd, void *patchmap, void *globals, const char **speech)
void msStartAudio(HWND hwnd, void *patchmap, void *globals)
#endif
{
- synthInit(v2instance, patchmap, 48000);
+ synthInit(v2instance, patchmap, 44100);
synthSetGlobals(v2instance, globals);
#ifdef RONAN
synthSetLyrics(v2instance, speech);
View
@@ -2623,7 +2623,7 @@ struct V2Synth
dcf.init(&instance);
// debug plots (uncomment the ones you want)
- sInt sr_plot = 48000/10; // plot rate
+ sInt sr_plot = 44100/10; // plot rate
sInt sr_lfo = 800;
sInt w = 800, h = 150;

0 comments on commit a30e873

Please sign in to comment.