mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
* modules/audio_output/directx.c, modules/audio_output/waveout.c:
cosmetic changes.
This commit is contained in:
parent
032fff9adb
commit
a8b6aa3724
@ -2,7 +2,7 @@
|
||||
* directx.c: Windows DirectX audio output method
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2001 VideoLAN
|
||||
* $Id: directx.c,v 1.16 2003/03/30 18:14:36 gbazin Exp $
|
||||
* $Id: directx.c,v 1.17 2003/04/07 16:02:08 gbazin Exp $
|
||||
*
|
||||
* Authors: Gildas Bazin <gbazin@netcourrier.com>
|
||||
*
|
||||
@ -123,15 +123,9 @@ typedef struct {
|
||||
} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
|
||||
#endif
|
||||
|
||||
#ifndef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
|
||||
DEFINE_GUID( KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
#endif
|
||||
#ifndef KSDATAFORMAT_SUBTYPE_PCM
|
||||
DEFINE_GUID( KSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
#endif
|
||||
#ifndef KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF
|
||||
DEFINE_GUID( KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
#endif
|
||||
DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
|
||||
/*****************************************************************************
|
||||
* notification_thread_t: DirectX event thread
|
||||
@ -657,7 +651,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format,
|
||||
waveformat.Samples.wValidBitsPerSample =
|
||||
waveformat.Format.wBitsPerSample;
|
||||
waveformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF;
|
||||
waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
|
||||
waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
|
||||
break;
|
||||
|
||||
case VLC_FOURCC('f','l','3','2'):
|
||||
@ -665,7 +659,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format,
|
||||
waveformat.Samples.wValidBitsPerSample =
|
||||
waveformat.Format.wBitsPerSample;
|
||||
waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
|
||||
waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
|
||||
waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
|
||||
break;
|
||||
|
||||
case VLC_FOURCC('s','1','6','l'):
|
||||
@ -673,7 +667,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format,
|
||||
waveformat.Samples.wValidBitsPerSample =
|
||||
waveformat.Format.wBitsPerSample;
|
||||
waveformat.Format.wFormatTag = WAVE_FORMAT_PCM;
|
||||
waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
|
||||
waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_PCM;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
* waveout.c : Windows waveOut plugin for vlc
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2001 VideoLAN
|
||||
* $Id: waveout.c,v 1.21 2003/03/30 18:14:36 gbazin Exp $
|
||||
* $Id: waveout.c,v 1.22 2003/04/07 16:02:08 gbazin Exp $
|
||||
*
|
||||
* Authors: Gildas Bazin <gbazin@netcourrier.com>
|
||||
*
|
||||
@ -93,15 +93,9 @@ typedef struct {
|
||||
#endif
|
||||
|
||||
#include <initguid.h>
|
||||
#ifndef KKSDATAFORMAT_SUBTYPE_IEEE_FLOAT
|
||||
DEFINE_GUID( KKSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
#endif
|
||||
#ifndef KKSDATAFORMAT_SUBTYPE_PCM
|
||||
DEFINE_GUID( KKSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
#endif
|
||||
#ifndef KKSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF
|
||||
DEFINE_GUID( KKSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
#endif
|
||||
DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
|
||||
|
||||
/*****************************************************************************
|
||||
* Local prototypes
|
||||
@ -480,7 +474,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
|
||||
waveformat.Samples.wValidBitsPerSample =
|
||||
waveformat.Format.wBitsPerSample;
|
||||
waveformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF;
|
||||
waveformat.SubFormat = KKSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
|
||||
waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
|
||||
break;
|
||||
|
||||
case VLC_FOURCC('f','l','3','2'):
|
||||
@ -488,7 +482,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
|
||||
waveformat.Samples.wValidBitsPerSample =
|
||||
waveformat.Format.wBitsPerSample;
|
||||
waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
|
||||
waveformat.SubFormat = KKSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
|
||||
waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
|
||||
break;
|
||||
|
||||
case VLC_FOURCC('s','1','6','l'):
|
||||
@ -496,7 +490,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
|
||||
waveformat.Samples.wValidBitsPerSample =
|
||||
waveformat.Format.wBitsPerSample;
|
||||
waveformat.Format.wFormatTag = WAVE_FORMAT_PCM;
|
||||
waveformat.SubFormat = KKSDATAFORMAT_SUBTYPE_PCM;
|
||||
waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_PCM;
|
||||
break;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user