* modules/audio_output/waveout.c: compilation fix for --disable-plugins build.

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 025338c7cc7ff76d64d7865c6999db50279e8ae9..1a70b9e5b0d30fb00e7d701572ccc527f0a1e15a 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -2,7 +2,7 @@
  * output.c : internal management of output streams for the audio output
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: output.c,v 1.24 2002/11/14 22:38:48 massiot Exp $
+ * $Id: output.c,v 1.36 2003/02/08 17:26:00 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -43,6 +43,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
     /* Retrieve user defaults. */
     char * psz_name = config_GetPsz( p_aout, "aout" );
     int i_rate = config_GetInt( p_aout, "aout-rate" );
+    vlc_value_t val;
 
     memcpy( &p_aout->output.output, p_format, sizeof(audio_sample_format_t) );
     if ( i_rate != -1 )
@@ -63,82 +64,98 @@ int aout_OutputNew( aout_instance_t * p_aout,
     }
 
     if ( var_Type( p_aout, "audio-channels" ) ==
-             (VLC_VAR_STRING | VLC_VAR_ISLIST) )
+             (VLC_VAR_STRING | VLC_VAR_HASCHOICE) )
     {
         /* The user may have selected a different channels configuration. */
-        vlc_value_t val;
         var_Get( p_aout, "audio-channels", &val );
 
-        if ( !strcmp( val.psz_string, N_("Both") ) )
+        if ( !strcmp( val.psz_string, _("Reverse stereo") ) )
+        {
+            p_aout->output.output.i_original_channels |=
+                                        AOUT_CHAN_REVERSESTEREO;
+        }
+        else if ( !strcmp( val.psz_string, _("Stereo") ) )
         {
             p_aout->output.output.i_original_channels =
                 AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
         }
-        else if ( !strcmp( val.psz_string, N_("Left") ) )
+        else if ( !strcmp( val.psz_string, _("Left") ) )
         {
             p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT;
         }
-        else if ( !strcmp( val.psz_string, N_("Right") ) )
+        else if ( !strcmp( val.psz_string, _("Right") ) )
         {
             p_aout->output.output.i_original_channels = AOUT_CHAN_RIGHT;
         }
-        else if ( !strcmp( val.psz_string, N_("Dolby Surround") ) )
+        else if ( !strcmp( val.psz_string, _("Dolby Surround") ) )
         {
             p_aout->output.output.i_original_channels
                 = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_DOLBYSTEREO;
         }
         free( val.psz_string );
     }
-    else if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER )
+    else if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER
+              && (p_aout->output.output.i_original_channels
+                   & AOUT_CHAN_PHYSMASK) == (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
     {
         /* Mono - create the audio-channels variable. */
-        vlc_value_t val;
-        var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_ISLIST );
+        var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
+        val.psz_string = _("Stereo");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
+        val.psz_string = _("Left");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
+        val.psz_string = _("Right");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
         if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DUALMONO )
         {
             /* Go directly to the left channel. */
             p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT;
+            val.psz_string = _("Left");
+            var_Set( p_aout, "audio-channels", val );
         }
-        else
-        {
-            val.psz_string = N_("Both");
-            var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
-        }
-        val.psz_string = N_("Left");
-        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
-        val.psz_string = N_("Right");
-        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
         var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
                          NULL );
     }
-    else if ( p_aout->output.output.i_physical_channels == 
-                 (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
-              && p_aout->output.output.i_original_channels == 
-                 (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
+    else if ( p_aout->output.output.i_physical_channels ==
+               (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
+                && (p_aout->output.output.i_original_channels &
+                     (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
     {
         /* Stereo - create the audio-channels variable. */
-        vlc_value_t val;
-        var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_ISLIST );
-        val.psz_string = N_("Both");
+        var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
+        if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+        {
+            val.psz_string = _("Dolby Surround");
+        }
+        else
+        {
+            val.psz_string = _("Stereo");
+        }
         var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
-        val.psz_string = N_("Left");
+        val.psz_string = _("Left");
         var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
-        val.psz_string = N_("Right");
+        val.psz_string = _("Right");
         var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
-        if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+        val.psz_string = _("Reverse stereo");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
+        if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DUALMONO )
         {
-            val.psz_string = N_("Dolby Surround");
-            var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
+            /* Go directly to the left channel. */
+            p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT;
+            val.psz_string = _("Left");
+            var_Set( p_aout, "audio-channels", val );
         }
-        p_aout->output.output.i_original_channels &= ~AOUT_CHAN_DOLBYSTEREO;
         var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
                          NULL );
     }
+    val.b_bool = VLC_TRUE;
+    var_Set( p_aout, "intf-change", val );
 
     aout_FormatPrepare( &p_aout->output.output );
 
     /* Prepare FIFO. */
-    aout_FifoInit( p_aout, &p_aout->output.fifo, p_aout->output.output.i_rate );
+    aout_FifoInit( p_aout, &p_aout->output.fifo,
+                   p_aout->output.output.i_rate );
 
     vlc_mutex_unlock( &p_aout->output_fifo_lock );
 
@@ -185,6 +202,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
                              p_aout->output.i_nb_filters,
                              &p_aout->mixer.output_alloc );
 
+    p_aout->output.b_error = 0;
     return 0;
 }
 
@@ -195,11 +213,18 @@ int aout_OutputNew( aout_instance_t * p_aout,
  *****************************************************************************/
 void aout_OutputDelete( aout_instance_t * p_aout )
 {
+    if ( p_aout->output.b_error )
+    {
+        return;
+    }
+
     module_Unneed( p_aout, p_aout->output.p_module );
 
     aout_FiltersDestroyPipeline( p_aout, p_aout->output.pp_filters,
                                  p_aout->output.i_nb_filters );
     aout_FifoDestroy( p_aout, &p_aout->output.fifo );
+
+    p_aout->output.b_error = VLC_TRUE;
 }
 
 /*****************************************************************************
@@ -242,9 +267,10 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
                  "trashing "I64Fd"us", mdate() - p_buffer->start_date,
                  p_buffer->end_date - p_buffer->start_date );
         p_buffer = p_buffer->p_next;
+        aout_BufferFree( p_aout->output.fifo.p_first );
+        p_aout->output.fifo.p_first = p_buffer;
     }
 
-    p_aout->output.fifo.p_first = p_buffer;
     if ( p_buffer == NULL )
     {
         p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;