Changeset 348f966219df7389494a915cc2736df172be47c0

Timestamp:

05/19/02 00:41:43 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[c673b2b97bfc6bc0ad2b7e679fde9d99a90cb1d2]

git-author:

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

Message:

* updated INSTALL.win32
* a little bit of clean-up in the directx video output plugin

Files:

• INSTALL.win32 (modified) (3 diffs)
• plugins/directx/vout_directx.c (modified) (4 diffs)
• plugins/directx/vout_events.c (modified) (6 diffs)

INSTALL.win32

@@ -54 +54 @@
-
-http://www.mingw.org/download.shtml
-002.04.24-1
+
-http://prdownloads.sourceforge.net/mingw/MinGW-1.1.tar.gz
-
@@ -82 +82 @@
-
-  make distclean ; \
-./configure --host=i586-mingw32msvc --target=i586-mingw32msv
-
+CC=i586-mingw32msvc-gc
+./configure --host=i586-mingw32msvc 
-  --with-gtk-config-path=/usr/local/gtk-win32/bin \
-  --with-sdl-config-path=/usr/local/SDL-1.2.3-win32/i386-mingw32msvc/bin \
@@ -92 +92 @@
-www.videolan.org, you have to use something along those lines:
-
-/usr/local/cross-tools/bin/
+
-  PATH=/usr/local/cross-tools/bin:$PATH \
-
-
+
-  --with-gtk-config-path=/usr/local/gtk-win32/bin \
-  --with-sdl-config-path=/usr/local/SDL-1.2.3-win32/i386-mingw32msvc/bin \

plugins/directx/vout_directx.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2002/05/18 15:34:04
+5 2002/05/18 22:41:43
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -180 +180 @@
-    intf_WarnMsg( 3, "vout: vout_Create DirectXEventThread running" );
-
-
-    /* Initialise DirectDraw */
-    if( DirectXInitDDraw( p_vout ) )
-    {
-        intf_ErrMsg( "vout error: can't initialise DirectDraw" );
-
-
-
-
-
-
-
-
+
-        return ( 1 );
-    }
@@ -201 +193 @@
-        intf_ErrMsg( "vout error: can't initialise DirectDraw" );
-        DirectXCloseDDraw( p_vout );
-
-
-
-
-
-
-
-
+
-        return ( 1 );
-    }
@@ -273 +258 @@
-
-    /* Kill DirectXEventThread */
+    vlc_mutex_lock( &p_vout->p_sys->event_thread_lock );
-    p_vout->p_sys->b_event_thread_die = 1;
+
-    /* we need to be sure DirectXEventThread won't stay stuck in GetMessage,
-     * so we send a fake message */
-
-
-
+
-        PostMessage( p_vout->p_sys->hwnd, WM_NULL, 0, 0);
-
-
+
+
+
-
-    if( p_vout->p_sys != NULL )

plugins/directx/vout_events.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2002/05/18 15:34:04
+8 2002/05/18 22:41:43
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -143 +143 @@
-            case VK_F12:
-                /* exit application */
-p_vout->p_sys->b_event_thread_die = 
+
-                break;
-            }
@@ -155 +155 @@
-            case 'Q':
-                /* exit application */
-p_vout->p_sys->b_event_thread_die = 
+
-                break;
-
@@ -380 +380 @@
-{
-    intf_WarnMsg( 3, "vout: DirectXCloseWindow" );
+
+    vlc_mutex_lock( &p_vout->p_sys->event_thread_lock );
+
-    if( p_vout->p_sys->hwnd != NULL )
-    {
@@ -385 +388 @@
-        p_vout->p_sys->hwnd = NULL;
-    }
+
+    p_vout->p_sys->i_event_thread_status = THREAD_OVER;
+
+    vlc_mutex_unlock( &p_vout->p_sys->event_thread_lock );
-
-    /* We don't unregister the Window Class because it could lead to race
@@ -528 +535 @@
-        intf_WarnMsg( 4, "vout: WinProc WM_CLOSE" );
-        /* exit application */
-
-
+
-        return 0;
-        break;