ekiga r5936 - in trunk: . lib/engine/display/dx lib/engine/display/skel lib/engine/display/x src/endpoints src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Thu Jan 24 09:15:22 2008
New Revision: 5936
URL: http://svn.gnome.org/viewvc/ekiga?rev=5936&view=rev

Log:
Some fixes for the win32 build.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/display/dx/Makefile.am
   trunk/lib/engine/display/dx/display-main-dx.cpp
   trunk/lib/engine/display/dx/display-manager-dx.cpp
   trunk/lib/engine/display/dx/display-manager-dx.h
   trunk/lib/engine/display/skel/display-info.h
   trunk/lib/engine/display/x/display-manager-x.h
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/opal-call.cpp
   trunk/src/gui/main.cpp

Modified: trunk/lib/engine/display/dx/Makefile.am
==============================================================================
--- trunk/lib/engine/display/dx/Makefile.am	(original)
+++ trunk/lib/engine/display/dx/Makefile.am	Thu Jan 24 09:15:22 2008
@@ -3,13 +3,14 @@
 display_dir = $(top_srcdir)/lib/engine/display/dx
 common_dir = $(top_srcdir)/lib/engine/display/common
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(DX_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(DX_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/display/skel \
-	-I$(top_srcdir)/lib/engine/display/common
+	-I$(top_srcdir)/lib/engine/display/common \
+	-I$(top_srcdir)/lib/gui
 
 libgmdisplay_dx_la_SOURCES = \
 	$(common_dir)/display-manager-common.cpp\
@@ -19,4 +20,4 @@
 	$(display_dir)/display-main-dx.cpp    \
 	$(display_dir)/display-main-dx.h
 
-libgmdisplay_dx_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(DX_LIBS)
+libgmdisplay_dx_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(PTLIB_LIBS) $(DX_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/display/dx/display-main-dx.cpp
==============================================================================
--- trunk/lib/engine/display/dx/display-main-dx.cpp	(original)
+++ trunk/lib/engine/display/dx/display-main-dx.cpp	Thu Jan 24 09:15:22 2008
@@ -40,7 +40,7 @@
 #include "display-manager-dx.h"
 
 bool
-display_x_init (Ekiga::ServiceCore &core,
+display_dx_init (Ekiga::ServiceCore &core,
 	    int */*argc*/,
 	    char **/*argv*/[])
 {

Modified: trunk/lib/engine/display/dx/display-manager-dx.cpp
==============================================================================
--- trunk/lib/engine/display/dx/display-manager-dx.cpp	(original)
+++ trunk/lib/engine/display/dx/display-manager-dx.cpp	Thu Jan 24 09:15:22 2008
@@ -59,7 +59,7 @@
 void
 GMDisplayManager_dx::setup_frame_display ()
 {
-  Display local_display_info;
+  DisplayInfo local_display_info;
 
   get_display_info(local_display_info);
 
@@ -86,8 +86,8 @@
     break; 
   }
 
-  if ((!local_display_info.widget_info_set) || (!local_display_info.config_info_set)) 
-      (local_display_info.display == UNSET) || (local_display_info.zoom == 0) || (current_frame.zoom == 0)) {
+  if (   (!local_display_info.widget_info_set) || (!local_display_info.config_info_set) 
+      || (local_display_info.display == UNSET) || (local_display_info.zoom == 0) || (current_frame.zoom == 0)) {
     PTRACE(4, "GMDisplayManager_DX\tWidget not yet realized or gconf info not yet set, not opening display");
     return;
   }
@@ -96,13 +96,13 @@
 
   runtime.run_in_main (sigc::bind (display_mode_changed.make_slot (), current_frame.display));
 
-  HwAccelStatus hw_accel_stats = NONE;
+  HwAccelStatus hw_accel_status = NONE;
 
   switch (current_frame.display) {
   case LOCAL_VIDEO:
     PTRACE(4, "GMDisplayManager_DX\tOpening LOCAL_VIDEO display with image of " << current_frame.local_width << "x" << current_frame.local_height);
     dxWindow = new DXWindow();
-    hw_accel_stats = (HwAccelStatus) dxWindow->Init (local_display_info.hwnd,
+    hw_accel_status = (HwAccelStatus) dxWindow->Init (local_display_info.hwnd,
                           local_display_info.x,
                           local_display_info.y,
                             (int) (current_frame.local_width * current_frame.zoom / 100), 
@@ -110,8 +110,8 @@
                             current_frame.local_width, 
                             current_frame.local_height);
 
-    lastFrame.embeddedX = local_display_info.x;
-    lastFrame.embeddedY = local_display_info.y;
+    last_frame.embedded_x = local_display_info.x;
+    last_frame.embedded_y = local_display_info.y;
 
     last_frame.display = LOCAL_VIDEO;
     last_frame.local_width = current_frame.local_width;
@@ -122,7 +122,7 @@
   case REMOTE_VIDEO:
     PTRACE(4, "GMDisplayManager_DX\tOpening REMOTE_VIDEO display with image of " << current_frame.remote_width << "x" << current_frame.remote_height);
     dxWindow = new DXWindow();
-    hw_accel_stats = (HwAccelStatus) dxWindow->Init (local_display_info.hwnd,
+    hw_accel_status = (HwAccelStatus) dxWindow->Init (local_display_info.hwnd,
                           local_display_info.x,
                           local_display_info.y,
                           (int) (current_frame.remote_width * current_frame.zoom / 100), 
@@ -130,8 +130,8 @@
                           current_frame.remote_width, 
                           current_frame.remote_height); 
 
-    lastFrame.embeddedX = local_display_info.x;
-    lastFrame.embeddedY = local_display_info.y;
+    last_frame.embedded_x = local_display_info.x;
+    last_frame.embedded_y = local_display_info.y;
 
     last_frame.display = REMOTE_VIDEO;
     last_frame.remote_width = current_frame.remote_width;
@@ -146,7 +146,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();
-    hw_accel_stats = (HwAccelStatus) dxWindow->Init ((current_frame.display == PIP) ? local_display_info.hwnd : NULL,
+    hw_accel_status = (HwAccelStatus) dxWindow->Init ((current_frame.display == PIP) ? local_display_info.hwnd : NULL,
                           (current_frame.display == PIP) ? local_display_info.x : 0,
                           (current_frame.display == PIP) ? local_display_info.y : 0,
                           (int) (current_frame.remote_width * current_frame.zoom  / 100), 
@@ -159,8 +159,8 @@
     if (dxWindow && current_frame.display == FULLSCREEN) 
       dxWindow->ToggleFullscreen ();
 
-    lastFrame.embeddedX = local_display_info.x;
-    lastFrame.embeddedY = local_display_info.y;
+    last_frame.embedded_x = local_display_info.x;
+    last_frame.embedded_y = local_display_info.y;
 
     last_frame.display = current_frame.display;
     last_frame.local_width = current_frame.local_width;
@@ -175,7 +175,7 @@
     return;
     break;
   }
-  PTRACE (4, "GMVideoDisplay_DX\tSetup display " << display << " with zoom value of " << zoom );
+  PTRACE (4, "GMVideoDisplay_DX\tSetup display " << current_frame.display << " with zoom value of " << current_frame.zoom );
 
   if (local_display_info.on_top && dxWindow)
       dxWindow->ToggleOntop ();
@@ -217,7 +217,7 @@
                                  unsigned rf_height)
 {
 // FIXME processEvents
-  if (currentFrame.display == FULLSCREEN && dxWindow && !dxWindow->IsFullScreen ())
+  if (current_frame.display == FULLSCREEN && dxWindow && !dxWindow->IsFullScreen ())
     runtime.run_in_main (sigc::bind (fullscreen_mode_changed.make_slot (), OFF));
 
 //  if (dxWindow && (update_required.remote || (!update_required.remote && !update_required.local)))
@@ -228,7 +228,7 @@
 }
 
 void
-GMDisplayManager_x::sync (UpdateRequired sync_required)
+GMDisplayManager_dx::sync (UpdateRequired sync_required)
 {
   // FIXME sync
 }

Modified: trunk/lib/engine/display/dx/display-manager-dx.h
==============================================================================
--- trunk/lib/engine/display/dx/display-manager-dx.h	(original)
+++ trunk/lib/engine/display/dx/display-manager-dx.h	Thu Jan 24 09:15:22 2008
@@ -42,6 +42,7 @@
 #define _DISPLAY_MANAGER_DX_H_
 
 #include "display-manager-common.h"
+#include "dxwindow.h"
 
 class GMDisplayManager_dx
    : public  GMDisplayManager

Modified: trunk/lib/engine/display/skel/display-info.h
==============================================================================
--- trunk/lib/engine/display/skel/display-info.h	(original)
+++ trunk/lib/engine/display/skel/display-info.h	Thu Jan 24 09:15:22 2008
@@ -37,11 +37,14 @@
 #ifndef __DISPLAY_INFO_H__
 #define __DISPLAY_INFO_H__
 
-#include "X11/Xlib.h"
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <X11/Xlib.h>
 #ifdef None
 #undef None
 #endif
-
+#endif
 //namespace Ekiga {
 
 /**

Modified: trunk/lib/engine/display/x/display-manager-x.h
==============================================================================
--- trunk/lib/engine/display/x/display-manager-x.h	(original)
+++ trunk/lib/engine/display/x/display-manager-x.h	Thu Jan 24 09:15:22 2008
@@ -42,7 +42,7 @@
 #define _DISPLAY_MANAGER_X_H_
 
 #include "display-manager-common.h"
-#include "../../../gui/xwindow.h"
+#include "xwindow.h"
 
 class GMDisplayManager_x
    : public  GMDisplayManager

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Thu Jan 24 09:15:22 2008
@@ -61,6 +61,8 @@
 #include <ptclib/html.h>
 #include <ptclib/pstun.h>
 
+#include <math.h>
+
 #define new PNEW
 
 

Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp	(original)
+++ trunk/src/endpoints/opal-call.cpp	Thu Jan 24 09:15:22 2008
@@ -480,9 +480,9 @@
 
   }
 
-  lost_packets = (lost_a + lost_v) / max (total_a + total_v, (DWORD) 1);
-  late_packets = (too_late_a + too_late_v) / max (total_a + total_v, (DWORD) 1);
-  out_of_order_packets = (out_of_order_a + out_of_order_v) / max (total_a + total_v, (DWORD) 1);
+  lost_packets = (lost_a + lost_v) / max ((unsigned long)(total_a + total_v), (unsigned long) 1);
+  late_packets = (too_late_a + too_late_v) / max ((unsigned long)(total_a + total_v), (unsigned long) 1);
+  out_of_order_packets = (out_of_order_a + out_of_order_v) / max ((unsigned long)(total_a + total_v), (unsigned long) 1);
 }
 
 

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Thu Jan 24 09:15:22 2008
@@ -75,6 +75,7 @@
 #include <gdk/gdkx.h>
 #else
 #include "platform/winpaths.h"
+#include <gdk/gdkwin32.h>
 #endif
 
 #ifdef HAVE_GNOME