Changeset aeade697a0629f3a2520c17e2fbb7e445cfc6b7c

Timestamp:

23/01/03 18:13:28 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1043342008 +0000

git-parent:

[8afb82e2c6dc616377ff5afafb326c35f3f36a59]

git-author:

Christophe Massiot <massiot@videolan.org> 1043342008 +0000

Message:

Fixed a segfault with quitting when no audio output plug-in was found
(closes #108).

Files:

• include/aout_internal.h (modified) (4 diffs)
• src/audio_output/common.c (modified) (2 diffs)
• src/audio_output/mixer.c (modified) (2 diffs)
• src/audio_output/output.c (modified) (4 diffs)

include/aout_internal.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-6 2002/12/07 23:50:30
+7 2003/01/23 17:13:28
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -129 +129 @@
-                                         struct aout_buffer_t * );
-
- nor audio output pipeline
+
-    vlc_bool_t              b_error;
-    /* Multiplier used to raise or lower the volume of the sound in
@@ -203 +203 @@
-    /* Saved volume for aout_VolumeMute(). */
-    audio_volume_t          i_saved_volume;
+
+    /* If b_error == 1, there is no audio output pipeline. */
+    vlc_bool_t              b_error;
-} aout_output_t;
-
@@ -265 +268 @@
-/* From mixer.c : */
-int aout_MixerNew( aout_instance_t * p_aout );
-int
+void
-void aout_MixerRun( aout_instance_t * p_aout );
-int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier );

src/audio_output/common.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-5 2003/01/22 18:31:47
+6 2003/01/23 17:13:28
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -60 +60 @@
-    p_aout->mixer.f_multiplier = 1.0;
-    p_aout->mixer.b_error = 1;
+    p_aout->output.b_error = 1;
-    p_aout->output.b_starving = 1;
-

src/audio_output/mixer.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-3 2003/01/06 22:07:47
+4 2003/01/23 17:13:28
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -59 +59 @@
- * Please note that you must hold the mixer lock.
- *****************************************************************************/
-int
-
- 0
+void
+
+
-    module_Unneed( p_aout, p_aout->mixer.p_module );
-    p_aout->mixer.b_error = 1;
-
-    return 0;
-}
-

src/audio_output/output.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2003/01/23 11:48:1
+3 2003/01/23 17:13:2
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -201 +201 @@
-                             &p_aout->mixer.output_alloc );
-
+    p_aout->output.b_error = 0;
-    return 0;
-}
@@ -211 +212 @@
-void aout_OutputDelete( aout_instance_t * p_aout )
-{
+    if ( p_aout->output.b_error ) return 0;
-    module_Unneed( p_aout, p_aout->output.p_module );
-
@@ -216 +218 @@
-                                 p_aout->output.i_nb_filters );
-    aout_FifoDestroy( p_aout, &p_aout->output.fifo );
+
+    p_aout->output.b_error = 1;
-}
-