* modules/codec/quicktime.c: cleaning up of the code. mostly cosmetic.

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 555b4dd4c6af2846d8468c866dc1dceb96ad810c..3fcf77695b10c6ced6292b64275f9397668f8a8a 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.35 2003/01/28 12:23:40 massiot Exp $
+ * $Id: output.c,v 1.40 2003/05/11 01:00:26 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -43,7 +43,9 @@ 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;
+    vlc_value_t val, text;
+    /* kludge to avoid a fpu error when rate is 0... */
+    if( i_rate == 0 ) i_rate = -1;
 
     memcpy( &p_aout->output.output, p_format, sizeof(audio_sample_format_t) );
     if ( i_rate != -1 )
@@ -53,8 +55,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
     vlc_mutex_lock( &p_aout->output_fifo_lock );
 
     /* Find the best output plug-in. */
-    p_aout->output.p_module = module_Need( p_aout, "audio output",
-                                           psz_name );
+    p_aout->output.p_module = module_Need( p_aout, "audio output", psz_name );
     if ( psz_name != NULL ) free( psz_name );
     if ( p_aout->output.p_module == NULL )
     {
@@ -64,53 +65,56 @@ int aout_OutputNew( aout_instance_t * p_aout,
     }
 
     if ( var_Type( p_aout, "audio-channels" ) ==
-             (VLC_VAR_STRING | VLC_VAR_HASCHOICE) )
+             (VLC_VAR_INTEGER | VLC_VAR_HASCHOICE) )
     {
         /* The user may have selected a different channels configuration. */
         var_Get( p_aout, "audio-channels", &val );
 
-        if ( !strcmp( val.psz_string, N_("Reverse stereo") ) )
+        if ( val.i_int == AOUT_VAR_CHAN_RSTEREO )
         {
             p_aout->output.output.i_original_channels |=
                                         AOUT_CHAN_REVERSESTEREO;
         }
-        else if ( !strcmp( val.psz_string, N_("Both") ) )
+        else if ( val.i_int == AOUT_VAR_CHAN_STEREO )
         {
             p_aout->output.output.i_original_channels =
                 AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
         }
-        else if ( !strcmp( val.psz_string, N_("Left") ) )
+        else if ( val.i_int == AOUT_VAR_CHAN_LEFT )
         {
             p_aout->output.output.i_original_channels = AOUT_CHAN_LEFT;
         }
-        else if ( !strcmp( val.psz_string, N_("Right") ) )
+        else if ( val.i_int == AOUT_VAR_CHAN_RIGHT )
         {
             p_aout->output.output.i_original_channels = AOUT_CHAN_RIGHT;
         }
-        else if ( !strcmp( val.psz_string, N_("Dolby Surround") ) )
+        else if ( val.i_int == AOUT_VAR_CHAN_DOLBYS )
         {
             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
               && (p_aout->output.output.i_original_channels
                    & AOUT_CHAN_PHYSMASK) == (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
     {
         /* Mono - create the audio-channels variable. */
-        var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
-        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_Create( p_aout, "audio-channels",
+                    VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+        text.psz_string = _("Audio channels");
+        var_Change( p_aout, "audio-channels", VLC_VAR_SETTEXT, &text, NULL );
+
+        val.i_int = AOUT_VAR_CHAN_STEREO; text.psz_string = _("Stereo");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text );
+        val.i_int = AOUT_VAR_CHAN_LEFT; text.psz_string = _("Left");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text );
+        val.i_int = AOUT_VAR_CHAN_RIGHT; text.psz_string = _("Right");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text );
         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 = N_("Left");
+            val.i_int = AOUT_VAR_CHAN_LEFT;
             var_Set( p_aout, "audio-channels", val );
         }
         var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
@@ -122,27 +126,33 @@ int aout_OutputNew( aout_instance_t * p_aout,
                      (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
     {
         /* Stereo - create the audio-channels variable. */
-        var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
+        var_Create( p_aout, "audio-channels",
+                    VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+        text.psz_string = _("Audio channels");
+        var_Change( p_aout, "audio-channels", VLC_VAR_SETTEXT, &text, NULL );
+
         if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
         {
-            val.psz_string = N_("Dolby Surround");
+            val.i_int = AOUT_VAR_CHAN_DOLBYS;
+            text.psz_string = _("Dolby Surround");
         }
         else
         {
-            val.psz_string = N_("Both");
+            val.i_int = AOUT_VAR_CHAN_STEREO;
+            text.psz_string = _("Stereo");
         }
-        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 );
-        val.psz_string = N_("Reverse stereo");
-        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text );
+        val.i_int = AOUT_VAR_CHAN_LEFT; text.psz_string = _("Left");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text );
+        val.i_int = AOUT_VAR_CHAN_RIGHT; text.psz_string = _("Right");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text );
+        val.i_int = AOUT_VAR_CHAN_RSTEREO; text.psz_string=_("Reverse stereo");
+        var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val, &text );
         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 = N_("Left");
+            val.i_int = AOUT_VAR_CHAN_LEFT;
             var_Set( p_aout, "audio-channels", val );
         }
         var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
@@ -261,7 +271,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
     vlc_mutex_lock( &p_aout->output_fifo_lock );
 
     p_buffer = p_aout->output.fifo.p_first;
-    while ( p_buffer && p_buffer->start_date < mdate() )
+    while ( p_buffer && p_buffer->start_date < mdate() - AOUT_PTS_TOLERANCE )
     {
         msg_Dbg( p_aout, "audio output is too slow ("I64Fd"), "
                  "trashing "I64Fd"us", mdate() - p_buffer->start_date,
@@ -294,7 +304,8 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
     /* Here we suppose that all buffers have the same duration - this is
      * generally true, and anyway if it's wrong it won't be a disaster. */
     if ( p_buffer->start_date > start_date
-                         + (p_buffer->end_date - p_buffer->start_date) )
+                         + (p_buffer->end_date - p_buffer->start_date)
+                         + AOUT_PTS_TOLERANCE )
     {
         vlc_mutex_unlock( &p_aout->output_fifo_lock );
         if ( !p_aout->output.b_starving )