* ./BUGS: added a list of known bugs. Please add your findings!

[vlc] / plugins / directx / vout_directx.c

diff --git a/plugins/directx/vout_directx.c b/plugins/directx/vout_directx.c
index a10d3e5d4df26ec371fc5c19bdcad6da8e39bd2d..5766f204cc931a1c5af16c4545b6f89540050fdb 100644 (file)
--- a/plugins/directx/vout_directx.c
+++ b/plugins/directx/vout_directx.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * vout_directx.c: Windows DirectX video output display method
  *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_directx.c,v 1.10 2001/08/05 15:32:46 gbazin Exp $
+ * Copyright (C) 2001 VideoLAN
+ * $Id: vout_directx.c,v 1.18 2002/01/04 14:01:34 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -21,9 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME directx
-#include "modules_inner.h"
-
 /* ToDo:
  *
  * Double buffering
@@ -48,12 +45,12 @@
  * implementing this is not considered high priority.
  * 
  *****************************************************************************/
-#include "defs.h"
-
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 
+#include <videolan/vlc.h>
+
 #include <windows.h>
 #include <windowsx.h>
 
@@ -63,22 +60,12 @@
 #   include <directx.h>
 #endif
 
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "tests.h"
 #include "netutils.h"
 
 #include "video.h"
 #include "video_output.h"
 
-#include "intf_msg.h"
 #include "interface.h"
-#include "main.h"
-
-#include "modules.h"
-#include "modules_export.h"
 
 #include "vout_directx.h"
 
@@ -176,7 +163,7 @@ static int vout_Create( vout_thread_t *p_vout )
                                                 VOUT_FULLSCREEN_DEFAULT );
 #if 0
     p_vout->b_need_render = !main_GetIntVariable( VOUT_OVERLAY_VAR,
-                                                 VOUT_OVERLAY_DEFAULT );
+                                                  VOUT_OVERLAY_DEFAULT );
 #else
     p_vout->b_need_render = 0;                          /* default = overlay */
 #endif
@@ -303,7 +290,7 @@ static void vout_Destroy( vout_thread_t *p_vout )
      * so we send a fake message */
     if( p_vout->p_sys->i_event_thread_status == THREAD_READY )
     {
-        PostMessage( p_vout->p_sys->hwnd, WM_CHAR, (WPARAM)'^', 0);
+        PostMessage( p_vout->p_sys->hwnd, WM_CHAR, (WPARAM)'q', 0);
         vlc_thread_join( p_vout->p_sys->event_thread_id );
     }
 
@@ -338,7 +325,7 @@ static int vout_Manage( vout_thread_t *p_vout )
     {
         intf_WarnMsg( 3, "vout: vout_Manage Scale Change" );
         if( p_vout->b_need_render )
-           InvalidateRect( p_vout->p_sys->hwnd, NULL, TRUE );
+            InvalidateRect( p_vout->p_sys->hwnd, NULL, TRUE );
         if( DirectXUpdateOverlay( p_vout ) )
             /* failed so try again next time */
             PostMessage( p_vout->p_sys->hwnd, WM_CHAR, (WPARAM)'S', 0);
@@ -1357,7 +1344,7 @@ static void DirectXKeepAspectRatio( vout_thread_t *p_vout, RECT *rect_window )
 
   if( !p_vout->p_rendered_pic ) return;
 
-  switch( p_vout->p_rendered_pic->i_aspect_ratio )
+  switch( p_vout->p_rendered_pic->i_aspect )
   {
       case AR_16_9_PICTURE:
       if( ((rect_window->right-rect_window->left)*9)