summaryrefslogtreecommitdiff
path: root/src/audio_out/audio_directx2_out.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio_out/audio_directx2_out.c')
-rw-r--r--src/audio_out/audio_directx2_out.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
index d853837ab..5a1929203 100644
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -142,9 +142,13 @@ typedef struct {
* Defining them here allows us to get rid of the dxguid library during
* the linking stage.
*****************************************************************************/
-static const GUID IID_IDirectSoundNotify = {
+static const GUID xine_IID_IDirectSoundNotify = {
0xB0210783, 0x89CD, 0x11D0, {0xAF, 0x08, 0x00, 0xA0, 0xC9, 0x25, 0xCD, 0x16}
};
+#ifdef IID_IDirectSoundNotify
+# undef IID_IDirectSoundNotify
+#endif
+#define IID_IDirectSoundNotify xine_IID_IDirectSoundNotify
@@ -549,8 +553,6 @@ static size_t buffer_occupied_size(dx2_driver_t *this) {
/* service thread working with direct sound buffer */
static void *buffer_service(void *data) {
dx2_driver_t *this = (dx2_driver_t *)data;
- DWORD ret;
- size_t play_pos;
size_t buffer_min;
size_t data_in_buffer;