GNOME.org
 

ekiga r7423 - in trunk: . lib/engine lib/engine/components/opal src src/devices src/gui

Author: dsandras
Date: Mon Dec  1 20:23:54 2008
New Revision: 7423
URL: http://svn.gnome.org/viewvc/ekiga?rev=7423&view=rev

Log:
Some more moving.


Added:
   trunk/lib/engine/components/opal/opal-audio.cpp   (contents, props changed)
      - copied, changed from r7421, /trunk/src/devices/audiodev.cpp
   trunk/lib/engine/components/opal/opal-audio.h   (props changed)
      - copied unchanged from r7421, /trunk/src/devices/audiodev.h
   trunk/lib/engine/components/opal/opal-videoinput.cpp   (contents, props changed)
      - copied, changed from r7421, /trunk/src/devices/videoinput.cpp
   trunk/lib/engine/components/opal/opal-videoinput.h   (contents, props changed)
      - copied, changed from r7421, /trunk/src/devices/videoinput.h
   trunk/lib/engine/components/opal/opal-videooutput.cpp   (contents, props changed)
      - copied, changed from r7421, /trunk/src/devices/videooutput.cpp
   trunk/lib/engine/components/opal/opal-videooutput.h   (contents, props changed)
      - copied, changed from r7421, /trunk/src/devices/videooutput.h
Removed:
   trunk/src/devices/
Modified:
   trunk/ChangeLog
   trunk/lib/engine/components/opal/Makefile.am
   trunk/lib/engine/engine.cpp
   trunk/lib/engine/engine.h
   trunk/src/Makefile.am
   trunk/src/ekiga.cpp
   trunk/src/ekiga.h
   trunk/src/gui/main.cpp

Modified: trunk/lib/engine/components/opal/Makefile.am
==============================================================================
--- trunk/lib/engine/components/opal/Makefile.am	(original)
+++ trunk/lib/engine/components/opal/Makefile.am	Mon Dec  1 20:23:54 2008
@@ -12,6 +12,7 @@
 	-I$(top_srcdir)/lib/engine/account/skel		\
 	-I$(top_srcdir)/lib/engine/addressbook/skel	\
 	-I$(top_srcdir)/lib/engine/chat/skel		\
+	-I$(top_srcdir)/lib/engine/hal/skel		\
 	-I$(top_srcdir)/lib/engine/presence/skel	\
 	-I$(top_srcdir)/lib/engine/protocol/skel	\
 	-I$(top_srcdir)/lib/engine/videooutput/skel	\
@@ -21,23 +22,29 @@
 	-I$(top_srcdir)/lib/engine/framework
 
 # Endpoints 
-libopal_la_SOURCES = \
-	$(opal_dir)/opal-call-manager.h \
-	$(opal_dir)/opal-call-manager.cpp \
-	$(opal_dir)/pcss-endpoint.h \
-	$(opal_dir)/pcss-endpoint.cpp \
-	$(opal_dir)/opal-account.h \
-	$(opal_dir)/opal-account.cpp \
-	$(opal_dir)/opal-bank.h \
-	$(opal_dir)/opal-bank.cpp \
-	$(opal_dir)/opal-call.h \
-	$(opal_dir)/opal-call.cpp \
-	$(opal_dir)/opal-codec-description.h \
-	$(opal_dir)/opal-codec-description.cpp \
-	$(opal_dir)/opal-gmconf-bridge.h \
-	$(opal_dir)/opal-gmconf-bridge.cpp \
-	$(opal_dir)/opal-main.h \
-	$(opal_dir)/opal-main.cpp
+libopal_la_SOURCES =                            \
+	$(opal_dir)/opal-call-manager.h         \
+	$(opal_dir)/opal-call-manager.cpp       \
+	$(opal_dir)/pcss-endpoint.h             \
+	$(opal_dir)/pcss-endpoint.cpp           \
+	$(opal_dir)/opal-account.h              \
+	$(opal_dir)/opal-account.cpp            \
+	$(opal_dir)/opal-bank.h                 \
+	$(opal_dir)/opal-bank.cpp               \
+	$(opal_dir)/opal-call.h                 \
+	$(opal_dir)/opal-call.cpp               \
+	$(opal_dir)/opal-codec-description.h    \
+	$(opal_dir)/opal-codec-description.cpp  \
+	$(opal_dir)/opal-gmconf-bridge.h        \
+	$(opal_dir)/opal-gmconf-bridge.cpp      \
+	$(opal_dir)/opal-main.h                 \
+	$(opal_dir)/opal-main.cpp               \
+	$(opal_dir)/opal-audio.h                \
+	$(opal_dir)/opal-audio.cpp              \
+	$(opal_dir)/opal-videoinput.h           \
+	$(opal_dir)/opal-videoinput.cpp         \
+	$(opal_dir)/opal-videooutput.h          \
+	$(opal_dir)/opal-videooutput.cpp
 
 if HAVE_H323
 libopal_la_SOURCES += \

