added (id3 to dc) tag conversion table initialization to scheduler
This commit is contained in:
parent
744c9619fc
commit
a6b3040642
|
@ -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} \
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
scheduleFactory,
|
||||
playLogFactory,
|
||||
audioPlayer,
|
||||
xmlRpcDaemon) >
|
||||
xmlRpcDaemon,
|
||||
tagConversionTable) >
|
||||
|
||||
<!ELEMENT connectionManagerFactory (simpleConnectionManager) >
|
||||
|
||||
|
@ -77,6 +78,11 @@
|
|||
<!ATTLIST xmlRpcDaemon pidFileName CDATA #REQUIRED >
|
||||
<!ATTLIST xmlRpcDaemon background (true|false) "true" >
|
||||
|
||||
<!ELEMENT tagConversionTable (tag*) >
|
||||
<!ELEMENT tag (id3+, dc) >
|
||||
<!ELEMENT id3 (#PCDATA) >
|
||||
<!ELEMENT dc (#PCDATA) >
|
||||
|
||||
]>
|
||||
<scheduler>
|
||||
<user login="root" password="q" />
|
||||
|
@ -118,5 +124,28 @@
|
|||
xmlRpcPort = "3344"
|
||||
pidFileName = "tmp/scheduler.pid"
|
||||
/>
|
||||
|
||||
<tagConversionTable>
|
||||
<tag>
|
||||
<id3>Title</id3>
|
||||
<id3>TIT2</id3>
|
||||
<dc>dc:title</dc>
|
||||
</tag>
|
||||
<tag>
|
||||
<id3>TPE1</id3>
|
||||
<id3>Artist</id3>
|
||||
<dc>dc:creator</dc>
|
||||
</tag>
|
||||
<tag>
|
||||
<id3>Length</id3>
|
||||
<id3>TLEN</id3>
|
||||
<dc>dcterms:extent</dc>
|
||||
</tag>
|
||||
<tag>
|
||||
<!-- beats per minute -->
|
||||
<id3>TBPM</id3>
|
||||
<dc>ourdcextension:bpm</dc>
|
||||
</tag>
|
||||
</tagConversionTable>
|
||||
</scheduler>
|
||||
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
scheduleFactory,
|
||||
playLogFactory,
|
||||
audioPlayer,
|
||||
xmlRpcDaemon) >
|
||||
xmlRpcDaemon,
|
||||
tagConversionTable) >
|
||||
|
||||
<!ELEMENT connectionManagerFactory (simpleConnectionManager) >
|
||||
|
||||
|
@ -74,6 +75,11 @@
|
|||
<!ATTLIST xmlRpcDaemon pidFileName CDATA #REQUIRED >
|
||||
<!ATTLIST xmlRpcDaemon background (true|false) "true" >
|
||||
|
||||
<!ELEMENT tagConversionTable (tag*) >
|
||||
<!ELEMENT tag (id3+, dc) >
|
||||
<!ELEMENT id3 (#PCDATA) >
|
||||
<!ELEMENT dc (#PCDATA) >
|
||||
|
||||
]>
|
||||
<scheduler>
|
||||
<user login="root" password="q" />
|
||||
|
@ -133,5 +139,28 @@
|
|||
xmlRpcPort = "3344"
|
||||
pidFileName = "tmp/scheduler.pid"
|
||||
/>
|
||||
|
||||
<tagConversionTable>
|
||||
<tag>
|
||||
<id3>Title</id3>
|
||||
<id3>TIT2</id3>
|
||||
<dc>dc:title</dc>
|
||||
</tag>
|
||||
<tag>
|
||||
<id3>TPE1</id3>
|
||||
<id3>Artist</id3>
|
||||
<dc>dc:creator</dc>
|
||||
</tag>
|
||||
<tag>
|
||||
<id3>Length</id3>
|
||||
<id3>TLEN</id3>
|
||||
<dc>dcterms:extent</dc>
|
||||
</tag>
|
||||
<tag>
|
||||
<!-- beats per minute -->
|
||||
<id3>TBPM</id3>
|
||||
<dc>ourdcextension:bpm</dc>
|
||||
</tag>
|
||||
</tagConversionTable>
|
||||
</scheduler>
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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) >
|
||||
* </code></pre>
|
||||
*
|
||||
* @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<EventScheduler::EventScheduler>::Ref eventScheduler;
|
||||
Ptr<LiveSupport::EventScheduler::EventScheduler>::Ref
|
||||
eventScheduler;
|
||||
|
||||
/**
|
||||
* The audio player.
|
||||
|
|
Loading…
Reference in New Issue