Mercurial > mplayer.hg
comparison libao2/ao_dsound.c @ 30612:ed1000201cd0
Remove pointless '#if 1' preprocessor directives.
| author | diego |
|---|---|
| date | Fri, 19 Feb 2010 10:22:29 +0000 |
| parents | 02b9c1a452e1 |
| children | 539bfa51eb72 |
comparison
equal
deleted
inserted
replaced
| 30611:8e3c8ca13b4c | 30612:ed1000201cd0 |
|---|---|
| 53 LIBAO_EXTERN(dsound) | 53 LIBAO_EXTERN(dsound) |
| 54 | 54 |
| 55 /** | 55 /** |
| 56 \todo use the definitions from the win32 api headers when they define these | 56 \todo use the definitions from the win32 api headers when they define these |
| 57 */ | 57 */ |
| 58 #if 1 | |
| 59 #define WAVE_FORMAT_IEEE_FLOAT 0x0003 | 58 #define WAVE_FORMAT_IEEE_FLOAT 0x0003 |
| 60 #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 | 59 #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 |
| 61 #define WAVE_FORMAT_EXTENSIBLE 0xFFFE | 60 #define WAVE_FORMAT_EXTENSIBLE 0xFFFE |
| 62 | 61 |
| 63 static const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x1,0x0000,0x0010, {0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}; | 62 static const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x1,0x0000,0x0010, {0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}; |
| 99 } Samples; | 98 } Samples; |
| 100 DWORD dwChannelMask; /* which channels are */ | 99 DWORD dwChannelMask; /* which channels are */ |
| 101 /* present in stream */ | 100 /* present in stream */ |
| 102 GUID SubFormat; | 101 GUID SubFormat; |
| 103 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; | 102 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; |
| 104 #endif | |
| 105 | |
| 106 #endif | 103 #endif |
| 107 | 104 |
| 108 static const int channel_mask[] = { | 105 static const int channel_mask[] = { |
| 109 SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY, | 106 SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY, |
| 110 SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT, | 107 SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT, |