Skip to content

V
vlc-gpu
Commit bc503606 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

DirectSound: be more restrictive and fix warning

parent 3f489ac9
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/audio_output/directx.c
View file @ bc503606
/***************************************************************************** /*****************************************************************************
* directx.c: Windows DirectX audio output method * directx.c: Windows DirectX audio output method
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 the VideoLAN team * Copyright (C) 2001-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
...@@ -210,7 +210,7 @@ static void Play ( aout_instance_t * ); ...@@ -210,7 +210,7 @@ static void Play ( aout_instance_t * );
static void Probe ( aout_instance_t * ); static void Probe ( aout_instance_t * );
static int InitDirectSound ( aout_instance_t * ); static int InitDirectSound ( aout_instance_t * );
static int CreateDSBuffer ( aout_instance_t *, int, int, int, int, int, bool ); static int CreateDSBuffer ( aout_instance_t *, int, int, int, int, int, bool );
static int CreateDSBufferPCM ( aout_instance_t *, int*, int, int, int, bool ); static int CreateDSBufferPCM ( aout_instance_t *, vlc_fourcc_t*, int, int, int, bool );
static void DestroyDSBuffer ( aout_instance_t * ); static void DestroyDSBuffer ( aout_instance_t * );
static void* DirectSoundThread( vlc_object_t * ); static void* DirectSoundThread( vlc_object_t * );
static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * ); static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * );
...@@ -448,7 +448,7 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -448,7 +448,7 @@ static int OpenAudio( vlc_object_t *p_this )
static void Probe( aout_instance_t * p_aout ) static void Probe( aout_instance_t * p_aout )
{ {
vlc_value_t val, text; vlc_value_t val, text;
int i_format; vlc_fourcc_t i_format;
unsigned int i_physical_channels; unsigned int i_physical_channels;
DWORD ui_speaker_config; DWORD ui_speaker_config;
bool is_default_output_set = false; bool is_default_output_set = false;
...@@ -984,7 +984,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, ...@@ -984,7 +984,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format,
* We first try to create a WAVE_FORMAT_IEEE_FLOAT buffer if supported by * We first try to create a WAVE_FORMAT_IEEE_FLOAT buffer if supported by
* the hardware, otherwise we create a WAVE_FORMAT_PCM buffer. * the hardware, otherwise we create a WAVE_FORMAT_PCM buffer.
****************************************************************************/ ****************************************************************************/
static int CreateDSBufferPCM( aout_instance_t *p_aout, int *i_format, static int CreateDSBufferPCM( aout_instance_t *p_aout, vlc_fourcc_t *i_format,
int i_channels, int i_nb_channels, int i_rate, int i_channels, int i_nb_channels, int i_rate,
bool b_probe ) bool b_probe )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment