Use var_InheritString for --decklink-video-connection.

[vlc] / modules / audio_mixer / trivial.c

diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c
index d943ed1dc6b51375f8d6373895709df6cf981a8c..de911673422325b6164f582bff361c5ebab86572 100644 (file)
--- a/modules/audio_mixer/trivial.c
+++ b/modules/audio_mixer/trivial.c
@@ -18,51 +18,54 @@
  *
  * 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 <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
 static int  Create    ( vlc_object_t * );
 
-static void DoWork    ( aout_instance_t *, aout_buffer_t * );
+static void DoWork    ( aout_mixer_t *, aout_buffer_t * );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_MISC );
-    set_description( _("Trivial audio mixer") );
-    set_capability( "audio mixer", 1 );
-    set_callbacks( Create, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_MISC )
+    set_description( N_("Trivial audio mixer") )
+    set_capability( "audio mixer", 1 )
+    set_callbacks( Create, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  * Create: allocate trivial mixer
  *****************************************************************************/
 static int Create( vlc_object_t *p_this )
 {
-    aout_instance_t * p_aout = (aout_instance_t *)p_this;
+    aout_mixer_t *p_mixer = (aout_mixer_t *)p_this;
 
-    if ( p_aout->mixer.mixer.i_format != VLC_FOURCC('f','l','3','2')
-          && p_aout->mixer.mixer.i_format != VLC_FOURCC('f','i','3','2') )
+    if ( p_mixer->fmt.i_format != VLC_CODEC_FL32
+          && p_mixer->fmt.i_format != VLC_CODEC_FI32 )
     {
         return -1;
     }
 
-    p_aout->mixer.pf_do_work = DoWork;
+    p_mixer->mix = DoWork;
 
     return 0;
 }
@@ -70,23 +73,23 @@ static int Create( vlc_object_t *p_this )
 /*****************************************************************************
  * DoWork: mix a new output buffer
  *****************************************************************************/
-static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
+static void DoWork( aout_mixer_t *p_mixer, aout_buffer_t * p_buffer )
 {
-    int i = 0;
-    aout_input_t * p_input = p_aout->pp_inputs[i];
-    int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
-    int i_nb_bytes = p_buffer->i_nb_samples * sizeof(int32_t)
+    unsigned i = 0;
+    aout_mixer_input_t * p_input = p_mixer->input[i];
+    int i_nb_channels = aout_FormatNbChannels( &p_mixer->fmt );
+    int i_buffer = p_buffer->i_nb_samples * sizeof(int32_t)
                       * i_nb_channels;
-    byte_t * p_in;
-    byte_t * p_out;
+    uint8_t * p_in;
+    uint8_t * p_out;
 
-    while ( p_input->b_error )
+    while ( p_input->is_invalid )
     {
-        p_input = p_aout->pp_inputs[++i];
+        p_input = p_mixer->input[++i];
         /* This can't crash because if no input has b_error == 0, the
          * audio mixer cannot run and we can't be here. */
     }
-    p_in = p_input->p_first_byte_to_mix;
+    p_in = p_input->begin;
     p_out = p_buffer->p_buffer;
 
     for ( ; ; )
@@ -97,42 +100,41 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
                                            * sizeof(int32_t)
                                            * i_nb_channels;
 
-        if ( i_available_bytes < i_nb_bytes )
+        if ( i_available_bytes < i_buffer )
         {
             aout_buffer_t * p_old_buffer;
 
-            if ( i_available_bytes > 0 )
-                p_aout->p_vlc->pf_memcpy( p_out, p_in, i_available_bytes );
-            i_nb_bytes -= i_available_bytes;
+            vlc_memcpy( p_out, p_in, i_available_bytes );
+            i_buffer -= i_available_bytes;
             p_out += i_available_bytes;
 
             /* Next buffer */
-            p_old_buffer = aout_FifoPop( p_aout, &p_input->fifo );
+            p_old_buffer = aout_FifoPop( NULL, &p_input->fifo );
             aout_BufferFree( p_old_buffer );
             if ( p_input->fifo.p_first == NULL )
             {
-                msg_Err( p_aout, "internal amix error" );
+                msg_Err( p_mixer, "internal amix error" );
                 return;
             }
             p_in = p_input->fifo.p_first->p_buffer;
         }
         else
         {
-            if ( i_nb_bytes > 0 )
-                p_aout->p_vlc->pf_memcpy( p_out, p_in, i_nb_bytes );
-            p_input->p_first_byte_to_mix = p_in + i_nb_bytes;
+            vlc_memcpy( p_out, p_in, i_buffer );
+            p_input->begin = p_in + i_buffer;
             break;
         }
     }
 
     /* Empty other FIFOs to avoid a memory leak. */
-    for ( i++; i < p_aout->i_nb_inputs; i++ )
+    for ( i++; i < p_mixer->input_count; i++ )
     {
         aout_fifo_t * p_fifo;
         aout_buffer_t * p_deleted;
 
-        p_input = p_aout->pp_inputs[i];
-        if ( p_input->b_error ) continue;
+        p_input = p_mixer->input[i];
+        if ( p_input->is_invalid )
+            continue;
         p_fifo = &p_input->fifo;
         p_deleted = p_fifo->p_first;
         while ( p_deleted != NULL )