X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=929aeacb7e6faacd16f17f787bf5fa0c2d626c49;hb=19933fe7a674ee6d1253821a656507a6a712f8d0;hp=8d5a3246c1713c8d3a532236cc97d58b3c94cff6;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 8d5a3246c1..929aeacb7e 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -26,16 +26,18 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
-#include <fcntl.h>                                       /* open(), O_WRONLY */
-#include <sys/ioctl.h>                                            /* ioctl() */
-#include <unistd.h>                                      /* write(), close() */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <errno.h>                                                 /* ENOMEM */
+#include <fcntl.h>                                       /* open(), O_WRONLY */
+#include <sys/ioctl.h>                                            /* ioctl() */
+#include <unistd.h>                                      /* write(), close() */
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
@@ -106,7 +108,7 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
 
 vlc_module_begin();
     set_shortname( "OSS" );
-    set_description( _("UNIX OSS audio output") );
+    set_description( N_("UNIX OSS audio output") );
 
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
@@ -278,10 +280,7 @@ static int Open( vlc_object_t *p_this )
     /* Allocate structure */
     p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_aout, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     /* Get device name */
     if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL )
@@ -300,6 +299,7 @@ static int Open( vlc_object_t *p_this )
     if( p_sys->i_fd < 0 )
     {
         msg_Err( p_aout, "cannot open audio device (%s)", psz_device );
+        free( psz_device );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -590,11 +590,11 @@ static int OSSThread( aout_instance_t * p_aout )
     struct aout_sys_t * p_sys = p_aout->output.p_sys;
     mtime_t next_date = 0;
 
-    while ( !p_aout->b_die )
+    while ( vlc_object_alive (p_aout) )
     {
         aout_buffer_t * p_buffer = NULL;
         int i_tmp, i_size;
-        byte_t * p_bytes;
+        uint8_t * p_bytes;
 
         if ( p_aout->output.output.i_format != VLC_FOURCC('s','p','d','i') )
         {
@@ -647,7 +647,7 @@ static int OSSThread( aout_instance_t * p_aout )
                 }
             }
 
-            while( !p_aout->b_die && ! ( p_buffer =
+            while( vlc_object_alive (p_aout) && ! ( p_buffer =
                 aout_OutputNextBuffer( p_aout, next_date, true ) ) )
             {
                 msleep( 1000 );