ekiga r6839 - in trunk: . lib/engine/videooutput/dx

[mschneid svn gnome org]

Author: mschneid
Date: Sat Sep  6 13:14:03 2008
New Revision: 6839
URL: http://svn.gnome.org/viewvc/ekiga?rev=6839&view=rev

Log:
More patches for win32.


Modified:
   trunk/configure.ac
   trunk/lib/engine/videooutput/dx/videooutput-manager-dx.cpp

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Sep  6 13:14:03 2008
@@ -399,10 +399,10 @@
   AC_ARG_WITH(directx-dir, [  --with-directx-dir=PFX		Location of DirectDraw], with_directx_dir="$withval", with_directx_dir=".")
 
   dnl Check for the includes presence
-  AC_MSG_CHECKING(for DirectX includes in ${with_directx_dir}/include)
+  AC_MSG_CHECKING(for DirectX includes in ${with_directx_dir})
   AC_MSG_RESULT()
-  if test -d ${with_directx_dir}/include; then
-    DX_CFLAGS="-I${with_directx_dir}/include"
+  if test -d ${with_directx_dir}; then
+    DX_CFLAGS="-I${with_directx_dir}"
     DX_LIBS="$EKIGA_LIBS -lddraw"
     AC_SUBST(DX_LIBS)
     AC_SUBST(DX_CFLAGS)

Modified: trunk/lib/engine/videooutput/dx/videooutput-manager-dx.cpp
==============================================================================
--- trunk/lib/engine/videooutput/dx/videooutput-manager-dx.cpp	(original)
+++ trunk/lib/engine/videooutput/dx/videooutput-manager-dx.cpp	Sat Sep  6 13:14:03 2008
@@ -104,13 +104,13 @@
 
   close_frame_display ();
 
-  current_frame.accel = VO_ACCEL_NONE;
+  current_frame.accel = Ekiga::VO_ACCEL_NONE;
 
   switch (current_frame.mode) {
   case Ekiga::VO_MODE_LOCAL:
     PTRACE(4, "GMVideoOutputManager_DX\tOpening :VO_MODE_LOCAL display with image of " << current_frame.local_width << "x" << current_frame.local_height);
     dxWindow = new DXWindow();
-    current_frame.accel = (VideoOutputAccel) dxWindow->Init (local_display_info.hwnd,
+    current_frame.accel = (Ekiga::VideoOutputAccel) dxWindow->Init (local_display_info.hwnd,
                           local_display_info.x,
                           local_display_info.y,
                             (int) (current_frame.local_width * current_frame.zoom / 100), 
@@ -130,7 +130,7 @@
   case Ekiga::VO_MODE_REMOTE:
     PTRACE(4, "GMVideoOutputManager_DX\tOpening VO_MODE_REMOTE display with image of " << current_frame.remote_width << "x" << current_frame.remote_height);
     dxWindow = new DXWindow();
-    current_frame.accel = (VideoOutputAccel) dxWindow->Init (local_display_info.hwnd,
+    current_frame.accel = (Ekiga::VideoOutputAccel) dxWindow->Init (local_display_info.hwnd,
                           local_display_info.x,
                           local_display_info.y,
                           (int) (current_frame.remote_width * current_frame.zoom / 100), 
@@ -154,7 +154,7 @@
             << current_frame.local_width << "x" << current_frame.local_height << "(local) and " 
 	    << current_frame.remote_width << "x" << current_frame.remote_height << "(remote)");
     dxWindow = new DXWindow();
-    current_frame.accel = (VideoOutputAccel) dxWindow->Init ((current_frame.mode == Ekiga::VO_MODE_PIP) ? local_display_info.hwnd : NULL,
+    current_frame.accel = (Ekiga::VideoOutputAccel) dxWindow->Init ((current_frame.mode == Ekiga::VO_MODE_PIP) ? local_display_info.hwnd : NULL,
                           (current_frame.mode == Ekiga::VO_MODE_PIP) ? local_display_info.x : 0,
                           (current_frame.mode == Ekiga::VO_MODE_PIP) ? local_display_info.y : 0,
                           (int) (current_frame.remote_width * current_frame.zoom  / 100),