diff options
| author | Michał Cichoń <michcic@gmail.com> | 2012-06-24 21:22:33 +0200 |
|---|---|---|
| committer | Michał Cichoń <michcic@gmail.com> | 2012-06-24 21:22:33 +0200 |
| commit | 92ca6dbcd4fc008247f3b359d6ece28e74e6c250 (patch) | |
| tree | 23fdfd16f3d6fe1edee9a1f862751dbf2e86929a | |
| parent | 108d85760f95f44fb90d603166b28fcbdfd813e4 (diff) | |
| download | pianobar-windows-build-92ca6dbcd4fc008247f3b359d6ece28e74e6c250.tar.gz pianobar-windows-build-92ca6dbcd4fc008247f3b359d6ece28e74e6c250.tar.bz2 pianobar-windows-build-92ca6dbcd4fc008247f3b359d6ece28e74e6c250.zip | |
Sync build environment.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | libao/src/src/ao_wmm.c | 8 |
2 files changed, 6 insertions, 4 deletions
@@ -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 <stdarg.h> #include <stdio.h> -//#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; |