[vlc-commits] vout: deinline vout_(Hold|Release)
Rémi Denis-Courmont
git at videolan.org
Sun Mar 17 02:39:12 CET 2019
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 16 09:24:29 2019 +0200| [61a6cf8062f6a6461bf70a8598e498eacf00677e] | committer: Rémi Denis-Courmont
vout: deinline vout_(Hold|Release)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=61a6cf8062f6a6461bf70a8598e498eacf00677e
---
include/vlc_objects.h | 12 ++----------
src/libvlccore.sym | 2 ++
src/video_output/video_output.c | 11 +++++++++++
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 0f082adcbc..fddd85eac7 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -182,16 +182,8 @@ VLC_API input_thread_t *input_Hold(input_thread_t *input);
VLC_API void input_Release(input_thread_t *input);
/* Here for backward compatibility. TODO: Move to <vlc_vout.h>! */
-static inline vout_thread_t *vout_Hold(vout_thread_t *vout)
-{
- vlc_object_hold((vlc_object_t *)vout);
- return vout;
-}
-
-static inline void vout_Release(vout_thread_t *vout)
-{
- vlc_object_release((vlc_object_t *)vout);
-}
+VLC_API vout_thread_t *vout_Hold(vout_thread_t *vout);
+VLC_API void vout_Release(vout_thread_t *vout);
/* Here for backward compatibility. TODO: Move to <vlc_aout.h>! */
VLC_API audio_output_t *aout_Hold(audio_output_t *aout);
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 914137978d..4feaf3c48d 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -749,6 +749,8 @@ vlm_MessageNew
vlm_MessageSimpleNew
vlm_New
vout_Close
+vout_Hold
+vout_Release
vout_GetPicture
vout_PutPicture
vout_PutSubpicture
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 53892fd426..c41252936b 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1699,6 +1699,11 @@ void vout_Close(vout_thread_t *vout)
vlc_object_delete(vout);
}
+void vout_Release(vout_thread_t *vout)
+{
+ (vlc_object_release)(VLC_OBJECT(vout));
+}
+
static void VoutDestructor(vlc_object_t *object)
{
vout_thread_t *vout = (vout_thread_t *)object;
@@ -1802,6 +1807,12 @@ vout_thread_t *vout_Create(vlc_object_t *object)
return vout;
}
+vout_thread_t *vout_Hold(vout_thread_t *vout)
+{
+ (vlc_object_hold)(VLC_OBJECT(vout));
+ return vout;
+}
+
int vout_Request(const vout_configuration_t *cfg, input_thread_t *input)
{
vout_thread_t *vout = cfg->vout;
More information about the vlc-commits
mailing list