From 80dfc3eb4b08012f5e917557300b5aaf6e19349c Mon Sep 17 00:00:00 2001
From: maroy <maroy@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 31 May 2005 08:53:11 +0000
Subject: [PATCH] added initial gstreamer playlist executor implementation

---
 livesupport/modules/playlistExecutor/etc/Makefile.in  | 10 +++++++++-
 livesupport/modules/playlistExecutor/etc/configure.ac |  8 ++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in
index 299162732..53bf324d7 100644
--- a/livesupport/modules/playlistExecutor/etc/Makefile.in
+++ b/livesupport/modules/playlistExecutor/etc/Makefile.in
@@ -21,7 +21,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.10 $
+#   Version  : $Revision: 1.11 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $
 #
 #   @configure_input@
@@ -77,6 +77,9 @@ VPATH    = ${SRC_DIR}
 LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@
 LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
 
+GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@
+GSTREAMER_LIBS=@GSTREAMER_LIBS@
+
 TAGLIB_LIBS     =`${USR_DIR}/bin/taglib-config --libs`
 
 TEST_RESULTS = ${DOC_DIR}/testResults.xml
@@ -100,6 +103,7 @@ CPPFLAGS = @CPPFLAGS@
 CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
                              -Wall -Wno-long-long \
                              ${LIBXMLPP_CFLAGS} \
+                             ${GSTREAMER_CFLAGS} \
                              ${HELIX_CFLAGS} \
                              -I${USR_INCLUDE_DIR} \
                              -I${BOOST_INCLUDE_DIR} \
@@ -108,6 +112,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
                              -I${INCLUDE_DIR} -I${TMP_DIR}
 LDFLAGS  = @LDFLAGS@ -pthread \
                      ${LIBXMLPP_LIBS} \
+                     ${GSTREAMER_LIBS} \
                      ${TAGLIB_LIBS} \
                      -L${USR_LIB_DIR} \
                      -L${CORE_LIB_DIR} \
@@ -125,8 +130,10 @@ PLAYLIST_EXECUTOR_LIB_OBJS = ${TMP_DIR}/HelixPlayer.o \
                              ${TMP_DIR}/ClientContext.o \
                              ${TMP_DIR}/ErrorSink.o \
                              ${TMP_DIR}/HelixIIDs.o \
+							 ${TMP_DIR}/GstreamerPlayer.o \
                              ${TMP_DIR}/AudioPlayerFactory.o
 TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
+                   ${TMP_DIR}/GstreamerPlayerTest.o \
                    ${TMP_DIR}/HelixPlayerTest.o \
                    ${TMP_DIR}/AudioPlayerFactoryTest.o 
 TEST_RUNNER_LIBS = -l${PLAYLIST_EXECUTOR_LIB} -l${CORE_LIB} \
@@ -134,6 +141,7 @@ TEST_RUNNER_LIBS = -l${PLAYLIST_EXECUTOR_LIB} -l${CORE_LIB} \
                    -lcppunit -ldl -lm -lxmlrpc++
 
 TWOTEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
+                      ${TMP_DIR}/TwoGstreamerPlayersTest.o \
                       ${TMP_DIR}/TwoHelixPlayersTest.o
 
 
diff --git a/livesupport/modules/playlistExecutor/etc/configure.ac b/livesupport/modules/playlistExecutor/etc/configure.ac
index c255ff265..9ce44ca51 100644
--- a/livesupport/modules/playlistExecutor/etc/configure.ac
+++ b/livesupport/modules/playlistExecutor/etc/configure.ac
@@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
 dnl
 dnl Author   : $Author: maroy $
-dnl Version  : $Revision: 1.5 $
+dnl Version  : $Revision: 1.6 $
 dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/configure.ac,v $
 dnl-----------------------------------------------------------------------------
 
@@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
 AC_INIT(PlaylistExecutor, 1.0, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
-AC_REVISION($Revision: 1.5 $)
+AC_REVISION($Revision: 1.6 $)
 
 AC_CONFIG_SRCDIR(../src/HelixPlayer.cxx)
 
@@ -48,6 +48,10 @@ PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0])
 AC_SUBST(LIBXMLPP_CFLAGS)
 AC_SUBST(LIBXMLPP_LIBS)
 
+PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8])
+AC_SUBST(GSTREAMER_CFLAGS)
+AC_SUBST(GSTREAMER_LIBS)
+
 dnl-----------------------------------------------------------------------------
 dnl enable compilaton for code coverage data
 dnl-----------------------------------------------------------------------------