[vlc-devel] [PATCH 16/21] libvlc: merge libvlc_video_direct3d_device_cleanup_cb and libvlc_video_output_cleanup_cb
Steve Lhomme
robux4 at ycbcr.xyz
Wed Feb 5 16:13:24 CET 2020
---
include/vlc/libvlc_media_player.h | 9 +--------
lib/media_player.c | 2 +-
modules/hw/d3d11/d3d11_device.c | 4 ++--
modules/hw/d3d9/d3d9_device.c | 4 ++--
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 14fa86045f9..ce7335b85e0 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -721,13 +721,6 @@ typedef enum libvlc_video_direct3d_engine_t {
libvlc_video_direct3d_engine_d3d9,
} libvlc_video_direct3d_engine_t;
-/** Cleanup the rendering environment initialized during \ref libvlc_video_output_setup_cb.
- *
- * \param opaque private pointer set on the opaque parameter of @a libvlc_video_output_setup_cb() [IN]
- * \version LibVLC 4.0.0 or later
- */
-typedef void( *libvlc_video_direct3d_device_cleanup_cb )( void *opaque );
-
/** Set the callback to call when the host app resizes the rendering area.
*
* This allows text rendering and aspect ratio to be handled properly when the host
@@ -792,7 +785,7 @@ LIBVLC_API
bool libvlc_video_direct3d_set_callbacks( libvlc_media_player_t *mp,
libvlc_video_direct3d_engine_t engine,
libvlc_video_output_setup_cb setup_cb,
- libvlc_video_direct3d_device_cleanup_cb cleanup_cb,
+ libvlc_video_output_cleanup_cb cleanup_cb,
libvlc_video_direct3d_set_resize_cb resize_cb,
libvlc_video_update_output_cb update_output_cb,
libvlc_video_swap_cb swap_cb,
diff --git a/lib/media_player.c b/lib/media_player.c
index 28bc6bafd0b..8f77b65fb12 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1076,7 +1076,7 @@ bool libvlc_video_set_output_callbacks(libvlc_media_player_t *mp,
bool libvlc_video_direct3d_set_callbacks(libvlc_media_player_t *mp,
libvlc_video_direct3d_engine_t engine,
libvlc_video_output_setup_cb setup_cb,
- libvlc_video_direct3d_device_cleanup_cb cleanup_cb,
+ libvlc_video_output_cleanup_cb cleanup_cb,
libvlc_video_direct3d_set_resize_cb resize_cb,
libvlc_video_update_output_cb update_output_cb,
libvlc_video_swap_cb swap_cb,
diff --git a/modules/hw/d3d11/d3d11_device.c b/modules/hw/d3d11/d3d11_device.c
index 544599bc8fd..98b8a302c6b 100644
--- a/modules/hw/d3d11/d3d11_device.c
+++ b/modules/hw/d3d11/d3d11_device.c
@@ -46,8 +46,8 @@ typedef struct {
d3d11_device_t d3d_dev;
struct {
- void *opaque;
- libvlc_video_direct3d_device_cleanup_cb cleanupDeviceCb;
+ void *opaque;
+ libvlc_video_output_cleanup_cb cleanupDeviceCb;
} external;
d3d11_decoder_device_t dec_device;
diff --git a/modules/hw/d3d9/d3d9_device.c b/modules/hw/d3d9/d3d9_device.c
index a25f42add7a..07b76be9ccd 100644
--- a/modules/hw/d3d9/d3d9_device.c
+++ b/modules/hw/d3d9/d3d9_device.c
@@ -40,8 +40,8 @@
#include "d3d9_filters.h"
typedef struct {
- void *opaque;
- libvlc_video_direct3d_device_cleanup_cb cleanupDeviceCb;
+ void *opaque;
+ libvlc_video_output_cleanup_cb cleanupDeviceCb;
d3d9_decoder_device_t dec_device;
} d3d9_decoder_device;
--
2.17.1
More information about the vlc-devel
mailing list