← Back to branch summary

~random-stuff/random-stuff/snes9x-OLD

« back to all changes in this revision

Viewing changes to win32/win32_sound.cpp

  • Committer: OV2
  • Date: 2010-09-25 17:35:19 UTC
  • mto: This revision was merged to the branch mainline in revision 35.
  • Revision ID: git-v1:d0b9becaabebf34cc17091f240c8b737101e6ca2
Import latest win32-dev changes

OpengGL support
full unicode support
x64 build support
shader support (D3D+OGL)
DDraw: vsync, dynamic buffer allocation
restored SPC save option
better window position saving
fixed crash during fullscreen switch

Show diffs side-by-side

added added

removed removed

Lines of Context:
win32/win32_sound.cpp
187
187
#pragma comment(linker,"/DEFAULTLIB:fmodvc.lib")
188
188
#elif defined FMODEX_SUPPORT
189
189
#include "CFMODEx.h"
 
190
#if defined(_WIN64)
 
191
#pragma comment(linker,"/DEFAULTLIB:fmodex64_vc.lib")
 
192
#else
190
193
#pragma comment(linker,"/DEFAULTLIB:fmodex_vc.lib")
191
 
#endif
 
194
#endif // _WIN64
 
195
#endif // FMODEX_SUPPORT
192
196
 
193
197
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
194
198
 
253
257
                        S9xSoundOutput = &S9xFMODEx;
254
258
                        break;
255
259
#endif
256
 
                        case WIN_XAUDIO2_SOUND_DRIVER:
 
260
                case WIN_XAUDIO2_SOUND_DRIVER:
257
261
                        S9xSoundOutput = &S9xXAudio2;
258
262
                        break;
259
263
                default:        // we default to DirectSound
272
276
void S9xSoundCallback(void *data)
273
277
{       
274
278
        S9xSoundOutput->ProcessSound();
275
 
}
 
 
b'\\ No newline at end of file'
 
279
}