[vlc-devel] commit: Enabled directx in "vout display" wrapper. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jan  3 15:49:36 2010 +0100| [c60c9a9ede875dab1b16c6ed665f9281c4be4ed5] | committer: Laurent Aimar 

Enabled directx in "vout display" wrapper.

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

 modules/video_output/wrapper.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/wrapper.c b/modules/video_output/wrapper.c
index a61e197..908e821 100644
--- a/modules/video_output/wrapper.c
+++ b/modules/video_output/wrapper.c
@@ -63,6 +63,7 @@ DECLARE_OPEN(glwin32);
 DECLARE_OPEN(macosx);
 DECLARE_OPEN(wingdi);
 DECLARE_OPEN(wingapi);
+DECLARE_OPEN(directx);
 
 #undef DECLARE_OPEN
 
@@ -133,6 +134,9 @@ vlc_module_begin()
     add_submodule()
     DECLARE_MODULE(wingapi, 20)
 
+    add_submodule()
+    DECLARE_MODULE(directx, 100)
+
 vlc_module_end()
 
 #undef DECLARE_MODULE
@@ -213,6 +217,9 @@ static int Open(vlc_object_t *object, const char *module)
     if (!strcmp(sys->name, "direct3d_xp") || !strcmp(sys->name, "direct3d_vista")) {
         var_Create(vout, "direct3d-desktop", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
         var_AddCallback(vout, "direct3d-desktop", Forward, NULL);
+    } else if (!strcmp(sys->name, "directx")) {
+        var_Create(vout, "video-wallpaper", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
+        var_AddCallback(vout, "video-wallpaper", Forward, NULL);
     }
 
     /* */
@@ -238,6 +245,8 @@ static void Close(vlc_object_t *object)
     /* */
     if (!strcmp(sys->name, "direct3d_xp") || !strcmp(sys->name, "direct3d_vista")) {
         var_DelCallback(vout, "direct3d-desktop", Forward, NULL);
+    } else if (!strcmp(sys->name, "directx")) {
+        var_DelCallback(vout, "video-wallpaper", Forward, NULL);
     }
 
     vout_DeleteDisplay(sys->vd, NULL);