git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4bfba26
)
Fix PortAudio warnings
author
Jean-Baptiste Kempf
<jb@videolan.org>
Thu, 20 Aug 2009 15:52:00 +0000
(17:52 +0200)
committer
Jean-Baptiste Kempf
<jb@videolan.org>
Thu, 20 Aug 2009 18:38:03 +0000
(20:38 +0200)
modules/audio_output/portaudio.c
patch
|
blob
|
history
diff --git
a/modules/audio_output/portaudio.c
b/modules/audio_output/portaudio.c
index
9611a22
..
a4459ca
100644
(file)
--- a/
modules/audio_output/portaudio.c
+++ b/
modules/audio_output/portaudio.c
@@
-126,6
+126,8
@@
static int paCallback( const void *inputBuffer, void *outputBuffer,
const PaStreamCallbackTimeInfo *paDate,
PaStreamCallbackFlags statusFlags, void *p_cookie )
{
const PaStreamCallbackTimeInfo *paDate,
PaStreamCallbackFlags statusFlags, void *p_cookie )
{
+ VLC_UNUSED( inputBuffer ); VLC_UNUSED( statusFlags );
+
struct aout_sys_t *p_sys = (struct aout_sys_t*) p_cookie;
aout_instance_t *p_aout = p_sys->p_aout;
aout_buffer_t *p_buffer;
struct aout_sys_t *p_sys = (struct aout_sys_t*) p_cookie;
aout_instance_t *p_aout = p_sys->p_aout;
aout_buffer_t *p_buffer;
@@
-169,7
+171,6
@@
static int Open( vlc_object_t * p_this )
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys;
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys;
- int i_err;
msg_Dbg( p_aout, "entering Open()");
msg_Dbg( p_aout, "entering Open()");
@@
-188,6
+189,8
@@
static int Open( vlc_object_t * p_this )
#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
if( !b_init )
{
#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
if( !b_init )
{
+ int i_err;
+
/* Test device */
if( PAOpenDevice( p_aout ) != VLC_SUCCESS )
{
/* Test device */
if( PAOpenDevice( p_aout ) != VLC_SUCCESS )
{