Commit 0381b5dc authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: rename directx to directdraw

parent 0c34f85e
...@@ -181,7 +181,7 @@ libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' ...@@ -181,7 +181,7 @@ libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect3d9) vout_LTLIBRARIES += $(LTLIBdirect3d9)
EXTRA_LTLIBRARIES += libdirect3d9_plugin.la EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
libdirectdraw_plugin_la_SOURCES = video_output/msw/directx.c \ libdirectdraw_plugin_la_SOURCES = video_output/msw/directdraw.c \
video_output/msw/common.c video_output/msw/common.h \ video_output/msw/common.c video_output/msw/common.h \
video_output/msw/events.c video_output/msw/events.h \ video_output/msw/events.c video_output/msw/events.h \
video_output/msw/win32touch.c video_output/msw/win32touch.h video_output/msw/win32touch.c video_output/msw/win32touch.h
......
...@@ -147,7 +147,7 @@ void CommonManage(vout_display_t *vd) ...@@ -147,7 +147,7 @@ void CommonManage(vout_display_t *vd)
* an issue. The surface automatically gets moved together * an issue. The surface automatically gets moved together
* with the associated window (hvideownd) * with the associated window (hvideownd)
* *
* For directx, it is still important to call UpdateRects * For directdraw, it is still important to call UpdateRects
* on a move of the parent window, even if no resize occurred * on a move of the parent window, even if no resize occurred
*/ */
SetWindowPos(sys->hwnd, 0, 0, 0, SetWindowPos(sys->hwnd, 0, 0, 0,
......
/***************************************************************************** /*****************************************************************************
* directx.c: Windows DirectDraw video output * directdraw.c: Windows DirectDraw video output
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2009 VLC authors and VideoLAN * Copyright (C) 2001-2009 VLC authors and VideoLAN
* $Id$ * $Id$
...@@ -94,7 +94,7 @@ static void Close(vlc_object_t *); ...@@ -94,7 +94,7 @@ static void Close(vlc_object_t *);
static int FindDevicesCallback(vlc_object_t *, const char *, static int FindDevicesCallback(vlc_object_t *, const char *,
char ***, char ***); char ***, char ***);
vlc_module_begin() vlc_module_begin()
set_shortname("DirectX") set_shortname("DirectDraw")
set_description(N_("DirectX (DirectDraw) video output")) set_description(N_("DirectX (DirectDraw) video output"))
set_help(DX_HELP) set_help(DX_HELP)
set_category(CAT_VIDEO) set_category(CAT_VIDEO)
...@@ -109,7 +109,7 @@ vlc_module_begin() ...@@ -109,7 +109,7 @@ vlc_module_begin()
change_string_cb(FindDevicesCallback) change_string_cb(FindDevicesCallback)
set_capability("vout display", 230) set_capability("vout display", 230)
add_shortcut("directx") add_shortcut("directx", "directdraw")
set_callbacks(Open, Close) set_callbacks(Open, Close)
vlc_module_end() vlc_module_end()
......
...@@ -31,7 +31,7 @@ typedef struct event_thread_t event_thread_t; ...@@ -31,7 +31,7 @@ typedef struct event_thread_t event_thread_t;
typedef struct { typedef struct {
bool use_desktop; /* direct3d */ bool use_desktop; /* direct3d */
bool use_overlay; /* directx */ bool use_overlay; /* directdraw */
int x; int x;
int y; int y;
unsigned width; unsigned width;
......
...@@ -1172,7 +1172,7 @@ modules/video_output/kva.c ...@@ -1172,7 +1172,7 @@ modules/video_output/kva.c
modules/video_output/macosx.m modules/video_output/macosx.m
modules/video_output/msw/direct2d.c modules/video_output/msw/direct2d.c
modules/video_output/msw/direct3d9.c modules/video_output/msw/direct3d9.c
modules/video_output/msw/directx.c modules/video_output/msw/directdraw.c
modules/video_output/msw/events.c modules/video_output/msw/events.c
modules/video_output/msw/glwin32.c modules/video_output/msw/glwin32.c
modules/video_output/msw/wingdi.c modules/video_output/msw/wingdi.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment