[vlc-commits] libvlc: rename libvlc_video_direct3d_device_cfg_t / libvlc_video_setup_device_info_t

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Feb  4 15:18:10 2020 +0100| [2369082c4fd98877f787b6e63665acbace3e454b] | committer: Steve Lhomme

libvlc: rename libvlc_video_direct3d_device_cfg_t / libvlc_video_setup_device_info_t

To more generic names.

No functional changes.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2369082c4fd98877f787b6e63665acbace3e454b
---

 doc/libvlc/d3d11_player.cpp       |  2 +-
 doc/libvlc/d3d9_player.c          |  2 +-
 include/vlc/libvlc_media_player.h | 10 +++++-----
 modules/hw/d3d11/d3d11_device.c   |  4 ++--
 modules/hw/d3d9/d3d9_device.c     |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/libvlc/d3d11_player.cpp b/doc/libvlc/d3d11_player.cpp
index 85c2899dc6..c9bf86a309 100644
--- a/doc/libvlc/d3d11_player.cpp
+++ b/doc/libvlc/d3d11_player.cpp
@@ -449,7 +449,7 @@ static bool SelectPlane_cb( void *opaque, size_t plane )
     return true;
 }
 
-static bool Setup_cb( void **opaque, const libvlc_video_direct3d_device_cfg_t *cfg, libvlc_video_direct3d_device_setup_t *out )
+static bool Setup_cb( void **opaque, const libvlc_video_setup_device_cfg_t *cfg, libvlc_video_setup_device_info_t *out )
 {
     struct render_context *ctx = static_cast<struct render_context *>(*opaque);
 
diff --git a/doc/libvlc/d3d9_player.c b/doc/libvlc/d3d9_player.c
index d2960d386b..3e15caaedc 100644
--- a/doc/libvlc/d3d9_player.c
+++ b/doc/libvlc/d3d9_player.c
@@ -200,7 +200,7 @@ static void release_direct3d(struct render_context *ctx)
     IDirect3D9_Release(ctx->d3d);
 }
 
-static bool Setup_cb( void **opaque, const libvlc_video_direct3d_device_cfg_t *cfg, libvlc_video_direct3d_device_setup_t *out )
+static bool Setup_cb( void **opaque, const libvlc_video_setup_device_cfg_t *cfg, libvlc_video_setup_device_info_t *out )
 {
     struct render_context *ctx = *opaque;
     out->device_context = ctx->d3d;
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 10a4ed75f0..20c738569d 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -699,7 +699,7 @@ typedef enum libvlc_video_direct3d_engine_t {
 typedef struct
 {
     bool hardware_decoding; /** set if D3D11_CREATE_DEVICE_VIDEO_SUPPORT is needed for D3D11 */
-} libvlc_video_direct3d_device_cfg_t;
+} libvlc_video_setup_device_cfg_t;
 
 typedef struct
 {
@@ -707,7 +707,7 @@ typedef struct
         void *device_context; /** ID3D11DeviceContext* for D3D11, IDirect3D9 * for D3D9 */
         int  adapter;         /** Adapter to use with the IDirect3D9 for D3D9 */
     };
-} libvlc_video_direct3d_device_setup_t;
+} libvlc_video_setup_device_info_t;
 
 /** Setup the rendering environment.
  *
@@ -715,7 +715,7 @@ typedef struct
  *               on input. The callback can change this value on output to be
  *               passed to all the other callbacks set on @a libvlc_video_direct3d_set_callbacks(). [IN/OUT]
  * \param cfg requested configuration of the video device [IN]
- * \param out libvlc_video_direct3d_device_setup_t* to fill [OUT]
+ * \param out libvlc_video_setup_device_info_t* to fill [OUT]
  * \return true on success
  * \version LibVLC 4.0.0 or later
  *
@@ -728,8 +728,8 @@ typedef struct
  * The ID3D11Device used to create ID3D11DeviceContext must have multithreading enabled.
  */
 typedef bool( *libvlc_video_direct3d_device_setup_cb )( void **opaque,
-                                                        const libvlc_video_direct3d_device_cfg_t *cfg,
-                                                        libvlc_video_direct3d_device_setup_t *out );
+                                                        const libvlc_video_setup_device_cfg_t *cfg,
+                                                        libvlc_video_setup_device_info_t *out );
 
 /** Cleanup the rendering environment initialized during \ref libvlc_video_direct3d_device_setup_cb.
  *
diff --git a/modules/hw/d3d11/d3d11_device.c b/modules/hw/d3d11/d3d11_device.c
index 6c8bd8e42e..e80f0d8d33 100644
--- a/modules/hw/d3d11/d3d11_device.c
+++ b/modules/hw/d3d11/d3d11_device.c
@@ -98,10 +98,10 @@ static int D3D11OpenDecoderDevice(vlc_decoder_device *device, bool forced, vout_
             /* decoder device coming from the external app */
             sys->external.opaque          = var_InheritAddress( device, "vout-cb-opaque" );
             sys->external.cleanupDeviceCb = var_InheritAddress( device, "vout-cb-cleanup" );
-            libvlc_video_direct3d_device_cfg_t cfg = {
+            libvlc_video_setup_device_cfg_t cfg = {
                 .hardware_decoding = true, /* always favor hardware decoding */
             };
-            libvlc_video_direct3d_device_setup_t out = { .device_context = NULL };
+            libvlc_video_setup_device_info_t out = { .device_context = NULL };
             if (!setupDeviceCb( &sys->external.opaque, &cfg, &out ))
             {
                 if (sys->external.cleanupDeviceCb)
diff --git a/modules/hw/d3d9/d3d9_device.c b/modules/hw/d3d9/d3d9_device.c
index fd205f3a28..fd61303103 100644
--- a/modules/hw/d3d9/d3d9_device.c
+++ b/modules/hw/d3d9/d3d9_device.c
@@ -74,10 +74,10 @@ int D3D9OpenDecoderDevice(vlc_decoder_device *device, vout_window_t *wnd)
     if ( setupDeviceCb )
     {
         /* external rendering */
-        libvlc_video_direct3d_device_setup_t out = { .device_context = NULL, .adapter = 0 };
+        libvlc_video_setup_device_info_t out = { .device_context = NULL, .adapter = 0 };
         sys->opaque          = var_InheritAddress( device, "vout-cb-opaque" );
         sys->cleanupDeviceCb = var_InheritAddress( device, "vout-cb-cleanup" );
-        libvlc_video_direct3d_device_cfg_t cfg = {
+        libvlc_video_setup_device_cfg_t cfg = {
             .hardware_decoding = true, /* ignored anyway */
         };
         if (!setupDeviceCb( &sys->opaque, &cfg, &out ))