X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fhd1000a.cpp;h=38d71773f685893bad5035943ed5b8bf4e3ba7b9;hb=e2bc2640b7206726c14bb7c145df1e9e72f49289;hp=5b0fa8242737525cab3cb421181cfbd12e100fb8;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp
index 5b0fa82427..38d71773f6 100644
--- a/modules/audio_output/hd1000a.cpp
+++ b/modules/audio_output/hd1000a.cpp
@@ -26,12 +26,14 @@
  *****************************************************************************/
 extern "C"
 {
-#include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
+#include <vlc_aout.h>
 
 #include "aout_internal.h"
 }
@@ -73,7 +75,7 @@ static void    InterleaveS16( int16_t *, int16_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_shortname( "Roku HD1000" );
-    set_description( N_("Roku HD1000 audio output") );
+    set_description( _("Roku HD1000 audio output") );
     set_capability( "audio output", 100 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
@@ -117,7 +119,7 @@ static int Open( vlc_object_t * p_this )
         delete pPlayer;
         free( p_sys );
         return VLC_EGENERIC;
-    } 
+    }
 
     p_sys->nBuffers = __MIN( p_sys->nBuffers, 4 );
 
@@ -165,14 +167,14 @@ static int Open( vlc_object_t * p_this )
     p_aout->output.pf_play = Play;
     aout_VolumeSoftInit( p_aout );
 
-    i_volume = config_GetInt( p_aout->p_vlc, "volume" );
+    i_volume = config_GetInt( p_aout->p_libvlc, "volume" );
     pPlayer->SetVolume( (u32)__MIN( i_volume * 64, 0xFFFF ) );
 
     /* Create thread and wait for its readiness. */
     if( vlc_thread_create( p_aout, "aout", Thread,
                            VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
     {
-        msg_Err( p_aout, "cannot create OSS thread (%s)", strerror(errno) );
+        msg_Err( p_aout, "cannot create OSS thread (%m)" );
         pPlayer->Close();
         delete pPlayer;
         free( p_sys->ppBuffers );
@@ -192,7 +194,7 @@ static void Close( vlc_object_t * p_this )
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
     struct aout_sys_t * p_sys = p_aout->output.p_sys;
 
-    p_aout->b_die = VLC_TRUE;
+    vlc_object_kill( p_aout );
     vlc_thread_join( p_aout );
     p_aout->b_die = VLC_FALSE;
 
@@ -235,8 +237,8 @@ static int Thread( aout_instance_t * p_aout )
 #define i p_sys->nNextBufferIndex
         if( p_buffer == NULL )
         {
-            p_aout->p_vlc->pf_memset( p_sys->ppBuffers[ i ], 0,
-                                      p_sys->nBufferSize ); 
+            p_aout->p_libvlc->pf_memset( p_sys->ppBuffers[ i ], 0,
+                                      p_sys->nBufferSize );
         }
         else
         {
@@ -249,7 +251,7 @@ static int Thread( aout_instance_t * p_aout )
                                    p_sys->nBufferSize / 2 ) )
         {
             msg_Err( p_aout, "QueueBuffer failed" );
-        } 
+        }
 
         i = (i + 1) % p_sys->nBuffers;
 #undef i