-
-#include "LiveSupport/Core/Ptr.h"
-
-
-namespace LiveSupport {
-namespace Core {
-
-using namespace LiveSupport::Core;
-
-/* ================================================================ constants */
-
-
-/* =================================================================== macros */
-
-
-/* =============================================================== data types */
-
-/**
- * A class wrapper of an id3v2-to-Dublin Core conversion table.
- *
- * For a description of these metadata tag standards, see
- * http://www.id3.org/id3v2.4.0-frames.txt
- * and http://dublincore.org/documents/dcmi-terms/.
- *
- * This object has to be configured with an XML configuration element
- * called tagConversionTable. This may look like the following:
- *
- *
- * <tagConversionTable>
- * <tag>
- * <id3>Title</id3>
- * <dc>dc:title</dc>
- * </tag>
- * <tag>
- * <id3>Artist</id3>
- * <id3>TPE1</id3>
- * <dc>dc:creator</dc>
- * </tag>
- * ...
- * </tagConversionTable>
- *
- *
- * The id3 tag names in the table should be one of the id3v1 tag names
- * Artist, Title, Album, Comment, Genre, Year, Track, or one of the
- * four-letter id3v2 tag abbreviations, e.g., TLEN (length) or
- * TOPE (original performer) etc.
- *
- * Note that more than one id3 tag name can map to the same dc tag name.
- *
- * The DTD for the above element is:
- *
- *
- * <!ELEMENT tagConversionTable (tag*) >
- * <!ATTLIST tag (id3+, dc) >
- * <!ATTLIST id3 (#PCDATA) >
- * <!ATTLIST dc (#PCDATA) >
- *
- *
- * @author $Author: fgerlits $
- * @version $Revision: 1.3 $
- */
-class TagConversion
-{
- private:
- /**
- * The name of the configuration XML element used by this class.
- */
- static const std::string configElementNameStr;
-
- /**
- * The type for the conversion table.
- */
- typedef std::map
- TableType;
-
- /**
- * The conversion table, as read from the configuration file.
- */
- static Ptr::Ref table;
-
- /**
- * The default constructor.
- */
- TagConversion(void) throw ()
- {
- }
-
-
- public:
- /**
- * Return the name of the XML element this class expects
- * to be sent to a call to configure().
- *
- * @return the name of the expected XML configuration element.
- */
- static const std::string
- getConfigElementName(void) throw ()
- {
- return configElementNameStr;
- }
-
- /**
- * Configure the class based on the XML element supplied.
- * The supplied element is expected to be of the name
- * returned by configElementName().
- *
- * @param element the XML element to configure the object from.
- * @exception std::invalid_argument if the supplied XML element
- * contains bad configuration information
- */
- static void
- configure(const xmlpp::Element & element)
- throw (std::invalid_argument);
-
- /**
- * Check whether the class has been configured.
- *
- * @return true or false
- */
- static bool
- isConfigured(void) throw ()
- {
- return (table.get() != 0);
- }
-
- /**
- * Check whether a given id3v2 tag is listed in the table.
- *
- * @return true or false
- * @exception std::invalid_argument if the conversion table has not
- * not been configured yet
- */
- static bool
- existsId3Tag(const std::string &id3Tag) throw (std::invalid_argument)
- {
- if (table) {
- return (table->find(id3Tag) != table->end());
- } else {
- throw std::invalid_argument("conversion table has "
- "not been configured");
- }
- }
-
- /**
- * Convert an id3v2 tag to a Dublin Core tag (with namespace).
- *
- * @return the converted tag
- * @exception std::invalid_argument if the conversion table has not
- * not been configured yet, or if the id3Tag name does
- * not exist in the table
- */
- static const std::string &
- id3ToDublinCore(const std::string &id3Tag)
- throw (std::invalid_argument);
-};
-
-
-/* ================================================= external data structures */
-
-
-/* ====================================================== function prototypes */
-
-
-} // namespace Core
-} // namespace LiveSupport
-
-#endif // LiveSupport_Core_TagConversion_h
-
diff --git a/livesupport/modules/core/src/AudioClip.cxx b/livesupport/modules/core/src/AudioClip.cxx
index 8358a0060..0ff8a7952 100644
--- a/livesupport/modules/core/src/AudioClip.cxx
+++ b/livesupport/modules/core/src/AudioClip.cxx
@@ -22,7 +22,7 @@
Author : $Author: fgerlits $
- Version : $Revision: 1.26 $
+ Version : $Revision: 1.27 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/AudioClip.cxx,v $
------------------------------------------------------------------------------*/
@@ -40,7 +40,6 @@
#include // for TagLib
#include // for TagLib
-#include "LiveSupport/Core/TagConversion.h"
#include "LiveSupport/Core/AudioClip.h"
using namespace boost::posix_time;
diff --git a/livesupport/modules/core/src/AudioClipTest.cxx b/livesupport/modules/core/src/AudioClipTest.cxx
index cda392e6f..4412d9164 100644
--- a/livesupport/modules/core/src/AudioClipTest.cxx
+++ b/livesupport/modules/core/src/AudioClipTest.cxx
@@ -22,7 +22,7 @@
Author : $Author: fgerlits $
- Version : $Revision: 1.13 $
+ Version : $Revision: 1.14 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/AudioClipTest.cxx,v $
------------------------------------------------------------------------------*/
@@ -45,7 +45,6 @@
#include "LiveSupport/Core/AudioClip.h"
#include "LiveSupport/Core/Playlist.h"
-#include "LiveSupport/Core/TagConversion.h"
#include "AudioClipTest.h"
diff --git a/livesupport/modules/core/src/TagConversion.cxx b/livesupport/modules/core/src/TagConversion.cxx
deleted file mode 100644
index e9547f1a5..000000000
--- a/livesupport/modules/core/src/TagConversion.cxx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*------------------------------------------------------------------------------
-
- Copyright (c) 2004 Media Development Loan Fund
-
- This file is part of the LiveSupport project.
- http://livesupport.campware.org/
- To report bugs, send an e-mail to bugs@campware.org
-
- LiveSupport 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.
-
- LiveSupport 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 LiveSupport; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
- Author : $Author: fgerlits $
- Version : $Revision: 1.2 $
- Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Attic/TagConversion.cxx,v $
-
-------------------------------------------------------------------------------*/
-
-/* ============================================================ include files */
-
-#ifdef HAVE_CONFIG_H
-#include "configure.h"
-#endif
-
-#include "LiveSupport/Core/TagConversion.h"
-
-
-using namespace xmlpp;
-using namespace LiveSupport::Core;
-
-/* =================================================== local data structures */
-
-/*------------------------------------------------------------------------------
- * The name of the config element for this class
- *----------------------------------------------------------------------------*/
-const std::string TagConversion::configElementNameStr = "tagConversionTable";
-
-/*------------------------------------------------------------------------------
- * Initialize the table to a null pointer at program start
- *----------------------------------------------------------------------------*/
-Ptr::Ref
- TagConversion::table = Ptr::Ref();
-
-
-/* ================================================ local constants & macros */
-
-/**
- * The name of the tag child element.
- */
-static const std::string tagElementName = "tag";
-
-/**
- * The name of the id3v2 tag grandchild element.
- */
-static const std::string id3TagElementName = "id3";
-
-/**
- * The name of the dublin core tag grandchild element.
- */
-static const std::string dcTagElementName = "dc";
-
-
-/* =============================================== local function prototypes */
-
-
-/* ============================================================= module code */
-
-/*------------------------------------------------------------------------------
- * Configure the class based on the XML element supplied.
- *----------------------------------------------------------------------------*/
-void
-TagConversion :: configure(const xmlpp::Element & element)
- throw (std::invalid_argument)
-{
- if (element.get_name() != configElementNameStr) {
- std::string eMsg = "bad configuration element ";
- eMsg += element.get_name();
- throw std::invalid_argument(eMsg);
- }
-
- table.reset(new TableType); // discard old table, if any
-
- Node::NodeList
- listOfTags = element.get_children(tagElementName);
- Node::NodeList::iterator
- listIt = listOfTags.begin();
-
- while (listIt != listOfTags.end()) {
- Node::NodeList id3Tags = (*listIt)->get_children(id3TagElementName);
- Node::NodeList dcTags = (*listIt)->get_children(dcTagElementName);
-
- if (id3Tags.size() < 1 || dcTags.size() != 1) {
- std::string eMsg = "bad <";
- eMsg += tagElementName;
- eMsg += "> element found";
- throw std::invalid_argument(eMsg);
- }
-
- Element* dcElement = dynamic_cast (dcTags.front());
- Node::NodeList::iterator
- id3Iterator = id3Tags.begin();
- while (id3Iterator != id3Tags.end()) {
- Element* id3Element = dynamic_cast (*id3Iterator);
- table->insert(std::make_pair(
- id3Element->get_child_text()->get_content(),
- dcElement ->get_child_text()->get_content() ));
- ++id3Iterator;
- }
- ++listIt;
- }
-}
-
-
-/*------------------------------------------------------------------------------
- * Convert an id3v2 tag to a Dublin Core tag (with namespace).
- *----------------------------------------------------------------------------*/
-const std::string &
-TagConversion :: id3ToDublinCore(const std::string &id3Tag)
- throw (std::invalid_argument)
-{
- if (!table) {
- throw std::invalid_argument("conversion table has not been configured");
- }
-
- TableType::const_iterator it = table->find(id3Tag);
- if (it != table->end()) {
- return (*table)[id3Tag];
- } else {
- throw std::invalid_argument("unknown id3 tag name");
- }
-}
-
diff --git a/livesupport/modules/core/src/TagConversionTest.cxx b/livesupport/modules/core/src/TagConversionTest.cxx
deleted file mode 100644
index dc06db2fe..000000000
--- a/livesupport/modules/core/src/TagConversionTest.cxx
+++ /dev/null
@@ -1,130 +0,0 @@
-/*------------------------------------------------------------------------------
-
- Copyright (c) 2004 Media Development Loan Fund
-
- This file is part of the LiveSupport project.
- http://livesupport.campware.org/
- To report bugs, send an e-mail to bugs@campware.org
-
- LiveSupport 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.
-
- LiveSupport 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 LiveSupport; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
- Author : $Author: fgerlits $
- Version : $Revision: 1.2 $
- Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Attic/TagConversionTest.cxx,v $
-
-------------------------------------------------------------------------------*/
-
-/* ============================================================ include files */
-
-#ifdef HAVE_CONFIG_H
-#include "configure.h"
-#endif
-
-#include
-#include
-
-#include "LiveSupport/Core/TagConversion.h"
-#include "TagConversionTest.h"
-
-
-using namespace LiveSupport::Core;
-
-/* =================================================== local data structures */
-
-
-/* ================================================ local constants & macros */
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TagConversionTest);
-
-/**
- * The name of the configuration file.
- */
-static const std::string configFileName = "etc/tagConversionTable.xml";
-
-
-/* =============================================== local function prototypes */
-
-
-/* ============================================================= module code */
-
-/*------------------------------------------------------------------------------
- * Set up the test environment
- *----------------------------------------------------------------------------*/
-void
-TagConversionTest :: setUp(void) throw ()
-{
-}
-
-
-/*------------------------------------------------------------------------------
- * Clean up the test environment
- *----------------------------------------------------------------------------*/
-void
-TagConversionTest :: tearDown(void) throw ()
-{
-}
-
-
-/*------------------------------------------------------------------------------
- * A simple test
- *----------------------------------------------------------------------------*/
-void
-TagConversionTest :: firstTest(void)
- throw (CPPUNIT_NS::Exception)
-{
- try {
- Ptr::Ref parser(
- new xmlpp::DomParser(configFileName, false));
- const xmlpp::Document * document = parser->get_document();
- const xmlpp::Element * root = document->get_root_node();
- TagConversion::configure(*root);
- } catch (std::invalid_argument &e) {
- CPPUNIT_FAIL(e.what());
- } catch (xmlpp::exception &e) {
- CPPUNIT_FAIL(e.what());
- }
- CPPUNIT_ASSERT( TagConversion::isConfigured());
-
- try {
- CPPUNIT_ASSERT( TagConversion::existsId3Tag("Title"));
- CPPUNIT_ASSERT(!TagConversion::existsId3Tag("Groovicity"));
- } catch (std::invalid_argument &e) {
- CPPUNIT_FAIL(e.what());
- }
-
- try {
- CPPUNIT_ASSERT(TagConversion::id3ToDublinCore("Title") == "dc:title");
- std::string dcTag = TagConversion::id3ToDublinCore("Artist");
- CPPUNIT_ASSERT(dcTag == "dc:creator");
- } catch (std::invalid_argument &e) {
- CPPUNIT_FAIL(e.what());
- }
-
- try {
- CPPUNIT_ASSERT(TagConversion::id3ToDublinCore("TIT2") == "dc:title");
- std::string dcTag = TagConversion::id3ToDublinCore("TBPM");
- CPPUNIT_ASSERT(dcTag == "ourdcextension:bpm");
- } catch (std::invalid_argument &e) {
- CPPUNIT_FAIL(e.what());
- }
-
- try {
- std::string dcTag = TagConversion::id3ToDublinCore("Boringness");
- CPPUNIT_FAIL("allowed to convert non-existent tag");
- } catch (std::invalid_argument &e) {
- }
-}
-
diff --git a/livesupport/modules/core/src/TagConversionTest.h b/livesupport/modules/core/src/TagConversionTest.h
deleted file mode 100644
index f2c387e68..000000000
--- a/livesupport/modules/core/src/TagConversionTest.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*------------------------------------------------------------------------------
-
- Copyright (c) 2004 Media Development Loan Fund
-
- This file is part of the LiveSupport project.
- http://livesupport.campware.org/
- To report bugs, send an e-mail to bugs@campware.org
-
- LiveSupport 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.
-
- LiveSupport 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 LiveSupport; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
- Author : $Author: fgerlits $
- Version : $Revision: 1.1 $
- Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Attic/TagConversionTest.h,v $
-
-------------------------------------------------------------------------------*/
-#ifndef TagConversionTest_h
-#define TagConversionTest_h
-
-#ifndef __cplusplus
-#error This is a C++ include file
-#endif
-
-
-/* ============================================================ include files */
-
-#ifdef HAVE_CONFIG_H
-#include "configure.h"
-#endif
-
-#include
-
-
-namespace LiveSupport {
-namespace Core {
-
-/* ================================================================ constants */
-
-
-/* =================================================================== macros */
-
-
-/* =============================================================== data types */
-
-/**
- * Unit test for the TagConversion class.
- *
- * @author $Author: fgerlits $
- * @version $Revision: 1.1 $
- * @see TagConversion
- */
-class TagConversionTest : public CPPUNIT_NS::TestFixture
-{
- CPPUNIT_TEST_SUITE(TagConversionTest);
- CPPUNIT_TEST(firstTest);
- CPPUNIT_TEST_SUITE_END();
-
- protected:
-
- /**
- * Test conversion from struct timeval to ptime
- *
- * @exception CPPUNIT_NS::Exception on test failures.
- */
- void
- firstTest(void) throw (CPPUNIT_NS::Exception);
-
-
- public:
-
- /**
- * Set up the environment for the test case.
- */
- void
- setUp(void) throw ();
-
- /**
- * Clean up the environment after the test case.
- */
- void
- tearDown(void) throw ();
-};
-
-
-/* ================================================= external data structures */
-
-
-/* ====================================================== function prototypes */
-
-
-} // namespace Core
-} // namespace LiveSupport
-
-#endif // TagConversionTest_h
-
diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in
index a304ed9c8..dd1e5510c 100644
--- a/livesupport/modules/playlistExecutor/etc/Makefile.in
+++ b/livesupport/modules/playlistExecutor/etc/Makefile.in
@@ -20,8 +20,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
-# Author : $Author: maroy $
-# Version : $Revision: 1.13 $
+# Author : $Author: fgerlits $
+# Version : $Revision: 1.14 $
# 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@
+# TODO: move ICU flag determination to configure script
+ICU_LIBS=`${USR_DIR}/bin/icu-config --ldflags --ldflags-toolutil --ldflags-icuio`
+
#GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@
#GSTREAMER_LIBS=@GSTREAMER_LIBS@
@@ -112,6 +115,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
-I${INCLUDE_DIR} -I${TMP_DIR}
LDFLAGS = @LDFLAGS@ -pthread \
${LIBXMLPP_LIBS} \
+ ${ICU_LIBS} \
${GSTREAMER_LIBS} \
${TAGLIB_LIBS} \
-L${USR_LIB_DIR} \
diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in
index d38974b8a..cfd4fac13 100644
--- a/livesupport/modules/storage/etc/Makefile.in
+++ b/livesupport/modules/storage/etc/Makefile.in
@@ -21,7 +21,7 @@
#
#
# Author : $Author: fgerlits $
-# Version : $Revision: 1.21 $
+# Version : $Revision: 1.22 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/Makefile.in,v $
#
# @configure_input@
@@ -73,6 +73,9 @@ VPATH = ${SRC_DIR}
LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@
LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
+# TODO: move ICU flag determination to configure script
+ICU_LIBS=`${USR_DIR}/bin/icu-config --ldflags --ldflags-toolutil --ldflags-icuio`
+
CURL_LIBS=`${USR_DIR}/bin/curl-config --libs`
TAGLIB_LIBS =`${USR_DIR}/bin/taglib-config --libs`
@@ -104,6 +107,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
-I${INCLUDE_DIR} -I${TMP_DIR}
LDFLAGS = @LDFLAGS@ -pthread \
${LIBXMLPP_LIBS} \
+ ${ICU_LIBS} \
${CURL_LIBS} \
${TAGLIB_LIBS} \
-L${USR_LIB_DIR} \
diff --git a/livesupport/products/scheduler/etc/scheduler-local.xml b/livesupport/products/scheduler/etc/scheduler-local.xml
index 2460fc42b..97450cb6b 100644
--- a/livesupport/products/scheduler/etc/scheduler-local.xml
+++ b/livesupport/products/scheduler/etc/scheduler-local.xml
@@ -8,8 +8,7 @@
scheduleFactory,
playLogFactory,
audioPlayer,
- xmlRpcDaemon,
- tagConversionTable) >
+ xmlRpcDaemon) >
@@ -75,11 +74,6 @@
-
-
-
-
-
]>
@@ -139,28 +133,5 @@
xmlRpcPort = "3344"
pidFileName = "tmp/scheduler.pid"
/>
-
-
-
- Title
- TIT2
- dc:title
-
-
- TPE1
- Artist
- dc:creator
-
-
- Length
- TLEN
- dcterms:extent
-
-
-
- TBPM
- ourdcextension:bpm
-
-
diff --git a/livesupport/products/scheduler/etc/scheduler.xml b/livesupport/products/scheduler/etc/scheduler.xml
index f0f68212b..83cf732cf 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml
+++ b/livesupport/products/scheduler/etc/scheduler.xml
@@ -8,8 +8,7 @@
scheduleFactory,
playLogFactory,
audioPlayer,
- xmlRpcDaemon,
- tagConversionTable) >
+ xmlRpcDaemon) >
@@ -81,11 +80,6 @@
-
-
-
-
-
]>
@@ -127,28 +121,5 @@
xmlRpcPort = "3344"
pidFileName = "tmp/scheduler.pid"
/>
-
-
-
- Title
- TIT2
- dc:title
-
-
- TPE1
- Artist
- dc:creator
-
-
- Length
- TLEN
- dcterms:extent
-
-
-
- TBPM
- ourdcextension:bpm
-
-
diff --git a/livesupport/products/scheduler/etc/scheduler.xml.template b/livesupport/products/scheduler/etc/scheduler.xml.template
index 58532d107..c837b6700 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml.template
+++ b/livesupport/products/scheduler/etc/scheduler.xml.template
@@ -8,8 +8,7 @@
scheduleFactory,
playLogFactory,
audioPlayer,
- xmlRpcDaemon,
- tagConversionTable) >
+ xmlRpcDaemon) >
@@ -81,11 +80,6 @@
-
-
-
-
-
]>
@@ -129,28 +123,5 @@
xmlRpcPort = "ls_scheduler_port"
pidFileName = "ls_install_dir/tmp/scheduler.pid"
/>
-
-
-
- Title
- TIT2
- dc:title
-
-
- TPE1
- Artist
- dc:creator
-
-
- Length
- TLEN
- dcterms:extent
-
-
-
- TBPM
- ourdcextension:bpm
-
-
diff --git a/livesupport/products/scheduler/src/SchedulerDaemon.cxx b/livesupport/products/scheduler/src/SchedulerDaemon.cxx
index bc8ace267..942098b47 100644
--- a/livesupport/products/scheduler/src/SchedulerDaemon.cxx
+++ b/livesupport/products/scheduler/src/SchedulerDaemon.cxx
@@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Author : $Author: maroy $
- Version : $Revision: 1.27 $
+ Author : $Author: fgerlits $
+ Version : $Revision: 1.28 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SchedulerDaemon.cxx,v $
------------------------------------------------------------------------------*/
@@ -60,7 +60,6 @@
#include "ScheduleFactory.h"
#include "PlayLogFactory.h"
#include "PlaylistEventContainer.h"
-#include "LiveSupport/Core/TagConversion.h"
#include "SchedulerDaemon.h"
@@ -252,13 +251,6 @@ SchedulerDaemon :: configure(const xmlpp::Element & element)
}
configureXmlRpcDaemon( *((const xmlpp::Element*) *(nodes.begin())) );
- // configure the TagConversion (load tag conversion table)
- nodes = element.get_children(TagConversion::getConfigElementName());
- if (nodes.size() < 1) {
- throw std::invalid_argument("no tagConversionTable element");
- }
- TagConversion::configure( *((const xmlpp::Element*) *(nodes.begin())) );
-
// do some initialization, using the configured objects
authentication = acf->getAuthenticationClient();
connectionManager = cmf->getConnectionManager();