ekiga r7058 - in trunk/lib/engine: . components/gstreamer

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Sep 23 05:51:37 2008
New Revision: 7058
URL: http://svn.gnome.org/viewvc/ekiga?rev=7058&view=rev

Log:
Hooked dummy gstreamer code to the engine

Added:
   trunk/lib/engine/components/gstreamer/gst-main.cpp
   trunk/lib/engine/components/gstreamer/gst-main.h
Modified:
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/gstreamer/Makefile.am
   trunk/lib/engine/engine.cpp

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Tue Sep 23 05:51:37 2008
@@ -24,7 +24,8 @@
 	-I$(top_srcdir)/lib/engine/audiooutput/skel			\
 	-I$(top_srcdir)/lib/engine/hal/skel				\
 	-I$(top_srcdir)/lib/engine/components/gmconf-personal-details	\
-	-I$(top_srcdir)/lib/engine/components/avahi-publisher
+	-I$(top_srcdir)/lib/engine/components/avahi-publisher		\
+	-I$(top_srcdir)/lib/engine/components/gstreamer
 
 # XVideo/X
 if !WIN32
@@ -129,6 +130,10 @@
 libekiga_engine_la_LIBADD += addressbook/ldap/libgmldap.la
 endif
 
+if HAVE_GSTREAMER
+libekiga_engine_la_LIBADD += components/gstreamer/libgmgstreamer.la
+endif
+
 #### FIXME should be removed at a later stage
 INCLUDES += \
 	-I$(top_srcdir)/lib/gui/	                \

Modified: trunk/lib/engine/components/gstreamer/Makefile.am
==============================================================================
--- trunk/lib/engine/components/gstreamer/Makefile.am	(original)
+++ trunk/lib/engine/components/gstreamer/Makefile.am	Tue Sep 23 05:51:37 2008
@@ -0,0 +1,14 @@
+noinst_LTLIBRARIES = libgmgstreamer.la
+
+gstreamer_dir = $(top_srcdir)/lib/engine/components/gstreamer/
+
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GSTREAMER_CFLAGS)
+
+INCLUDES = 						\
+	-I$(top_srcdir)/lib/engine/framework
+
+libgmgstreamer_la_SOURCES = \
+	$(gstreamer_dir)/gst-main.h \
+	$(gstreamer_dir)/gst-main.cpp
+
+libgmgstreamer_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GSTREAMER_LIBS)

Added: trunk/lib/engine/components/gstreamer/gst-main.cpp
==============================================================================
--- (empty file)
+++ trunk/lib/engine/components/gstreamer/gst-main.cpp	Tue Sep 23 05:51:37 2008
@@ -0,0 +1,49 @@
+
+/* Ekiga -- A VoIP and Video-Conferencing application
+ * Copyright (C) 2000-2008 Damien Sandras
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * Ekiga is licensed under the GPL license and as a special exception,
+ * you have permission to link or otherwise combine this program with the
+ * programs OPAL, OpenH323 and PWLIB, and distribute the combination,
+ * without applying the requirements of the GNU GPL to the OPAL, OpenH323
+ * and PWLIB programs, as long as you do follow the requirements of the
+ * GNU GPL for all the rest of the software thus combined.
+ */
+
+
+/*
+ *                         gst-main.cpp  -  description
+ *                         ------------------------------------------
+ *   begin                : written in 2008 by Julien Puydt
+ *   copyright            : (c) 2008 by Julien Puydt
+ *   description          : code to hook the gstreamer code to the main program
+ *
+ */
+
+#include "gst-main.h"
+#include "gst/gst.h"
+
+bool
+gstreamer_init (G_GNUC_UNUSED Ekiga::ServiceCore &services,
+		int *argc,
+		char **argv[])
+{
+  gst_init (argc, argv);
+
+  return true;
+}

Added: trunk/lib/engine/components/gstreamer/gst-main.h
==============================================================================
--- (empty file)
+++ trunk/lib/engine/components/gstreamer/gst-main.h	Tue Sep 23 05:51:37 2008
@@ -0,0 +1,47 @@
+
+/* Ekiga -- A VoIP and Video-Conferencing application
+ * Copyright (C) 2000-2008 Damien Sandras
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * Ekiga is licensed under the GPL license and as a special exception,
+ * you have permission to link or otherwise combine this program with the
+ * programs OPAL, OpenH323 and PWLIB, and distribute the combination,
+ * without applying the requirements of the GNU GPL to the OPAL, OpenH323
+ * and PWLIB programs, as long as you do follow the requirements of the
+ * GNU GPL for all the rest of the software thus combined.
+ */
+
+
+/*
+ *                         gst-main.h  -  description
+ *                         ------------------------------------------
+ *   begin                : written in 2008 by Julien Puydt
+ *   copyright            : (c) 2008 by Julien Puydt
+ *   description          : code to hook the gstreamer code to the main program
+ *
+ */
+
+#ifndef __GST_MAIN_H__
+#define __GST_MAIN_H__
+
+#include "services.h"
+
+bool gstreamer_init (Ekiga::ServiceCore &services,
+		     int *argc,
+		     char **argv[]);
+
+#endif

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Tue Sep 23 05:51:37 2008
@@ -93,6 +93,9 @@
 #include "ldap-main.h"
 #endif
 
+#ifdef HAVE_GSTREAMER
+#include "gst-main.h"
+#endif
 
 void
 engine_init (int argc,
@@ -162,6 +165,10 @@
     return;
   }
 
+#ifdef HAVE_GSTREAMER
+  (void)gstreamer_init (*core, &argc, &argv);
+#endif
+
   if (!audioinput_null_init (*core, &argc, &argv)) {
     delete core;
     return;