[gnome-contacts] Adding gstreamer support and Gst initialization in main.



commit e09da110d6ddbd9c1d8926eecc4424c8df9d70b7
Author: Erick PÃrez Castellanos <erick red gmail com>
Date:   Tue Feb 21 09:31:54 2012 -0500

    Adding gstreamer support and Gst initialization in main.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657978

 configure.ac    |   12 ++++++++++++
 src/Makefile.am |    9 +++++++++
 src/main.vala   |    4 ++++
 3 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4bcc84f..fd33163 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,18 @@ PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
 CONTACTS_PACKAGES="--pkg gtk+-3.0 --pkg gio-2.0 --pkg folks --pkg folks-telepathy --pkg folks-eds --pkg libnotify"
 AC_SUBST(CONTACTS_PACKAGES)
 
+gstreamers_modules="gdk-x11-3.0
+                    gstreamer-0.10
+                    gstreamer-interfaces-0.10
+                    "
+PKG_CHECK_MODULES(CONTACTS_GSTREAMER,
+                  [$gstreamers_modules],
+                  AM_CONDITIONAL(USE_GSTREAMER, true),
+                  AM_CONDITIONAL(USE_GSTREAMER, false))
+
+CONTACTS_GSTREAMER_PACKAGES="--pkg gdk-x11-3.0 --pkg gstreamer-0.10 --pkg gstreamer-interfaces-0.10"
+AC_SUBST(CONTACTS_GSTREAMER_PACKAGES)
+
 #############
 # Resources #
 #############
diff --git a/src/Makefile.am b/src/Makefile.am
index f96723e..31269f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,11 @@ AM_VALAFLAGS = \
 	@CONTACTS_PACKAGES@ \
 	$(NULL)
 
+if USE_GSTREAMER
+AM_VALAFLAGS += -D HAVE_GSTREAMER @CONTACTS_GSTREAMER_PACKAGES@
+AM_CPPFLAGS += $(CONTACTS_GSTREAMER_CFLAGS)
+endif
+
 bin_PROGRAMS = gnome-contacts
 
 vala_sources = \
@@ -63,6 +68,10 @@ gnome_contacts_SOURCES = \
 
 gnome_contacts_LDADD = $(CONTACTS_LIBS) -lm
 
+if USE_GSTREAMER
+gnome_contacts_LDADD += $(CONTACTS_GSTREAMER_LIBS)
+endif
+
 CLEANFILES = \
 	$(vala_sources:.vala=.c) \
 	$(gsettings_SCHEMAS) \
diff --git a/src/main.vala b/src/main.vala
index a0459ec..9a1dd2d 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -26,6 +26,10 @@ main (string[] args) {
   Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
   Intl.textdomain (Config.GETTEXT_PACKAGE);
 
+#if HAVE_GSTREAMER
+  Gst.init (ref args);
+#endif
+
   Gtk.init (ref args);
 
   var app = new App ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]