macosx: Blindly remove i_object_id from prefs.m.

[vlc] / modules / gui / wince / video.cpp

diff --git a/modules/gui/wince/video.cpp b/modules/gui/wince/video.cpp
index 7bd35499a13d61b0bc529d6524a2497d06b48f3c..0c93e9e042ddfa6e51aade27b632f5a17b64c6b6 100644 (file)
--- a/modules/gui/wince/video.cpp
+++ b/modules/gui/wince/video.cpp
@@ -25,9 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_vout.h>
+#include <vlc_interface.h>
 
 #include "wince.h"
 
@@ -59,7 +63,7 @@ public:
                      unsigned int * );
     void ReleaseWindow( void * );
     int  ControlWindow( void *, int, va_list );
-        
+ 
     HWND p_child_window; // public because of menu
 
 private:
@@ -92,13 +96,14 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, HWND _p_parent )
     p_parent = _p_parent;
     p_child_window = NULL;
 
-    vlc_mutex_init( p_intf, &lock );
+    vlc_mutex_init( &lock );
 
     p_vout = NULL;
 
-    p_intf->pf_request_window = ::GetWindow;
-    p_intf->pf_release_window = ::ReleaseWindow;
-    p_intf->pf_control_window = ::ControlWindow;
+    // Changeset 138da19...
+    //p_intf->pf_request_window = ::GetWindow;
+    //p_intf->pf_release_window = ::ReleaseWindow;
+    //p_intf->pf_control_window = ::ControlWindow;
 
     p_intf->p_sys->p_video_window = this;
 
@@ -188,7 +193,7 @@ void VideoWindow::ReleaseWindow( void *p_window )
 FUNCTION:
   WndProc
 
-PURPOSE: 
+PURPOSE:
   Processes messages sent to the main window.
 
 ***********************************************************************/
@@ -198,12 +203,12 @@ LRESULT VideoWindow::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
     {
     case WM_KILLFOCUS:
         if( p_vout )
-            vout_Control( p_vout, VOUT_SET_FOCUS, (vlc_bool_t)VLC_FALSE );
+            vout_Control( p_vout, VOUT_SET_FOCUS, (bool)false );
         return TRUE;
 
     case WM_SETFOCUS:
         if( p_vout )
-            vout_Control( p_vout, VOUT_SET_FOCUS, (vlc_bool_t)VLC_TRUE );
+            vout_Control( p_vout, VOUT_SET_FOCUS, (bool)true );
         return TRUE;
 
     default: