ekiga r7469 - in trunk: . lib/engine/components/opal

[dsandras svn gnome org]

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

Log:
Fixed video and audio not working since the files were moved into the
library as reported by Eugen. 


Modified:
   trunk/ChangeLog
   trunk/lib/engine/components/opal/Makefile.am
   trunk/lib/engine/components/opal/opal-audio.cpp
   trunk/lib/engine/components/opal/opal-call-manager.cpp
   trunk/lib/engine/components/opal/opal-main.cpp
   trunk/lib/engine/components/opal/opal-videoinput.cpp
   trunk/lib/engine/components/opal/opal-videooutput.cpp

Modified: trunk/lib/engine/components/opal/Makefile.am
==============================================================================
--- trunk/lib/engine/components/opal/Makefile.am	(original)
+++ trunk/lib/engine/components/opal/Makefile.am	Sun Dec 21 12:12:40 2008
@@ -62,7 +62,4 @@
 	$(opal_dir)/sip-endpoint.cpp
 endif
 
-libopal_la_LIBADD = \
-	$(top_builddir)/lib/engine/framework/libgmframework.la
-
 libopal_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS)

Modified: trunk/lib/engine/components/opal/opal-audio.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-audio.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-audio.cpp	Sun Dec 21 12:12:40 2008
@@ -44,6 +44,9 @@
 #include "opal-audio.h"
 #include "engine.h"
 
+namespace OpalLinkerHacks {
+  int loadOpalAudio;
+}
 
 /* Plugin definition */
 class PSoundChannel_EKIGA_PluginServiceDescriptor 

Modified: trunk/lib/engine/components/opal/opal-call-manager.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-call-manager.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-call-manager.cpp	Sun Dec 21 12:12:40 2008
@@ -163,8 +163,6 @@
 
   g_async_queue_unref (queue);
   runtime->unreference ();
-
-  std::cout << "bye callmanager" << std::endl << std::flush;
 }
 
 

Modified: trunk/lib/engine/components/opal/opal-main.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-main.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-main.cpp	Sun Dec 21 12:12:40 2008
@@ -58,6 +58,12 @@
 #define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
 #endif
 
+namespace OpalLinkerHacks {
+  extern int loadOpalVideoInput;
+  extern int loadOpalVideoOutput;
+  extern int loadOpalAudio;
+}
+
 
 static bool
 is_supported_address (const std::string uri)
@@ -154,6 +160,10 @@
   else
     return false;
 
+  OpalLinkerHacks::loadOpalVideoInput = 1;
+  OpalLinkerHacks::loadOpalVideoOutput = 1;
+  OpalLinkerHacks::loadOpalAudio = 1;
+
   core.add (call_manager);
 
   return result;

Modified: trunk/lib/engine/components/opal/opal-videoinput.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-videoinput.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-videoinput.cpp	Sun Dec 21 12:12:40 2008
@@ -46,6 +46,10 @@
 #include "engine.h"
 
 
+namespace OpalLinkerHacks {
+  int loadOpalVideoInput;
+}
+
 /* Plugin definition */
 class PVideoInputDevice_EKIGA_PluginServiceDescriptor 
 : public PDevicePluginServiceDescriptor

Modified: trunk/lib/engine/components/opal/opal-videooutput.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-videooutput.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-videooutput.cpp	Sun Dec 21 12:12:40 2008
@@ -44,10 +44,12 @@
 #include "opal-videooutput.h"
 #include "engine.h"
 
+namespace OpalLinkerHacks {
+  int loadOpalVideoOutput;
+}
 
 int PVideoOutputDevice_EKIGA::devices_nbr = 0;
 
-
 PMutex PVideoOutputDevice_EKIGA::videoDisplay_mutex;
 /* Plugin definition */
 class PVideoOutputDevice_EKIGA_PluginServiceDescriptor