Changeset 475694d42441f731e6f08f06225916f10167361c

Timestamp:

16/02/05 09:29:47 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1108542587 +0000

git-parent:

[b6932baa39c3eaa14294ae3dd466364b3a7ea1cc]

git-author:

Gildas Bazin <gbazin@videolan.org> 1108542587 +0000

Message:

* configure.ac, modules/video_output/wingdi.c: enable wingapi vout on WinCE.

Files:

• configure.ac (modified) (1 diff)
• modules/video_output/Modules.am (modified) (1 diff)
• modules/video_output/wingdi.c (modified) (15 diffs)

configure.ac

@@ -3185 +3185 @@
-  fi
-  if test "${SYS}" = "mingwce"; then
-
+ wingapi
-  fi
-fi

modules/video_output/Modules.am

@@ -7 +7 @@
-SOURCES_svgalib = svgalib.c
-SOURCES_wingdi = wingdi.c
-
+win
-SOURCES_mga = mga.c
-SOURCES_hd1000v = hd1000v.cpp

modules/video_output/wingdi.c

@@ -42 +42 @@
-#endif
-
-
-
+
-    typedef struct GXDisplayProperties {
-        DWORD cxWidth;
@@ -74 +73 @@
-#       define kfDirectInverted 0x400
-#   endif
-
+win
-
-#define MAX_DIRECTBUFFERS 10
@@ -106 +105 @@
-static int  Manage    ( vout_thread_t * );
-static void Render    ( vout_thread_t *, picture_t * );
-
+win
-static void DisplayGAPI( vout_thread_t *, picture_t * );
-#else
@@ -167 +166 @@
-    vlc_bool_t   b_video_display;
-
-
+win
-    HINSTANCE  gapi_dll;                    /* handle of the opened gapi dll */
-
@@ -195 +194 @@
- *****************************************************************************/
-vlc_module_begin();
-
+win
-    set_description( _("Windows GAPI video output") );
-    set_capability( "video output", 20 );
@@ -216 +215 @@
-    if( !p_vout->p_sys ) return VLC_ENOMEM;
-
-
+win
-    /* Load GAPI */
-    p_vout->p_sys->gapi_dll = LoadLibrary( _T("GX.DLL") );
@@ -281 +280 @@
-    p_vout->pf_manage = Manage;
-    p_vout->pf_render = Render;
-
+win
-    p_vout->pf_display = DisplayGAPI;
-#else
@@ -298 +297 @@
-    vout_thread_t * p_vout = (vout_thread_t *)p_this;
-
-
+win
-    GXCloseDisplay();
-    FreeLibrary( p_vout->p_sys->gapi_dll );
@@ -368 +367 @@
-    }
-
-
+win
-    p_vout->output.i_width  = p_vout->p_sys->render_width;
-    p_vout->output.i_height = p_vout->p_sys->render_height;
@@ -571 +570 @@
-        }
-
-
+win
-        GXCloseDisplay();
-#endif
@@ -579 +578 @@
-        UpdateWindow( p_vout->p_sys->hwnd );
-
-
+win
-        GXOpenDisplay( p_vout->p_sys->hvideownd, GX_FULLSCREEN );
-#endif
@@ -610 +609 @@
-#define rect_dest_clipped p_vout->p_sys->rect_dest_clipped
-
-
+win
-static void DisplayGDI( vout_thread_t *p_vout, picture_t *p_pic )
-{
@@ -896 +895 @@
-            break;
-
-
+win
-        case WM_KILLFOCUS:
-            GXSuspend();
@@ -1134 +1133 @@
-
-    /* Get screen properties */
-
+win
-    {
-    GXDisplayProperties gx_displayprop = GXGetDisplayProperties();
@@ -1145 +1144 @@
-    msg_Dbg( p_vout, "GDI depth is %i", p_vout->p_sys->i_depth );
-
-
+win
-    if( p_vout->b_fullscreen )
-    {