[MPlayer-cvslog] r34381 - in trunk/libvo: vo_directx.c w32_common.c

[reimar]

Author: reimar
Date: Sat Dec  3 20:59:17 2011
New Revision: 34381

Log:
Make -title and -use-filename-title work on Windows.

Modified:
   trunk/libvo/vo_directx.c
   trunk/libvo/w32_common.c

Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c	Sat Dec  3 20:06:19 2011	(r34380)
+++ trunk/libvo/vo_directx.c	Sat Dec  3 20:59:17 2011	(r34381)
@@ -959,9 +959,6 @@ static int config(uint32_t width, uint32
     if (!vo_w32_config(d_width, d_height, options))
         return 1;
 
-    if (WinID == -1)
-        SetWindowText(vo_w32_window, title);
-
     /*create the surfaces*/
     if (Directx_CreatePrimarySurface())
         return 1;

Modified: trunk/libvo/w32_common.c
==============================================================================
--- trunk/libvo/w32_common.c	Sat Dec  3 20:06:19 2011	(r34380)
+++ trunk/libvo/w32_common.c	Sat Dec  3 20:59:17 2011	(r34381)
@@ -433,6 +433,8 @@ int vo_w32_config(uint32_t width, uint32
         prev_height = vo_dheight = height;
         prev_x = vo_dx;
         prev_y = vo_dy;
+        if (vo_wintitle)
+            SetWindowText(vo_w32_window, vo_wintitle);
     }
 
     vo_fs = flags & VOFLAG_FULLSCREEN;