Copied: trunk/lib/engine/components/opal/opal-audio.cpp (from r7421, /trunk/src/devices/audiodev.cpp)
==============================================================================
--- /trunk/src/devices/audiodev.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-audio.cpp	Mon Dec  1 20:23:54 2008
@@ -39,10 +39,11 @@
 
 #define P_FORCE_STATIC_PLUGIN
 
-#pragma implementation "audiodev.h"
+#pragma implementation "opal-audio.h"
+
+#include "opal-audio.h"
+#include "engine.h"
 
-#include "audiodev.h"
-#include "ekiga.h"
 
 /* Plugin definition */
 class PSoundChannel_EKIGA_PluginServiceDescriptor 
@@ -51,7 +52,7 @@
   public:
     virtual PObject *CreateInstance (int) const 
       {
-	return new PSoundChannel_EKIGA (*(GnomeMeeting::Process ()->GetServiceCore ())); 
+	return new PSoundChannel_EKIGA (*(engine_get_service_core ())); 
       }
     
     

Copied: trunk/lib/engine/components/opal/opal-videoinput.cpp (from r7421, /trunk/src/devices/videoinput.cpp)
==============================================================================
--- /trunk/src/devices/videoinput.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-videoinput.cpp	Mon Dec  1 20:23:54 2008
@@ -38,8 +38,13 @@
 
 #define P_FORCE_STATIC_PLUGIN
 
-#include "videoinput.h"
-#include "ekiga.h"
+#include <ptbuildopts.h>
+#include <ptlib.h>
+#include <opal/manager.h>
+
+#include "opal-videoinput.h"
+#include "engine.h"
+
 
 /* Plugin definition */
 class PVideoInputDevice_EKIGA_PluginServiceDescriptor 
@@ -48,7 +53,7 @@
   public:
     virtual PObject *CreateInstance (int) const 
       {
-	return new PVideoInputDevice_EKIGA (*(GnomeMeeting::Process ()->GetServiceCore ())); 
+	return new PVideoInputDevice_EKIGA (*(engine_get_service_core ())); 
       }
     
     

Copied: trunk/lib/engine/components/opal/opal-videoinput.h (from r7421, /trunk/src/devices/videoinput.h)
==============================================================================
--- /trunk/src/devices/videoinput.h	(original)
+++ trunk/lib/engine/components/opal/opal-videoinput.h	Mon Dec  1 20:23:54 2008
@@ -41,7 +41,7 @@
 #define _EKIGA_VIDEO_INPUT_H_
 
 #include "videoinput-core.h"
