wasapi: parse returned sample format (fixes #11174)

[vlc] / modules / audio_output / adummy.c

diff --git a/modules/audio_output/adummy.c b/modules/audio_output/adummy.c
index 361a8ef2a7cfbb5f3840904682d19b5b0161fc11..a973aed46c1647be6a46811f1cb6c610a707d1e3 100644 (file)
--- a/modules/audio_output/adummy.c
+++ b/modules/audio_output/adummy.c
@@ -1,28 +1,24 @@
 /*****************************************************************************
  * adummy.c : dummy audio output plugin
  *****************************************************************************
- * Copyright (C) 2002 the VideoLAN team
+ * Copyright (C) 2002 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -46,42 +42,42 @@ vlc_module_end ()
 
 #define A52_FRAME_NB 1536
 
-/*****************************************************************************
- * Local prototypes.
- *****************************************************************************/
-static void Play( audio_output_t *, block_t * );
-
-/*****************************************************************************
- * OpenAudio: open a dummy audio device
- *****************************************************************************/
-static int Open( vlc_object_t * p_this )
+static void Play(audio_output_t *aout, block_t *block)
 {
-    audio_output_t * p_aout = (audio_output_t *)p_this;
+    block_Release( block );
+    (void) aout;
+}
 
-    p_aout->pf_play = Play;
-    p_aout->pf_pause = NULL;
-    p_aout->pf_flush = NULL;
-    p_aout->volume_set = NULL;
-    p_aout->mute_set = NULL;
+static void Flush(audio_output_t *aout, bool wait)
+{
+    (void) aout; (void) wait;
+}
 
-    if( AOUT_FMT_SPDIF( &p_aout->format )
-     && var_InheritBool( p_this, "spdif" ) )
+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
+{
+    if (AOUT_FMT_SPDIF(fmt) && var_InheritBool(aout, "spdif"))
     {
-        p_aout->format.i_format = VLC_CODEC_SPDIFL;
-        p_aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE;
-        p_aout->format.i_frame_length = A52_FRAME_NB;
+        fmt->i_format = VLC_CODEC_SPDIFL;
+        fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE;
+        fmt->i_frame_length = A52_FRAME_NB;
     }
     else
-        p_aout->format.i_format = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N;
+        fmt->i_format = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N;
 
     return VLC_SUCCESS;
 }
 
-/*****************************************************************************
- * Play: pretend to play a sound
- *****************************************************************************/
-static void Play( audio_output_t *aout, block_t *block )
+static int Open(vlc_object_t *obj)
 {
-    block_Release( block );
-    (void) aout;
+    audio_output_t *aout = (audio_output_t *)obj;
+
+    aout->start = Start;
+    aout->time_get = NULL;
+    aout->play = Play;
+    aout->pause = NULL;
+    aout->flush = Flush;
+    aout->stop = NULL;
+    aout->volume_set = NULL;
+    aout->mute_set = NULL;
+    return VLC_SUCCESS;
 }