[vlc-devel] [PATCH 17/18] libvlc: rename the select_plane callback to something more generic

[Steve Lhomme]

---
 include/vlc/libvlc_media_player.h       | 6 +++---
 lib/media_player.c                      | 4 ++--
 modules/video_output/win32/direct3d11.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 64c58ff4b42..e65ea3a3b57 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -700,7 +700,7 @@ typedef void( *libvlc_video_output_set_resize_cb )( void *opaque,
  * \ref LIBVLC_VIDEO_UPDATE_OUTPUT call. It's usually one plane except for
  * semi-planar formats like DXGI_FORMAT_NV12 or DXGI_FORMAT_P010.
  */
-typedef bool( *libvlc_video_direct3d_select_plane_cb )( void *opaque, size_t plane );
+typedef bool( *libvlc_video_output_select_plane_cb )( void *opaque, size_t plane );
 
 /**
  * Set callbacks and data to render decoded video to a custom texture
@@ -735,7 +735,7 @@ bool libvlc_video_set_output_callbacks( libvlc_media_player_t *mp,
                                         libvlc_video_swap_cb swap_cb,
                                         libvlc_video_makeCurrent_cb makeCurrent_cb,
                                         libvlc_video_getProcAddress_cb getProcAddress_cb,
-                                        libvlc_video_direct3d_select_plane_cb select_plane_cb,
+                                        libvlc_video_output_select_plane_cb select_plane_cb,
                                         void* opaque );
 
 
@@ -781,7 +781,7 @@ bool libvlc_video_direct3d_set_callbacks( libvlc_media_player_t *mp,
                                          libvlc_video_update_output_cb update_output_cb,
                                          libvlc_video_swap_cb swap_cb,
                                          libvlc_video_makeCurrent_cb makeCurrent_cb,
-                                         libvlc_video_direct3d_select_plane_cb select_plane_cb,
+                                         libvlc_video_output_select_plane_cb select_plane_cb,
                                          void* opaque );
 
 /**
diff --git a/lib/media_player.c b/lib/media_player.c
index 749d11ef5ac..2c662ea1356 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1040,7 +1040,7 @@ bool libvlc_video_set_output_callbacks(libvlc_media_player_t *mp,
                                        libvlc_video_swap_cb swap_cb,
                                        libvlc_video_makeCurrent_cb makeCurrent_cb,
                                        libvlc_video_getProcAddress_cb getProcAddress_cb,
-                                       libvlc_video_direct3d_select_plane_cb select_plane_cb,
+                                       libvlc_video_output_select_plane_cb select_plane_cb,
                                        void *opaque)
 {
 #ifdef __ANDROID__
@@ -1084,7 +1084,7 @@ bool libvlc_video_direct3d_set_callbacks(libvlc_media_player_t *mp,
                                          libvlc_video_update_output_cb update_output_cb,
                                          libvlc_video_swap_cb swap_cb,
                                          libvlc_video_makeCurrent_cb makeCurrent_cb,
-                                         libvlc_video_direct3d_select_plane_cb select_plane_cb,
+                                         libvlc_video_output_select_plane_cb select_plane_cb,
                                          void *opaque)
 {
     var_SetString( mp, "window", "wextern");
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 0bac728b1e8..4e2ba13792b 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -122,7 +122,7 @@ struct vout_display_sys_t
     libvlc_video_update_output_cb            updateOutputCb;
     libvlc_video_swap_cb                     swapCb;
     libvlc_video_makeCurrent_cb              startEndRenderingCb;
-    libvlc_video_direct3d_select_plane_cb    selectPlaneCb;
+    libvlc_video_output_select_plane_cb      selectPlaneCb;
 };
 
 static void Prepare(vout_display_t *, picture_t *, subpicture_t *subpicture, vlc_tick_t);
-- 
2.17.1