-#include "common.h"
+
 
 class PVideoInputDevice_EKIGA : public PVideoInputDevice 
 {

Copied: trunk/lib/engine/components/opal/opal-videooutput.cpp (from r7421, /trunk/src/devices/videooutput.cpp)
==============================================================================
--- /trunk/src/devices/videooutput.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-videooutput.cpp	Mon Dec  1 20:23:54 2008
@@ -35,16 +35,15 @@
  *
  */
 
-
-#include "config.h"
-
 #define P_FORCE_STATIC_PLUGIN 
 
-#include "videooutput.h"
+#include <ptbuildopts.h>
+#include <ptlib.h>
+#include <opal/manager.h>
+
+#include "opal-videooutput.h"
+#include "engine.h"
 
-#include "ekiga.h"
-#include "misc.h"
-#include "main.h"
 
 int PVideoOutputDevice_EKIGA::devices_nbr = 0;
 
@@ -57,7 +56,7 @@
   public:
     virtual PObject *CreateInstance (int) const 
       {
-	return new PVideoOutputDevice_EKIGA (*(GnomeMeeting::Process ()->GetServiceCore ())); 
+	return new PVideoOutputDevice_EKIGA (*(engine_get_service_core ())); 
       }
     
     

Copied: trunk/lib/engine/components/opal/opal-videooutput.h (from r7421, /trunk/src/devices/videooutput.h)
==============================================================================
--- /trunk/src/devices/videooutput.h	(original)
+++ trunk/lib/engine/components/opal/opal-videooutput.h	Mon Dec  1 20:23:54 2008
@@ -41,7 +41,6 @@
 #define _EKIGA_VIDEO_OUTPUT_H_
 
 #include "videooutput-core.h"
-#include "common.h"
 
 class GMManager;
 

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Mon Dec  1 20:23:54 2008
@@ -110,13 +110,15 @@
 #include "resource-list-main.h"
 #endif
 
+
+static Ekiga::ServiceCore *service_core = NULL;
+
 void
 engine_init (int argc,
              char *argv [],
-             Ekiga::Runtime* runtime,
-             Ekiga::ServiceCore * &core)
+             Ekiga::Runtime* runtime)
 {
-  core = new Ekiga::ServiceCore;
+  service_core = new Ekiga::ServiceCore;
 
   /* VideoInputCore depends on VideoOutputCore and must this              *
    * be constructed thereafter                                      */
@@ -139,150 +141,150 @@
    *   components may still call runtime functions until destroyed  *
    *   (e.g. VideoOutputCore).                                          */
 
-  core->add (gmref_ptr<Ekiga::Runtime>(runtime));
-  core->add (account_core);
-  core->add (contact_core);
-  core->add (chat_core);
-  core->add (videooutput_core);
-  core->add (videoinput_core);
-  core->add (audiooutput_core);
-  core->add (audioinput_core);
-  core->add (hal_core);
-  core->add (call_core);
+  service_core->add (gmref_ptr<Ekiga::Runtime>(runtime));
+  service_core->add (account_core);
+  service_core->add (contact_core);
+  service_core->add (chat_core);
+  service_core->add (videooutput_core);
+  service_core->add (videoinput_core);
+  service_core->add (audiooutput_core);
+  service_core->add (audioinput_core);
+  service_core->add (hal_core);
+  service_core->add (call_core);
 
-  if (!gmconf_personal_details_init (*core, &argc, &argv)) {
-    delete core;
+  if (!gmconf_personal_details_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  gmref_ptr<Ekiga::PresenceCore> presence_core (new Ekiga::PresenceCore (*core));
-  core->add (presence_core);
+  gmref_ptr<Ekiga::PresenceCore> presence_core (new Ekiga::PresenceCore (*service_core));
+  service_core->add (presence_core);
 
 #ifndef WIN32
-  if (!videooutput_x_init (*core, &argc, &argv)) {
-    delete core;
+  if (!videooutput_x_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 #endif
 
 #ifdef HAVE_XCAP
-  xcap_init (*core);
+  xcap_init (*service_core);
 #endif
 
 #ifdef HAVE_DX
-  if (!videooutput_dx_init (*core, &argc, &argv)) {
-    delete core;
+  if (!videooutput_dx_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 #endif
 
-  if (!videoinput_mlogo_init (*core, &argc, &argv)) {
-    delete core;
+  if (!videoinput_mlogo_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
 #ifdef HAVE_GSTREAMER
-  (void)gstreamer_init (*core, &argc, &argv);
+  (void)gstreamer_init (*service_core, &argc, &argv);
 #endif
 
-  if (!audioinput_null_init (*core, &argc, &argv)) {
-    delete core;
+  if (!audioinput_null_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!audiooutput_null_init (*core, &argc, &argv)) {
-    delete core;
+  if (!audiooutput_null_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!videoinput_ptlib_init (*core, &argc, &argv)) {
-    delete core;
+  if (!videoinput_ptlib_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!audioinput_ptlib_init (*core, &argc, &argv)) {
-    delete core;
+  if (!audioinput_ptlib_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!audiooutput_ptlib_init (*core, &argc, &argv)) {
-    delete core;
+  if (!audiooutput_ptlib_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
 #ifdef HAVE_DBUS
-  if (!hal_dbus_init (*core, &argc, &argv)) {
-    delete core;
+  if (!hal_dbus_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 #endif
 
-  if (!opal_init (*core, &argc, &argv)) {
-    delete core;
+  if (!opal_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
 #ifdef HAVE_AVAHI
-  if (!avahi_init (*core, &argc, &argv)) {
-    delete core;
+  if (!avahi_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!avahi_publisher_init (*core, &argc, &argv)) {
-    delete core;
+  if (!avahi_publisher_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 #endif
 
 #ifdef HAVE_EDS
-  if (!evolution_init (*core, &argc, &argv)) {
-    delete core;
+  if (!evolution_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 #endif
 
 #ifdef HAVE_LDAP
-  if (!ldap_init (*core, &argc, &argv)) {
-    delete core;
+  if (!ldap_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 #endif
 
 #ifdef HAVE_KDE
-  (void)kde_init (*core, &argc, &argv);
+  (void)kde_init (*service_core, &argc, &argv);
 #endif
 
 #ifdef HAVE_KAB
-  (void)kab_init (*core, &argc, &argv);
+  (void)kab_init (*service_core, &argc, &argv);
 #endif
 
 #ifdef HAVE_XCAP
-  resource_list_init (*core, &argc, &argv);
+  resource_list_init (*service_core, &argc, &argv);
 #endif
 
-  if (!history_init (*core, &argc, &argv)) {
+  if (!history_init (*service_core, &argc, &argv)) {
 
-    delete core;
+    delete service_core;
     return;
   }
 
-  if (!gtk_core_init (*core, &argc, &argv)) {
-    delete core;
+  if (!gtk_core_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!gtk_frontend_init (*core, &argc, &argv)) {
-    delete core;
+  if (!gtk_frontend_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!local_roster_init (*core, &argc, &argv)) {
-    delete core;
+  if (!local_roster_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
-  if (!local_roster_bridge_init (*core, &argc, &argv)) {
-    delete core;
+  if (!local_roster_bridge_init (*service_core, &argc, &argv)) {
+    delete service_core;
     return;
   }
 
@@ -301,3 +303,10 @@
   // std::vector<sigc::connection> connections;
   //connections.push_back (conn);
 }
+
+
+Ekiga::ServiceCore *
+engine_get_service_core ()
+{
+  return service_core;
+}

Modified: trunk/lib/engine/engine.h
==============================================================================
--- trunk/lib/engine/engine.h	(original)
+++ trunk/lib/engine/engine.h	Mon Dec  1 20:23:54 2008
@@ -48,8 +48,11 @@
 void
 engine_init (int argc,
              char *argv[],
-             Ekiga::Runtime *runtime,
-             Ekiga::ServiceCore *& core);
+             Ekiga::Runtime *runtime);
+
+
+Ekiga::ServiceCore *
+engine_get_service_core ();
 
 /**
  * @}

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Dec  1 20:23:54 2008
@@ -81,16 +81,6 @@
 	gui/statusmenu.h		\
 	gui/statusmenu.cpp
 
-# Devices 
-ekiga_SOURCES +=			\
-	devices/videoinput.h  	        \
-	devices/videoinput.cpp		\
-	devices/videooutput.h           \
-	devices/videooutput.cpp         \
-	devices/audiodev.h              \
-	devices/audiodev.cpp
-
-
 # Endpoints 
 ekiga_SOURCES +=				\
 	ekiga.h			                \

Modified: trunk/src/ekiga.cpp
==============================================================================
--- trunk/src/ekiga.cpp	(original)
+++ trunk/src/ekiga.cpp	Mon Dec  1 20:23:54 2008
@@ -72,7 +72,6 @@
   
   call_number = 0;
 
-  service_core = NULL;
   assistant_window = NULL;
   prefs_window = NULL;
 }
@@ -114,10 +113,6 @@
     g_object_unref (dbus_component);
   dbus_component = NULL;
 #endif
-
-  if (service_core)
-    delete service_core;
-  service_core = NULL;
 }
 
 
@@ -126,7 +121,7 @@
 {
   PWaitAndSignal m(ep_var_mutex);
   
-  return service_core;
+  return engine_get_service_core (); 
 }
 
 
@@ -148,7 +143,7 @@
 GnomeMeeting::GetPrefsWindow (bool create)
 {
   if (!prefs_window && create)
-    prefs_window = gm_prefs_window_new (service_core);
+    prefs_window = gm_prefs_window_new (GetServiceCore ());
   return prefs_window;
 }
 
@@ -157,7 +152,7 @@
 GnomeMeeting::GetAssistantWindow (bool create)
 {
   if (!assistant_window && create)
-    assistant_window = ekiga_assistant_new (service_core);
+    assistant_window = ekiga_assistant_new (GetServiceCore ());
 
   return assistant_window;
 }
@@ -188,10 +183,10 @@
   
   /* Build the GUI */
   gtk_window_set_default_icon_name (GM_ICON_LOGO);
-  accounts_window = gm_accounts_window_new (*service_core);
+  accounts_window = gm_accounts_window_new (*GetServiceCore ());
 
-  statusicon = statusicon_new (*service_core);
-  main_window = gm_main_window_new (*service_core);
+  statusicon = statusicon_new (*GetServiceCore ());
+  main_window = gm_main_window_new (*GetServiceCore ());
 
   /* GM is started */
   PTRACE (1, "Ekiga version "
@@ -232,8 +227,5 @@
   PWaitAndSignal m(ep_var_mutex);
 
   Ekiga::Runtime *runtime = new Ekiga::GlibRuntime;
-  engine_init (1, NULL, runtime, service_core);
-
-  if (!service_core)
-    std::cout << "engine couldn't init!" << std::endl;
+  engine_init (1, NULL, runtime);
 }

Modified: trunk/src/ekiga.h
==============================================================================
--- trunk/src/ekiga.h	(original)
+++ trunk/src/ekiga.h	Mon Dec  1 20:23:54 2008
@@ -153,8 +153,6 @@
 
  private:
   
-  Ekiga::ServiceCore *service_core;
-
   PMutex ep_var_mutex;
   PMutex dev_access_mutex;
   int call_number;

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Mon Dec  1 20:23:54 2008
@@ -101,8 +101,6 @@
 #include "services.h"
 #include "form-dialog-gtk.h"
 
-#include "../devices/videooutput.h"
-
 enum CallingState {Standby, Calling, Connected, Called};
 
 enum DeviceType { AudioInput, AudioOutput, VideoInput} ;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]