DirectSound: correct include order

[vlc] / modules / audio_output / portaudio.c

diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c
index 3d45502cd0356b2c6c56080bca3b0a1f09ae2f38..8d9897284c9a6176103aa1767ec6f9efe1a0b040 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -57,6 +57,7 @@ typedef struct pa_thread_t
     vlc_cond_t  signal;
     vlc_mutex_t lock_signal;
     bool  b_signal;
+    bool  b_error;
 
 } pa_thread_t;
 
@@ -110,7 +111,7 @@ vlc_module_begin ()
     set_description( N_("PORTAUDIO audio output") )
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
-    add_integer( "portaudio-audio-device", 0, NULL,
+    add_integer( "portaudio-audio-device", 0,
                  DEVICE_TEXT, DEVICE_LONGTEXT, false )
         add_deprecated_alias( "portaudio-device" )   /* deprecated since 0.9.3 */
     set_capability( "audio output", 0 )
@@ -219,7 +220,7 @@ static int Open( vlc_object_t * p_this )
         pa_thread->b_signal = false;
 
         /* Create PORTAUDIOThread */
-        if( vlc_thread_create( pa_thread, "aout", PORTAUDIOThread,
+        if( vlc_thread_create( pa_thread, PORTAUDIOThread,
                                VLC_THREAD_PRIORITY_OUTPUT ) )
         {
             msg_Err( p_aout, "cannot create PORTAUDIO thread" );
@@ -433,7 +434,7 @@ static int PAOpenDevice( aout_instance_t *p_aout )
         }
 
         var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
-        var_SetBool( p_aout, "intf-change", true );
+        var_TriggerCallback( p_aout, "intf-change" );
     }
 
     /* Audio format is paFloat32 (always supported by portaudio v19) */