added initial gstreamer playlist executor implementation

This commit is contained in:
maroy 2005-05-31 08:53:11 +00:00
parent e706acc9d2
commit 80dfc3eb4b
2 changed files with 15 additions and 3 deletions

View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: maroy $ # 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 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@
@ -77,6 +77,9 @@ VPATH = ${SRC_DIR}
LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@
GSTREAMER_LIBS=@GSTREAMER_LIBS@
TAGLIB_LIBS =`${USR_DIR}/bin/taglib-config --libs` TAGLIB_LIBS =`${USR_DIR}/bin/taglib-config --libs`
TEST_RESULTS = ${DOC_DIR}/testResults.xml TEST_RESULTS = ${DOC_DIR}/testResults.xml
@ -100,6 +103,7 @@ CPPFLAGS = @CPPFLAGS@
CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
-Wall -Wno-long-long \ -Wall -Wno-long-long \
${LIBXMLPP_CFLAGS} \ ${LIBXMLPP_CFLAGS} \
${GSTREAMER_CFLAGS} \
${HELIX_CFLAGS} \ ${HELIX_CFLAGS} \
-I${USR_INCLUDE_DIR} \ -I${USR_INCLUDE_DIR} \
-I${BOOST_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \
@ -108,6 +112,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
-I${INCLUDE_DIR} -I${TMP_DIR} -I${INCLUDE_DIR} -I${TMP_DIR}
LDFLAGS = @LDFLAGS@ -pthread \ LDFLAGS = @LDFLAGS@ -pthread \
${LIBXMLPP_LIBS} \ ${LIBXMLPP_LIBS} \
${GSTREAMER_LIBS} \
${TAGLIB_LIBS} \ ${TAGLIB_LIBS} \
-L${USR_LIB_DIR} \ -L${USR_LIB_DIR} \
-L${CORE_LIB_DIR} \ -L${CORE_LIB_DIR} \
@ -125,8 +130,10 @@ PLAYLIST_EXECUTOR_LIB_OBJS = ${TMP_DIR}/HelixPlayer.o \
${TMP_DIR}/ClientContext.o \ ${TMP_DIR}/ClientContext.o \
${TMP_DIR}/ErrorSink.o \ ${TMP_DIR}/ErrorSink.o \
${TMP_DIR}/HelixIIDs.o \ ${TMP_DIR}/HelixIIDs.o \
${TMP_DIR}/GstreamerPlayer.o \
${TMP_DIR}/AudioPlayerFactory.o ${TMP_DIR}/AudioPlayerFactory.o
TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
${TMP_DIR}/GstreamerPlayerTest.o \
${TMP_DIR}/HelixPlayerTest.o \ ${TMP_DIR}/HelixPlayerTest.o \
${TMP_DIR}/AudioPlayerFactoryTest.o ${TMP_DIR}/AudioPlayerFactoryTest.o
TEST_RUNNER_LIBS = -l${PLAYLIST_EXECUTOR_LIB} -l${CORE_LIB} \ 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++ -lcppunit -ldl -lm -lxmlrpc++
TWOTEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ TWOTEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
${TMP_DIR}/TwoGstreamerPlayersTest.o \
${TMP_DIR}/TwoHelixPlayersTest.o ${TMP_DIR}/TwoHelixPlayersTest.o

View file

@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
dnl dnl
dnl Author : $Author: maroy $ 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 Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/configure.ac,v $
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
AC_INIT(PlaylistExecutor, 1.0, bugs@campware.org) AC_INIT(PlaylistExecutor, 1.0, bugs@campware.org)
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) 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) 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_CFLAGS)
AC_SUBST(LIBXMLPP_LIBS) AC_SUBST(LIBXMLPP_LIBS)
PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8])
AC_SUBST(GSTREAMER_CFLAGS)
AC_SUBST(GSTREAMER_LIBS)
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl enable compilaton for code coverage data dnl enable compilaton for code coverage data
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------