[vlc-devel] [PATCH 15/18] libvlc: rename libvlc_video_direct3d_set_resize_cb to a more generic name

[Steve Lhomme]

---
 include/vlc/libvlc_media_player.h | 8 ++++----
 lib/media_player.c                | 4 ++--
 modules/video_output/wextern.c    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 10cf6583b10..c5a0ab9e6eb 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -673,11 +673,11 @@ typedef enum libvlc_video_engine_t {
  *
  * \param opaque private pointer set on the opaque parameter of @a libvlc_video_output_setup_cb() [IN]
  * \param report_size_change callback which must be called when the host size changes. [IN]
- *        The callback is valid until another call to \ref libvlc_video_direct3d_set_resize_cb
+ *        The callback is valid until another call to \ref libvlc_video_output_set_resize_cb
  *        is done. This may be called from any thread.
  * \param report_opaque private pointer to pass to the \ref report_size_change callback. [IN]
  */
-typedef void( *libvlc_video_direct3d_set_resize_cb )( void *opaque,
+typedef void( *libvlc_video_output_set_resize_cb )( void *opaque,
                                                       void (*report_size_change)(void *report_opaque, unsigned width, unsigned height),
                                                       void *report_opaque );
 
@@ -709,7 +709,7 @@ bool libvlc_video_set_output_callbacks( libvlc_media_player_t *mp,
                                         libvlc_video_engine_t engine,
                                         libvlc_video_output_setup_cb setup_cb,
                                         libvlc_video_output_cleanup_cb cleanup_cb,
-                                        libvlc_video_direct3d_set_resize_cb resize_cb,
+                                        libvlc_video_output_set_resize_cb resize_cb,
                                         libvlc_video_update_output_cb update_output_cb,
                                         libvlc_video_swap_cb swap_cb,
                                         libvlc_video_makeCurrent_cb makeCurrent_cb,
@@ -775,7 +775,7 @@ 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_output_cleanup_cb cleanup_cb,
-                                         libvlc_video_direct3d_set_resize_cb resize_cb,
+                                         libvlc_video_output_set_resize_cb resize_cb,
                                          libvlc_video_update_output_cb update_output_cb,
                                          libvlc_video_swap_cb swap_cb,
                                          libvlc_video_makeCurrent_cb makeCurrent_cb,
diff --git a/lib/media_player.c b/lib/media_player.c
index 978d5317a50..a3501825d31 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1035,7 +1035,7 @@ bool libvlc_video_set_output_callbacks(libvlc_media_player_t *mp,
                                        libvlc_video_engine_t engine,
                                        libvlc_video_output_setup_cb setup_cb,
                                        libvlc_video_output_cleanup_cb cleanup_cb,
-                                       libvlc_video_direct3d_set_resize_cb resize_cb,
+                                       libvlc_video_output_set_resize_cb resize_cb,
                                        libvlc_video_update_output_cb update_output_cb,
                                        libvlc_video_swap_cb swap_cb,
                                        libvlc_video_makeCurrent_cb makeCurrent_cb,
@@ -1078,7 +1078,7 @@ 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_output_cleanup_cb cleanup_cb,
-                                         libvlc_video_direct3d_set_resize_cb resize_cb,
+                                         libvlc_video_output_set_resize_cb resize_cb,
                                          libvlc_video_update_output_cb update_output_cb,
                                          libvlc_video_swap_cb swap_cb,
                                          libvlc_video_makeCurrent_cb makeCurrent_cb,
diff --git a/modules/video_output/wextern.c b/modules/video_output/wextern.c
index f062ce7e457..aaa45ea5775 100644
--- a/modules/video_output/wextern.c
+++ b/modules/video_output/wextern.c
@@ -48,8 +48,8 @@ vlc_module_begin()
 vlc_module_end()
 
 typedef struct {
-    void                                     *opaque;
-    libvlc_video_direct3d_set_resize_cb      setResizeCb;
+    void                                   *opaque;
+    libvlc_video_output_set_resize_cb      setResizeCb;
 } wextern_t;
 
 static void WindowResize(void *opaque, unsigned width, unsigned height)
-- 
2.17.1