[vlc-devel] [PATCH 08/31] vout: remove unused vout_Request()

Steve Lhomme robux4 at ycbcr.xyz
Mon Sep 23 17:01:13 CEST 2019


It's replaced by vout_HoldDevice() + vout_RequestDisplay().
---
 src/video_output/video_output.c  | 11 -----------
 src/video_output/vout_internal.h | 18 ------------------
 2 files changed, 29 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index f543189c012..1cbb84a22ad 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1860,17 +1860,6 @@ vout_thread_t *vout_Hold(vout_thread_t *vout)
     return vout;
 }
 
-int vout_Request(const vout_configuration_t *cfg, vlc_decoder_device **pp_dec_dev,
-                 input_thread_t *input)
-{
-    int res = vout_HoldDevice(cfg, pp_dec_dev);
-    if (res == 0)
-    {
-        res = vout_RequestDisplay(cfg, input);
-    }
-    return res;
-}
-
 int vout_HoldDevice(const vout_configuration_t *cfg, vlc_decoder_device **pp_dec_dev)
 {
     vout_thread_t *vout = cfg->vout;
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 65824a59761..01a3e3d9ead 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -223,24 +223,6 @@ int vout_HoldDevice(const vout_configuration_t *cfg, vlc_decoder_device **dec_de
  */
 int vout_RequestDisplay(const vout_configuration_t *cfg, input_thread_t *input);
 
-/**
- * Returns a suitable vout or release the given one.
- *
- * If cfg->fmt is non NULL and valid, a vout will be returned, reusing cfg->vout
- * is possible, otherwise it returns NULL.
- * If cfg->vout is not used, it will be closed and released.
- *
- * You can release the returned value either by vout_Request() or vout_Close().
- *
- * \param cfg the video configuration requested.
- * \param dec_dev pointer to receive the decoder device reference to use with the vout or NULL
- * \param input used to get attachments for spu filters
- * \retval 0 on success
- * \retval -1 on error
- */
-int vout_Request(const vout_configuration_t *cfg, vlc_decoder_device **dec_dev,
-                 input_thread_t *input);
-
 /**
  * Disables a vout.
  *
-- 
2.17.1



More information about the vlc-devel mailing list