[vlc-devel] commit: msw vouts: Remove UNICODE ifdef (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep  1 11:25:46 2009 +0200| [db2014f4a12355796a310eed32e6207ad0aca068] | committer: Jean-Baptiste Kempf 

msw vouts: Remove UNICODE ifdef

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/video_output/msw/directx.c |   12 ------------
 modules/video_output/msw/events.c  |    2 --
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index afe978f..db3091a 100644
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -240,11 +240,7 @@ static int OpenVideo( vlc_object_t *p_this )
         p_vout->p_sys->MonitorFromWindow = (HMONITOR (WINAPI *)( HWND, DWORD ))
             GetProcAddress( huser32, _T("MonitorFromWindow") );
         p_vout->p_sys->GetMonitorInfo =
-#ifndef UNICODE
-            GetProcAddress( huser32, "GetMonitorInfoA" );
-#else
             GetProcAddress( huser32, _T("GetMonitorInfoW") );
-#endif
     }
 
     var_Create( p_vout, "overlay", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
@@ -842,11 +838,7 @@ static int DirectXInitDDraw( vout_thread_t *p_vout )
 
     OurDirectDrawEnumerateEx =
       (void *)GetProcAddress( p_vout->p_sys->hddraw_dll,
-#ifndef UNICODE
-                              "DirectDrawEnumerateExA" );
-#else
                               _T("DirectDrawEnumerateExW") );
-#endif
 
     if( OurDirectDrawEnumerateEx && p_vout->p_sys->MonitorFromWindow )
     {
@@ -2027,11 +2019,7 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
     if( hddraw_dll == NULL ) return VLC_SUCCESS;
 
     OurDirectDrawEnumerateEx =
-#ifndef UNICODE
-      (void *)GetProcAddress( hddraw_dll, "DirectDrawEnumerateExA" );
-#else
       (void *)GetProcAddress( hddraw_dll, _T("DirectDrawEnumerateExW") );
-#endif
 
     if( OurDirectDrawEnumerateEx )
     {
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 4967cdf..99f9cc3 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -343,7 +343,6 @@ void* EventThread( vlc_object_t *p_this )
 #endif
             }
 
-#ifdef UNICODE
             {
                 wchar_t *psz_title = malloc( strlen(val.psz_string) * 2 + 2 );
                 if( psz_title )
@@ -353,7 +352,6 @@ void* EventThread( vlc_object_t *p_this )
                     free( val.psz_string ); val.psz_string = (char *)psz_title;
                 }
             }
-#endif
 
             SetWindowText( p_event->p_vout->p_sys->hwnd,
                            (LPCTSTR)val.psz_string );