ekiga r7374 - in trunk: . lib/engine lib/engine/components lib/engine/components/opal src src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Sun Nov 16 21:40:12 2008
New Revision: 7374
URL: http://svn.gnome.org/viewvc/ekiga?rev=7374&view=rev

Log:
Moved the OPAL CallManager stuff to the engine where it belongs to.


Added:
   trunk/lib/engine/components/opal/
   trunk/lib/engine/components/opal/h323-endpoint.cpp
      - copied unchanged from r7371, /trunk/src/endpoints/h323-endpoint.cpp
   trunk/lib/engine/components/opal/h323-endpoint.h
      - copied unchanged from r7371, /trunk/src/endpoints/h323-endpoint.h
   trunk/lib/engine/components/opal/opal-account.cpp   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-account.cpp
   trunk/lib/engine/components/opal/opal-account.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-account.h
   trunk/lib/engine/components/opal/opal-bank.cpp   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-bank.cpp
   trunk/lib/engine/components/opal/opal-bank.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-bank.h
   trunk/lib/engine/components/opal/opal-call-manager.cpp
      - copied unchanged from r7371, /trunk/src/endpoints/opal-call-manager.cpp
   trunk/lib/engine/components/opal/opal-call-manager.h
      - copied, changed from r7371, /trunk/src/endpoints/opal-call-manager.h
   trunk/lib/engine/components/opal/opal-call.cpp   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-call.cpp
   trunk/lib/engine/components/opal/opal-call.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-call.h
   trunk/lib/engine/components/opal/opal-codec-description.cpp   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-codec-description.cpp
   trunk/lib/engine/components/opal/opal-codec-description.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-codec-description.h
   trunk/lib/engine/components/opal/opal-gmconf-bridge.cpp   (contents, props changed)
      - copied, changed from r7371, /trunk/src/endpoints/opal-gmconf-bridge.cpp
   trunk/lib/engine/components/opal/opal-gmconf-bridge.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-gmconf-bridge.h
   trunk/lib/engine/components/opal/opal-main.cpp   (contents, props changed)
      - copied, changed from r7371, /trunk/src/endpoints/opal-main.cpp
   trunk/lib/engine/components/opal/opal-main.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/opal-main.h
   trunk/lib/engine/components/opal/pcss-endpoint.cpp
      - copied unchanged from r7371, /trunk/src/endpoints/pcss-endpoint.cpp
   trunk/lib/engine/components/opal/pcss-endpoint.h
      - copied, changed from r7371, /trunk/src/endpoints/pcss-endpoint.h
   trunk/lib/engine/components/opal/sip-chat-simple.cpp   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/sip-chat-simple.cpp
   trunk/lib/engine/components/opal/sip-chat-simple.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/sip-chat-simple.h
   trunk/lib/engine/components/opal/sip-dialect.cpp   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/sip-dialect.cpp
   trunk/lib/engine/components/opal/sip-dialect.h   (props changed)
      - copied unchanged from r7371, /trunk/src/endpoints/sip-dialect.h
   trunk/lib/engine/components/opal/sip-endpoint.cpp
      - copied unchanged from r7371, /trunk/src/endpoints/sip-endpoint.cpp
   trunk/lib/engine/components/opal/sip-endpoint.h
      - copied unchanged from r7371, /trunk/src/endpoints/sip-endpoint.h
Removed:
   trunk/src/endpoints/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov 16 21:40:12 2008
@@ -808,6 +808,7 @@
 lib/engine/components/kde/Makefile
 lib/engine/components/resource-list/Makefile
 lib/engine/components/xcap/Makefile
+lib/engine/components/opal/Makefile
 )
 
 

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Nov 16 21:40:12 2008
@@ -29,6 +29,7 @@
 	-I$(top_srcdir)/lib/engine/components/avahi-publisher		\
 	-I$(top_srcdir)/lib/engine/components/gstreamer			\
 	-I$(top_srcdir)/lib/engine/components/kde			\
+	-I$(top_srcdir)/lib/engine/components/opal	                \
 	-I$(top_srcdir)/lib/engine/components/resource-list		\
 	-I$(top_srcdir)/lib/engine/components/xcap
 
@@ -87,6 +88,7 @@
 	$(top_builddir)/lib/engine/audiooutput/skel/libgmaudiooutput.la					\
 	$(top_builddir)/lib/engine/hal/skel/libgmhal.la							\
 	$(top_builddir)/lib/engine/components/gmconf-personal-details/libgmconfpersonaldetails.la	\
+	$(top_builddir)/lib/engine/components/opal/libopal.la                                           \
 	$(AM_LIBS)
 
 # Default Input Devices

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Sun Nov 16 21:40:12 2008
@@ -14,9 +14,10 @@
 XCAP_DIRS = xcap resource-list
 endif
 
-SUBDIRS = \
+SUBDIRS =                       \
 	gmconf-personal-details \
-	$(AVAHI_DIR) \
-	$(GSTREAMER_DIR) \
-	$(KDE_DIR) \
-	$(XCAP_DIRS)
\ No newline at end of file
+        opal                    \
+	$(AVAHI_DIR)            \
+	$(GSTREAMER_DIR)        \
+	$(KDE_DIR)              \
+	$(XCAP_DIRS)

