From 92ca6dbcd4fc008247f3b359d6ece28e74e6c250 Mon Sep 17 00:00:00 2001 From: Michał Cichoń Date: Sun, 24 Jun 2012 21:22:33 +0200 Subject: Sync build environment. --- .gitignore | 2 ++ libao/src/src/ao_wmm.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c1fb33e..9e06286 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ *.user *.suo *.ncb +*.sdf +/ipch diff --git a/libao/src/src/ao_wmm.c b/libao/src/src/ao_wmm.c index 7cd05f1..297751b 100644 --- a/libao/src/src/ao_wmm.c +++ b/libao/src/src/ao_wmm.c @@ -42,11 +42,11 @@ #include #include -//#ifndef KSDATAFORMAT_SUBTYPE_PCM -//#define KSDATAFORMAT_SUBTYPE_PCM (GUID) {0x00000001,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}} +//#ifndef __KSDATAFORMAT_SUBTYPE_PCM +//#define __KSDATAFORMAT_SUBTYPE_PCM (GUID) {0x00000001,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}} //#endif -GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}; +static GUID __KSDATAFORMAT_SUBTYPE_PCM = {0x00000001,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}; #include "ao/ao.h" @@ -432,7 +432,7 @@ int ao_wmm_open(ao_device * device, ao_sample_format * format) wavefmt.Format.nAvgBytesPerSec = wavefmt.Format.nSamplesPerSec*wavefmt.Format.nBlockAlign; wavefmt.Format.cbSize = 22; wavefmt.Samples.wValidBitsPerSample = format->bits; - wavefmt.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wavefmt.SubFormat = __KSDATAFORMAT_SUBTYPE_PCM; wavefmt.dwChannelMask = device->output_mask; internal->wavefmt = wavefmt; -- cgit v1.2.3