From e9185739304c573346742805b597e2ad6862573d Mon Sep 17 00:00:00 2001 From: maroy Date: Wed, 8 Jun 2005 09:11:13 +0000 Subject: [PATCH] removed references to the gstreamer library temporarily --- livesupport/etc/Makefile.in | 3 +-- .../modules/playlistExecutor/etc/Makefile.in | 14 +++++++------- .../modules/playlistExecutor/etc/configure.ac | 10 +++++----- .../playlistExecutor/src/AudioPlayerFactory.cxx | 8 ++++---- .../modules/playlistExecutor/src/GstreamerPlayer.h | 6 +++--- livesupport/products/gLiveSupport/etc/Makefile.in | 8 ++++---- livesupport/products/gLiveSupport/etc/configure.ac | 10 +++++----- livesupport/products/scheduler/etc/Makefile.in | 6 +++--- livesupport/products/scheduler/etc/configure.ac | 10 +++++----- 9 files changed, 37 insertions(+), 38 deletions(-) diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index c932f9890..d1be0d383 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.6 $ +# Version : $Revision: 1.7 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ #------------------------------------------------------------------------------- @@ -179,7 +179,6 @@ ${TMP_DIR}/tools_setup.stamp: ${HELIX_DIR}/${HELIX_VERSION}/bin/install.sh ${GTK_DIR}/${GTK_VERSION}/bin/install.sh ${GTKMM_DIR}/${GTKMM_VERSION}/bin/install.sh - ${GSTREAMER_DIR}/${GSTREAMER_VERSION}/bin/install.sh ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION}/bin/install.sh ${ICU_DIR}/${ICU_VERSION}/bin/install.sh ${CURL_DIR}/${CURL_VERSION}/bin/install.sh diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index fb493db89..a304ed9c8 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.12 $ +# Version : $Revision: 1.13 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $ # # @configure_input@ @@ -77,8 +77,8 @@ VPATH = ${SRC_DIR} LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ -GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ -GSTREAMER_LIBS=@GSTREAMER_LIBS@ +#GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ +#GSTREAMER_LIBS=@GSTREAMER_LIBS@ TAGLIB_LIBS =`${USR_DIR}/bin/taglib-config --libs` @@ -130,13 +130,13 @@ 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 +# ${TMP_DIR}/GstreamerPlayer.o TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ - ${TMP_DIR}/GstreamerPlayerTest.o \ ${TMP_DIR}/HelixPlayerTest.o \ - ${TMP_DIR}/AudioPlayerFactoryTest.o \ - ${TMP_DIR}/AudioPlayerFactoryGstreamerTest.o + ${TMP_DIR}/AudioPlayerFactoryTest.o +# ${TMP_DIR}/AudioPlayerFactoryGstreamerTest.o +# ${TMP_DIR}/GstreamerPlayerTest.o TEST_RUNNER_LIBS = -l${PLAYLIST_EXECUTOR_LIB} -l${CORE_LIB} \ ${HELIX_LIBS} ${TAGLIB_LIBS} \ -lcppunit -ldl -lm -lxmlrpc++ diff --git a/livesupport/modules/playlistExecutor/etc/configure.ac b/livesupport/modules/playlistExecutor/etc/configure.ac index 9ce44ca51..a47a999e2 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.6 $ +dnl Version : $Revision: 1.7 $ 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.6 $) +AC_REVISION($Revision: 1.7 $) AC_CONFIG_SRCDIR(../src/HelixPlayer.cxx) @@ -48,9 +48,9 @@ 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 PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) +dnl AC_SUBST(GSTREAMER_CFLAGS) +dnl AC_SUBST(GSTREAMER_LIBS) dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data diff --git a/livesupport/modules/playlistExecutor/src/AudioPlayerFactory.cxx b/livesupport/modules/playlistExecutor/src/AudioPlayerFactory.cxx index b39dec520..5d22d21a5 100644 --- a/livesupport/modules/playlistExecutor/src/AudioPlayerFactory.cxx +++ b/livesupport/modules/playlistExecutor/src/AudioPlayerFactory.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.4 $ + Version : $Revision: 1.5 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/AudioPlayerFactory.cxx,v $ ------------------------------------------------------------------------------*/ @@ -35,7 +35,7 @@ #include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h" #include "HelixPlayer.h" -#include "GstreamerPlayer.h" +//#include "GstreamerPlayer.h" using namespace LiveSupport::Core; @@ -106,7 +106,7 @@ AudioPlayerFactory :: configure(const xmlpp::Element & element) return; } - +/* nodes = element.get_children(GstreamerPlayer::getConfigElementName()); if (nodes.size() >= 1) { const xmlpp::Element * configElement = @@ -117,7 +117,7 @@ AudioPlayerFactory :: configure(const xmlpp::Element & element) return; } - +*/ throw std::invalid_argument("no audio player factories to configure"); } diff --git a/livesupport/modules/playlistExecutor/src/GstreamerPlayer.h b/livesupport/modules/playlistExecutor/src/GstreamerPlayer.h index d1751d36e..bd5292981 100644 --- a/livesupport/modules/playlistExecutor/src/GstreamerPlayer.h +++ b/livesupport/modules/playlistExecutor/src/GstreamerPlayer.h @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/GstreamerPlayer.h,v $ ------------------------------------------------------------------------------*/ @@ -42,7 +42,7 @@ #include -#include +//#include #include "LiveSupport/Core/Configurable.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" @@ -86,7 +86,7 @@ using namespace LiveSupport::Core; * * * @author $Author: maroy $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ class GstreamerPlayer : virtual public Configurable, virtual public AudioPlayerInterface diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index b1cd5fedc..004552f42 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.39 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.40 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # # @configure_input@ @@ -123,8 +123,8 @@ CURL_LIBS=`${USR_DIR}/bin/curl-config --libs` GTKMM_CFLAGS=@GTKMM_CFLAGS@ GTKMM_LIBS=@GTKMM_LIBS@ -GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ -GSTREAMER_LIBS=@GSTREAMER_LIBS@ +#GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ +#GSTREAMER_LIBS=@GSTREAMER_LIBS@ ICU_CFLAGS= ICU_LIBS=`${USR_DIR}/bin/icu-config --ldflags-toolutil --ldflags-icuio` diff --git a/livesupport/products/gLiveSupport/etc/configure.ac b/livesupport/products/gLiveSupport/etc/configure.ac index 94a6f4a6c..cf4519b5c 100644 --- a/livesupport/products/gLiveSupport/etc/configure.ac +++ b/livesupport/products/gLiveSupport/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.6 $ +dnl Version : $Revision: 1.7 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(gLiveSupport, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.6 $) +AC_REVISION($Revision: 1.7 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -53,9 +53,9 @@ PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.4.0]) AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) -PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) -AC_SUBST(GSTREAMER_CFLAGS) -AC_SUBST(GSTREAMER_LIBS) +dnl PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) +dnl AC_SUBST(GSTREAMER_CFLAGS) +dnl AC_SUBST(GSTREAMER_LIBS) dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index 21c96d212..cd5d5cff3 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.56 $ +# Version : $Revision: 1.57 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -67,8 +67,8 @@ LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ LIBODBCXX_CFLAGS=@LIBODBCXX_CFLAGS@ LIBODBCXX_LIBS=@LIBODBCXX_LIBS@ -GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ -GSTREAMER_LIBS=@GSTREAMER_LIBS@ +#GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ +#GSTREAMER_LIBS=@GSTREAMER_LIBS@ CURL_LIBS=`${USR_DIR}/bin/curl-config --libs` diff --git a/livesupport/products/scheduler/etc/configure.ac b/livesupport/products/scheduler/etc/configure.ac index 7d269dab5..18fd7e1dd 100644 --- a/livesupport/products/scheduler/etc/configure.ac +++ b/livesupport/products/scheduler/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.8 $ +dnl Version : $Revision: 1.9 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Scheduler, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.8 $) +AC_REVISION($Revision: 1.9 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -50,9 +50,9 @@ PKG_CHECK_MODULES(LIBODBCXX,[libodbc++]) 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 PKG_CHECK_MODULES(GSTREAMER,[gstreamer-0.8 >= 0.8]) +dnl AC_SUBST(GSTREAMER_CFLAGS) +dnl AC_SUBST(GSTREAMER_LIBS) dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data