Qt4 - MainInterface cleaning, FIXME labelling, Simplification, put the delay of statu...

[vlc] / modules / gui / qnx / aout.c

diff --git a/modules/gui/qnx/aout.c b/modules/gui/qnx/aout.c
index 6198c24806a9480399149f3654ca8d61cd48e406..0c26661fc56fdd23a8df9282ffef6976535c8d96 100644 (file)
--- a/modules/gui/qnx/aout.c
+++ b/modules/gui/qnx/aout.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * aout.c : QNX audio output
  *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
+ * Copyright (C) 2000, 2001 the VideoLAN team
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -19,15 +19,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
 #include <errno.h>                                                 /* ENOMEM */
-#include <string.h>                                            /* strerror() */
-#include <stdlib.h>                            /* calloc(), malloc(), free() */
 
 #include <vlc/vlc.h>
 
@@ -35,8 +33,7 @@
 #   include <alloca.h>
 #endif
 
-#include <vlc/aout.h>
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 #include <sys/asoundlib.h>
 
@@ -70,6 +67,7 @@ int E_(OpenAudio)( vlc_object_t *p_this )
     aout_instance_t *p_aout = (aout_instance_t *)p_this;
     int i_ret;
     int i_bytes_per_sample;
+    int i_nb_channels;
     snd_pcm_channel_info_t pi;
     snd_pcm_channel_params_t pp;
     aout_instance_t *p_aout = (aout_instance_t *)p_this;
@@ -117,6 +115,8 @@ int E_(OpenAudio)( vlc_object_t *p_this )
     {
         msg_Err( p_aout, "unable to get plugin info (%s)",
                          snd_strerror( i_ret ) );
+        E_(CloseAudio)( p_this );
+        free( p_aout->output.p_sys );
         return -1;
     }
 
@@ -130,23 +130,20 @@ int E_(OpenAudio)( vlc_object_t *p_this )
 
     pp.format.interleave     = 1;
     pp.format.rate           = p_aout->output.output.i_rate;
-    pp.format.voices         = p_aout->output.output.i_channels;
-
-    p_aout->output.output.i_format = AOUT_FMT_S16_NE;
-    p_aout->output.i_nb_samples = DEFAULT_FRAME_SIZE;
 
-    switch( p_aout->output.output.i_format )
+    i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
+    if ( i_nb_channels > 2 )
     {
-        case AOUT_FMT_S16_LE:
-            pp.format.format = SND_PCM_SFMT_S16_LE;
-            i_bytes_per_sample = 2;
-            break;
-
-        default:
-            pp.format.format = SND_PCM_SFMT_S16_BE;
-            i_bytes_per_sample = 2;
-            break;
+        /* I don't know if QNX supports more than two channels. */
+        i_nb_channels = 2;
+        p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
     }
+    pp.format.voices         = i_nb_channels;
+
+    p_aout->output.output.i_format = AOUT_FMT_S16_NE;
+    p_aout->output.i_nb_samples = DEFAULT_FRAME_SIZE;
+    pp.format.format = SND_PCM_SFMT_S16;
+    i_bytes_per_sample = 2;
 
     pp.buf.block.frag_size = p_aout->output.i_nb_samples *
                             p_aout->output.output.i_channels *
@@ -157,6 +154,8 @@ int E_(OpenAudio)( vlc_object_t *p_this )
                                          &pp ) ) < 0 )
     {
         msg_Err( p_aout, "unable to set parameters (%s)", snd_strerror(i_ret) );
+        E_(CloseAudio)( p_this );
+        free( p_aout->output.p_sys );
         return -1;
     }
 
@@ -166,6 +165,8 @@ int E_(OpenAudio)( vlc_object_t *p_this )
     {
         msg_Err( p_aout, "unable to prepare channel (%s)",
                          snd_strerror( i_ret ) );
+        E_(CloseAudio)( p_this );
+        free( p_aout->output.p_sys );
         return -1;
     }
 
@@ -173,7 +174,7 @@ int E_(OpenAudio)( vlc_object_t *p_this )
     if( vlc_thread_create( p_aout, "aout", QNXaoutThread,
                            VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
     {
-        msg_Err( p_aout, "cannot create QNX audio thread (%s)", strerror(errno) );
+        msg_Err( p_aout, "cannot create QNX audio thread (%m)" );
         E_(CloseAudio)( p_this );
         free( p_aout->output.p_sys );
         return -1;
@@ -239,7 +240,7 @@ void E_(CloseAudio) ( vlc_object_t *p_this )
     aout_instance_t *p_aout = (aout_instance_t *)p_this;
     int i_ret;
 
-    p_aout->b_die = 1;
+    vlc_object_kill( p_aout );
     vlc_thread_join( p_aout );
 
     if( ( i_ret = snd_pcm_close( p_aout->output.p_sys->p_pcm_handle ) ) < 0 )
@@ -306,7 +307,7 @@ static int QNXaoutThread( aout_instance_t * p_aout )
 
         if( i_tmp < 0 )
         {
-            msg_Err( p_aout, "write failed (%s)", strerror(errno) );
+            msg_Err( p_aout, "write failed (%m)" );
         }
 
         if ( p_buffer != NULL )