Rename Direct3D video output module to Direct3D9

We will probably need a Direct3d11 one
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

configure.ac

@@ -3234,7 +3234,7 @@ AS_IF([test "${enable_directx}" != "no"], [
 
   dnl Direct3D
   AC_CHECK_HEADERS(d3d9.h, [
-    VLC_ADD_PLUGIN([direct3d])
+    VLC_ADD_PLUGIN([direct3d9])
   ])
 
   dnl Direct2D

modules/MODULES_LIST

@@ -94,7 +94,7 @@ $Id$
  * demuxdump: Pseudo-demuxer that dumps the stream
  * diracsys: BBC Dirac demuxer
  * direct2d: video output module using the Direct2D API
- * direct3d: video output module using the Direct3D API
+ * direct3d9: video output module using the Direct3D9 API
  * directdraw: video output module using the DirectDraw API
  * directfb: Direct Framebuffer video output
  * directsound: audio output module using the DirectSound API

modules/video_output/Makefile.am

@@ -169,17 +169,17 @@ libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect2d)
 EXTRA_LTLIBRARIES += libdirect2d_plugin.la
 
-libdirect3d_plugin_la_SOURCES = video_output/msw/direct3d.c \
+libdirect3d9_plugin_la_SOURCES = video_output/msw/direct3d9.c \
 	video_output/msw/common.c video_output/msw/common.h \
 	video_output/msw/events.c video_output/msw/events.h \
 	video_output/msw/builtin_shaders.h \
 	video_output/msw/win32touch.c video_output/msw/win32touch.h
-libdirect3d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DMODULE_NAME_IS_direct3d
-libdirect3d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
-libdirect3d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-vout_LTLIBRARIES += $(LTLIBdirect3d)
-EXTRA_LTLIBRARIES += libdirect3d_plugin.la
+libdirect3d9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DMODULE_NAME_IS_direct3d9
+libdirect3d9_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
+libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
+vout_LTLIBRARIES += $(LTLIBdirect3d9)
+EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
 
 libdirectdraw_plugin_la_SOURCES = video_output/msw/directx.c \
 	video_output/msw/common.c video_output/msw/common.h \

modules/video_output/msw/common.c

@@ -72,7 +72,7 @@ int CommonInit(vout_display_t *vd)
 
     event_cfg_t cfg;
     memset(&cfg, 0, sizeof(cfg));
-#ifdef MODULE_NAME_IS_direct3d
+#ifdef MODULE_NAME_IS_direct3d9
     cfg.use_desktop = sys->use_desktop;
 #endif
 #ifdef MODULE_NAME_IS_directdraw
@@ -143,7 +143,7 @@ void CommonManage(vout_display_t *vd)
 
             /* This code deals with both resize and move
              *
-             * For most drivers(direct3d, gdi, opengl), move is never
+             * For most drivers(direct3d9, gdi, opengl), move is never
              * an issue. The surface automatically gets moved together
              * with the associated window (hvideownd)
              *
@@ -348,7 +348,7 @@ void UpdateRects(vout_display_t *vd,
                      SWP_NOCOPYBITS|SWP_NOZORDER|SWP_ASYNCWINDOWPOS);
 
     /* Destination image position and dimensions */
-#if defined(MODULE_NAME_IS_direct3d) || defined(MODULE_NAME_IS_direct2d)
+#if defined(MODULE_NAME_IS_direct3d9) || defined(MODULE_NAME_IS_direct2d)
     rect_dest.left   = 0;
     rect_dest.right  = place.width;
     rect_dest.top    = 0;
@@ -425,7 +425,7 @@ void UpdateRects(vout_display_t *vd,
     /* Apply overlay hardware constraints */
     if (sys->use_overlay)
         AlignRect(&rect_src_clipped, sys->i_align_src_boundary, sys->i_align_src_size);
-#elif defined(MODULE_NAME_IS_direct3d) || defined(MODULE_NAME_IS_direct2d)
+#elif defined(MODULE_NAME_IS_direct3d9) || defined(MODULE_NAME_IS_direct2d)
     /* Needed at least with YUV content */
     rect_src_clipped.left &= ~1;
     rect_src_clipped.right &= ~1;
@@ -465,7 +465,7 @@ static int CommonControlSetFullscreen(vout_display_t *vd, bool is_fullscreen)
 {
     vout_display_sys_t *sys = vd->sys;
 
-#ifdef MODULE_NAME_IS_direct3d
+#ifdef MODULE_NAME_IS_direct3d9
     if (sys->use_desktop && is_fullscreen)
         return VLC_EGENERIC;
 #endif
@@ -591,7 +591,7 @@ int CommonControl(vout_display_t *vd, int query, va_list args)
     case VOUT_DISPLAY_CHANGE_WINDOW_STATE: {       /* unsigned state */
         const unsigned state = va_arg(args, unsigned);
         const bool is_on_top = (state & VOUT_WINDOW_STATE_ABOVE) != 0;
-#ifdef MODULE_NAME_IS_direct3d
+#ifdef MODULE_NAME_IS_direct3d9
         if (sys->use_desktop && is_on_top)
             return VLC_EGENERIC;
 #endif

modules/video_output/msw/common.h

@@ -25,7 +25,7 @@
 #ifdef MODULE_NAME_IS_directdraw
 # include <ddraw.h>
 #endif
-#ifdef MODULE_NAME_IS_direct3d
+#ifdef MODULE_NAME_IS_direct3d9
 # include <d3d9.h>
 # include <d3dx9effect.h>
 #endif
@@ -135,7 +135,7 @@ struct vout_display_sys_t
     ID2D1Bitmap            *d2_bitmap;                            /* D2 bitmap */
 #endif
 
-#ifdef MODULE_NAME_IS_direct3d
+#ifdef MODULE_NAME_IS_direct3d9
     bool allow_hw_yuv;    /* Should we use hardware YUV->RGB conversions */
     /* show video on desktop window ? */
     bool use_desktop;

modules/video_output/msw/events.c

@@ -620,7 +620,7 @@ static void MouseReleased( event_thread_t *p_event, unsigned button )
     vout_display_SendEventMouseReleased( p_event->vd, button );
 }
 
-#ifdef MODULE_NAME_IS_direct3d
+#ifdef MODULE_NAME_IS_direct3d9
 static int CALLBACK
 enumWindowsProc(HWND hwnd, LPARAM lParam)
 {
@@ -681,7 +681,7 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
     /* Get this module's instance */
     hInstance = GetModuleHandle(NULL);
 
-    #ifdef MODULE_NAME_IS_direct3d
+    #ifdef MODULE_NAME_IS_direct3d9
     if( !p_event->use_desktop )
     #endif
     {
@@ -692,7 +692,7 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
         else
             p_event->hparent = NULL;
     }
-    #ifdef MODULE_NAME_IS_direct3d
+    #ifdef MODULE_NAME_IS_direct3d9
     else
     {
         vout_display_DeleteWindow(vd, NULL);
@@ -869,7 +869,7 @@ static void Win32VoutCloseWindow( event_thread_t *p_event )
     if( p_event->hfswnd )
         DestroyWindow( p_event->hfswnd );
 
-    #ifdef MODULE_NAME_IS_direct3d
+    #ifdef MODULE_NAME_IS_direct3d9
     if( !p_event->use_desktop )
     #endif
         vout_display_DeleteWindow( vd, p_event->parent_window );

po/POTFILES.in

@@ -1171,7 +1171,7 @@ modules/video_output/ios2.m
 modules/video_output/kva.c
 modules/video_output/macosx.m
 modules/video_output/msw/direct2d.c
-modules/video_output/msw/direct3d.c
+modules/video_output/msw/direct3d9.c
 modules/video_output/msw/directx.c
 modules/video_output/msw/events.c
 modules/video_output/msw/glwin32.c