msw vouts: Remove UNICODE ifdef
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 1 Sep 2009 09:25:46 +0000 (11:25 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 1 Sep 2009 12:05:52 +0000 (14:05 +0200)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/video_output/msw/directx.c
modules/video_output/msw/events.c

index afe978f..db3091a 100644 (file)
@@ -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 )
     {
index 4967cdf..99f9cc3 100644 (file)
@@ -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 );