diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in
index d7bb9d02b..f51efb57a 100644
--- a/livesupport/products/scheduler/etc/Makefile.in
+++ b/livesupport/products/scheduler/etc/Makefile.in
@@ -21,7 +21,7 @@
#
#
# Author : $Author: fgerlits $
-# Version : $Revision: 1.44 $
+# Version : $Revision: 1.45 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
#
# @configure_input@
@@ -67,6 +67,7 @@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
CURL_LIBS=`${USR_DIR}/bin/curl-config --libs`
+TAGLIB_CFLAGS =`${USR_DIR}/bin/taglib-config --cflags`
TAGLIB_LIBS =`${USR_DIR}/bin/taglib-config --libs`
MODULES_DIR = ${BASE_DIR}/../../modules
@@ -130,6 +131,7 @@ CPPFLAGS = @CPPFLAGS@
CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
-pedantic -Wall -Wno-long-long \
${LIBXMLPP_CFLAGS} \
+ ${TAGLIB_CFLAGS} \
-I${USR_INCLUDE_DIR} \
-I${BOOST_INCLUDE_DIR} \
-I${CORE_INCLUDE_DIR} \
diff --git a/livesupport/products/scheduler/etc/scheduler-web.xml b/livesupport/products/scheduler/etc/scheduler-web.xml
index 03888d0ad..2c34af538 100644
--- a/livesupport/products/scheduler/etc/scheduler-web.xml
+++ b/livesupport/products/scheduler/etc/scheduler-web.xml
@@ -8,7 +8,8 @@
scheduleFactory,
playLogFactory,
audioPlayer,
- xmlRpcDaemon) >
+ xmlRpcDaemon,
+ tagConversionTable) >
@@ -77,6 +78,11 @@
+
+
+
+
+
]>
@@ -118,5 +124,28 @@
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 e5f483274..424d8590e 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml
+++ b/livesupport/products/scheduler/etc/scheduler.xml
@@ -8,7 +8,8 @@
scheduleFactory,
playLogFactory,
audioPlayer,
- xmlRpcDaemon) >
+ xmlRpcDaemon,
+ tagConversionTable) >
@@ -74,6 +75,11 @@
+
+
+
+
+
]>
@@ -133,5 +139,28 @@
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/src/SchedulerDaemon.cxx b/livesupport/products/scheduler/src/SchedulerDaemon.cxx
index d9f57f2aa..9e982e99e 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.19 $
+ Author : $Author: fgerlits $
+ Version : $Revision: 1.20 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SchedulerDaemon.cxx,v $
------------------------------------------------------------------------------*/
@@ -59,9 +59,10 @@
#include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h"
#include "ScheduleFactory.h"
#include "PlayLogFactory.h"
-#include "SchedulerDaemon.h"
#include "PlaylistEventContainer.h"
+#include "LiveSupport/Core/TagConversion.h"
+#include "SchedulerDaemon.h"
using namespace boost::posix_time;
@@ -250,6 +251,12 @@ 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();
diff --git a/livesupport/products/scheduler/src/SchedulerDaemon.h b/livesupport/products/scheduler/src/SchedulerDaemon.h
index 3fcdcb824..8cd707522 100644
--- a/livesupport/products/scheduler/src/SchedulerDaemon.h
+++ b/livesupport/products/scheduler/src/SchedulerDaemon.h
@@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Author : $Author: maroy $
- Version : $Revision: 1.14 $
+ Author : $Author: fgerlits $
+ Version : $Revision: 1.15 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SchedulerDaemon.h,v $
------------------------------------------------------------------------------*/
@@ -157,8 +157,8 @@ using namespace LiveSupport::PlaylistExecutor;
* xmlRpcDaemon) >
*
*
- * @author $Author: maroy $
- * @version $Revision: 1.14 $
+ * @author $Author: fgerlits $
+ * @version $Revision: 1.15 $
* @see ConnectionManagerFactory
* @see AuthenticationClientFactory
* @see StorageClientFactory
@@ -189,7 +189,8 @@ class SchedulerDaemon : public Installable,
/**
* The event scheduler.
*/
- Ptr::Ref eventScheduler;
+ Ptr::Ref
+ eventScheduler;
/**
* The audio player.