Skip to content

Commit 0381b5d

Browse files
committed
Win32: rename directx to directdraw
1 parent 0c34f85 commit 0381b5d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

modules/video_output/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
181181
vout_LTLIBRARIES += $(LTLIBdirect3d9)
182182
EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
183183

184-
libdirectdraw_plugin_la_SOURCES = video_output/msw/directx.c \
184+
libdirectdraw_plugin_la_SOURCES = video_output/msw/directdraw.c \
185185
video_output/msw/common.c video_output/msw/common.h \
186186
video_output/msw/events.c video_output/msw/events.h \
187187
video_output/msw/win32touch.c video_output/msw/win32touch.h

modules/video_output/msw/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void CommonManage(vout_display_t *vd)
147147
* an issue. The surface automatically gets moved together
148148
* with the associated window (hvideownd)
149149
*
150-
* For directx, it is still important to call UpdateRects
150+
* For directdraw, it is still important to call UpdateRects
151151
* on a move of the parent window, even if no resize occurred
152152
*/
153153
SetWindowPos(sys->hwnd, 0, 0, 0,

modules/video_output/msw/directx.c renamed to modules/video_output/msw/directdraw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* directx.c: Windows DirectDraw video output
2+
* directdraw.c: Windows DirectDraw video output
33
*****************************************************************************
44
* Copyright (C) 2001-2009 VLC authors and VideoLAN
55
* $Id$
@@ -94,7 +94,7 @@ static void Close(vlc_object_t *);
9494
static int FindDevicesCallback(vlc_object_t *, const char *,
9595
char ***, char ***);
9696
vlc_module_begin()
97-
set_shortname("DirectX")
97+
set_shortname("DirectDraw")
9898
set_description(N_("DirectX (DirectDraw) video output"))
9999
set_help(DX_HELP)
100100
set_category(CAT_VIDEO)
@@ -109,7 +109,7 @@ vlc_module_begin()
109109
change_string_cb(FindDevicesCallback)
110110

111111
set_capability("vout display", 230)
112-
add_shortcut("directx")
112+
add_shortcut("directx", "directdraw")
113113
set_callbacks(Open, Close)
114114
vlc_module_end()
115115

modules/video_output/msw/events.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ typedef struct event_thread_t event_thread_t;
3131

3232
typedef struct {
3333
bool use_desktop; /* direct3d */
34-
bool use_overlay; /* directx */
34+
bool use_overlay; /* directdraw */
3535
int x;
3636
int y;
3737
unsigned width;

po/POTFILES.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ modules/video_output/kva.c
11721172
modules/video_output/macosx.m
11731173
modules/video_output/msw/direct2d.c
11741174
modules/video_output/msw/direct3d9.c
1175-
modules/video_output/msw/directx.c
1175+
modules/video_output/msw/directdraw.c
11761176
modules/video_output/msw/events.c
11771177
modules/video_output/msw/glwin32.c
11781178
modules/video_output/msw/wingdi.c

0 commit comments

Comments
 (0)