Copied: trunk/lib/engine/components/opal/opal-call-manager.h (from r7371, /trunk/src/endpoints/opal-call-manager.h)
==============================================================================
--- /trunk/src/endpoints/opal-call-manager.h	(original)
+++ trunk/lib/engine/components/opal/opal-call-manager.h	Sun Nov 16 21:40:12 2008
@@ -50,8 +50,6 @@
 #include <h323/h323.h>
 #include <sip/sip.h>
 
-#include "common.h"
-
 #include "gmconf-bridge.h"
 #include "runtime.h"
 #include "contact-core.h"

Copied: trunk/lib/engine/components/opal/opal-gmconf-bridge.cpp (from r7371, /trunk/src/endpoints/opal-gmconf-bridge.cpp)
==============================================================================
--- /trunk/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-gmconf-bridge.cpp	Sun Nov 16 21:40:12 2008
@@ -47,6 +47,19 @@
 #include "sip-endpoint.h"
 #include "h323-endpoint.h"
 
+#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
+#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
+#define PERSONAL_DATA_KEY "/apps/" PACKAGE_NAME "/general/personal_data/"
+#define CALL_OPTIONS_KEY "/apps/" PACKAGE_NAME "/general/call_options/"
+#define NAT_KEY "/apps/" PACKAGE_NAME "/general/nat/"
+#define PROTOCOLS_KEY "/apps/" PACKAGE_NAME "/protocols/"
+#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
+#define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
+#define PORTS_KEY "/apps/" PACKAGE_NAME "/protocols/ports/"
+#define CALL_FORWARDING_KEY "/apps/" PACKAGE_NAME "/protocols/call_forwarding/"
+#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
+#define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"
+
 using namespace Opal;
 
 

Copied: trunk/lib/engine/components/opal/opal-main.cpp (from r7371, /trunk/src/endpoints/opal-main.cpp)
==============================================================================
--- /trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-main.cpp	Sun Nov 16 21:40:12 2008
@@ -50,10 +50,12 @@
 
 #ifdef HAVE_SIP
 #include "sip-endpoint.h"
+#define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
 #endif
 
 #ifdef HAVE_H323
 #include "h323-endpoint.h"
+#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
 #endif
 
 

Copied: trunk/lib/engine/components/opal/pcss-endpoint.h (from r7371, /trunk/src/endpoints/pcss-endpoint.h)
==============================================================================
--- /trunk/src/endpoints/pcss-endpoint.h	(original)
+++ trunk/lib/engine/components/opal/pcss-endpoint.h	Sun Nov 16 21:40:12 2008
@@ -39,11 +39,12 @@
 #ifndef _PCSS_ENDPOINT_H_
 #define _PCSS_ENDPOINT_H_
 
-#include "common.h"
-
 #include "services.h"
 #include "runtime.h"
 
+#include <opal/opal.h>
+#include <opal/pcss.h>
+
 namespace Opal {
   class CallManager;
 }

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Nov 16 21:40:12 2008
@@ -19,6 +19,7 @@
 	-I$(top_srcdir)/lib/engine/hal/skel		\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/gui/gtk-core		\
+	-I$(top_srcdir)/lib/engine/components/opal	\
 	-I$(top_srcdir)/src				\
 	-I$(top_srcdir)/src/clients/			\
 	-I$(top_srcdir)/src/components/			\
@@ -93,39 +94,7 @@
 # Endpoints 
 ekiga_SOURCES +=				\
 	ekiga.h			                \
-	ekiga.cpp			        \
-	endpoints/opal-call-manager.h		\
-	endpoints/opal-call-manager.cpp		\
-	endpoints/pcss-endpoint.h		\
-	endpoints/pcss-endpoint.cpp		\
-	endpoints/opal-account.h		\
-	endpoints/opal-account.cpp		\
-	endpoints/opal-bank.h			\
-	endpoints/opal-bank.cpp			\
-	endpoints/opal-call.h			\
-	endpoints/opal-call.cpp			\
-	endpoints/opal-codec-description.h	\
-	endpoints/opal-codec-description.cpp	\
-	endpoints/opal-gmconf-bridge.h		\
-	endpoints/opal-gmconf-bridge.cpp	\
-	endpoints/opal-main.h			\
-	endpoints/opal-main.cpp
-
-if HAVE_H323
-ekiga_SOURCES +=		\
-	endpoints/h323-endpoint.h		\
-	endpoints/h323-endpoint.cpp
-endif
-
-if HAVE_SIP
-ekiga_SOURCES +=		\
-	endpoints/sip-chat-simple.h		\
-	endpoints/sip-chat-simple.cpp		\
-	endpoints/sip-dialect.h			\
-	endpoints/sip-dialect.cpp		\
-	endpoints/sip-endpoint.h		\
-	endpoints/sip-endpoint.cpp
-endif
+	ekiga.cpp
 
 if HAVE_DBUS 
 ekiga_SOURCES +=		\