MotionDetect: check for NULLITY at the right place.

[vlc] / modules / audio_output / arts.c

diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c
index 68c926feafcfda0c34cfcacda1b3c4a7ed8a2494..169bad7be4e7a8a281cd44c8209feec81bd50879 100644 (file)
--- a/modules/audio_output/arts.c
+++ b/modules/audio_output/arts.c
@@ -25,11 +25,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string.h>                                            /* strerror() */
 #include <unistd.h>                                      /* write(), close() */
-#include <stdlib.h>                            /* calloc(), malloc(), free() */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 
 #include <artsc.h>
@@ -58,14 +61,14 @@ static void Play         ( aout_instance_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-   set_shortname( "aRts" );
-   set_description( _("aRts audio output") );
-   set_capability( "audio output", 50 );
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_AOUT );
-   set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+   set_shortname( "aRts" )
+   set_description( N_("aRts audio output") )
+   set_capability( "audio output", 50 )
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_AOUT )
+   set_callbacks( Open, Close )
+vlc_module_end ()
 
 /*****************************************************************************
  * Open: open an aRts socket
@@ -80,10 +83,7 @@ static int Open( vlc_object_t *p_this )
     /* Allocate structure */
     p_sys = malloc( sizeof( aout_sys_t ) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_aout, "out of memory" );
         return VLC_ENOMEM;
-    }
     p_aout->output.p_sys = p_sys;
 
     i_err = arts_init();