[vlc-commits] aout: deinline aout_(Hold|Release)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 16 09:24:15 2019 +0200| [0f6eb648dbf67a79f5a7e03a36d6a7527d091285] | committer: Rémi Denis-Courmont

aout: deinline aout_(Hold|Release)

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

 include/vlc_objects.h     | 13 ++-----------
 src/audio_output/output.c | 11 +++++++++++
 src/libvlccore.sym        |  2 ++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 3062b63487..0f082adcbc 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -194,17 +194,8 @@ static inline void vout_Release(vout_thread_t *vout)
 }
 
 /* Here for backward compatibility. TODO: Move to <vlc_aout.h>! */
-static inline audio_output_t *aout_Hold(audio_output_t *aout)
-{
-    vlc_object_hold((vlc_object_t *)aout);
-    return aout;
-}
-
-static inline void aout_Release(audio_output_t *aout)
-{
-    vlc_object_release((vlc_object_t *)aout);
-}
-
+VLC_API audio_output_t *aout_Hold(audio_output_t *aout);
+VLC_API void aout_Release(audio_output_t *aout);
 
 /* TODO: remove vlc_object_hold/_release() for GUIs, remove this */
 VLC_DEPRECATED static inline void *vlc_object_hold_dyn(vlc_object_t *o)
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index f12121a704..3eaa415976 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -363,6 +363,12 @@ audio_output_t *aout_New (vlc_object_t *parent)
     return aout;
 }
 
+audio_output_t *aout_Hold(audio_output_t *aout)
+{
+    (vlc_object_hold)(VLC_OBJECT(aout));
+    return aout;
+}
+
 /**
  * Deinitializes an audio output module and destroys an audio output object.
  */
@@ -388,6 +394,11 @@ void aout_Destroy (audio_output_t *aout)
     vlc_object_delete(aout);
 }
 
+void aout_Release(audio_output_t *aout)
+{
+    (vlc_object_release)(VLC_OBJECT(aout));
+}
+
 /**
  * Destroys the audio output lock used (asynchronously) by interface functions.
  */
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 6e5fc48aa6..914137978d 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -28,6 +28,8 @@ aout_FiltersDrain
 aout_FiltersFlush
 aout_FiltersPlay
 aout_FiltersAdjustResampling
+aout_Hold
+aout_Release
 block_Alloc
 block_FifoCount
 block_FifoEmpty