[vlc-commits] aout: make lock helpers static

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May  5 12:45:47 2018 +0300| [ea84982c777cb19a50cd1f9f32069170f2563fbc] | committer: Rémi Denis-Courmont

aout: make lock helpers static

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

 src/audio_output/aout_internal.h |  2 --
 src/audio_output/output.c        | 32 +++++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 54cbf5ee09..d115e339fe 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -130,8 +130,6 @@ void aout_Destroy (audio_output_t *);
 int aout_OutputNew(audio_output_t *, audio_sample_format_t *,
                    aout_filters_cfg_t *filters_cfg);
 void aout_OutputDelete( audio_output_t * p_aout );
-void aout_OutputLock(audio_output_t *);
-void aout_OutputUnlock(audio_output_t *);
 
 
 /* From common.c : */
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 536a208403..aa61131c6c 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -206,6 +206,22 @@ static int ViewpointCallback (vlc_object_t *obj, const char *var,
     return VLC_SUCCESS;
 }
 
+static void aout_OutputLock(audio_output_t *aout)
+{
+    aout_owner_t *owner = aout_owner(aout);
+
+    vlc_mutex_lock(&owner->lock);
+}
+
+static int aout_OutputTryLock(audio_output_t *aout)
+{
+    aout_owner_t *owner = aout_owner(aout);
+
+    return vlc_mutex_trylock(&owner->lock);
+}
+
+static void aout_OutputUnlock(audio_output_t *aout);
+
 #undef aout_New
 /**
  * Creates an audio output object and initializes an output module.
@@ -627,21 +643,7 @@ static int aout_OutputDeviceSet (audio_output_t *aout, const char *id)
     return (aout->device_select != NULL) ? aout->device_select (aout, id) : -1;
 }
 
-void aout_OutputLock (audio_output_t *aout)
-{
-    aout_owner_t *owner = aout_owner (aout);
-
-    vlc_mutex_lock (&owner->lock);
-}
-
-static int aout_OutputTryLock (audio_output_t *aout)
-{
-    aout_owner_t *owner = aout_owner (aout);
-
-    return vlc_mutex_trylock (&owner->lock);
-}
-
-void aout_OutputUnlock (audio_output_t *aout)
+static void aout_OutputUnlock(audio_output_t *aout)
 {
     aout_owner_t *owner = aout_owner (aout);