[vlc-commits] aout: inline aout_Destructor()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 16 11:10:07 2019 +0200| [21f508870f5fe5187d02304cba4c487172c1adf4] | committer: Rémi Denis-Courmont

aout: inline aout_Destructor()

No functional changes.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21f508870f5fe5187d02304cba4c487172c1adf4
---

 src/audio_output/output.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 303b06bdfb..43e8c25a08 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -50,8 +50,6 @@ static void aout_OutputAssertLocked (audio_output_t *aout)
     vlc_mutex_assert (&owner->lock);
 }
 
-static void aout_Destructor(audio_output_t *);
-
 static int var_Copy (vlc_object_t *src, const char *name, vlc_value_t prev,
                      vlc_value_t value, void *data)
 {
@@ -403,16 +401,6 @@ void aout_Release(audio_output_t *aout)
         return;
 
     atomic_thread_fence(memory_order_acquire);
-    aout_Destructor(aout);
-    vlc_object_delete(VLC_OBJECT(aout));
-}
-
-/**
- * Destroys the audio output lock used (asynchronously) by interface functions.
- */
-static void aout_Destructor(audio_output_t *aout)
-{
-    aout_owner_t *owner = aout_owner (aout);
 
     vlc_mutex_destroy (&owner->dev.lock);
     for (aout_dev_t *dev = owner->dev.list, *next; dev != NULL; dev = next)
@@ -424,6 +412,7 @@ static void aout_Destructor(audio_output_t *aout)
 
     vlc_mutex_destroy (&owner->vp.lock);
     vlc_mutex_destroy (&owner->lock);
+    vlc_object_delete(VLC_OBJECT(aout));
 }
 
 static void aout_PrepareStereoMode (audio_output_t *aout,