Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed scheduler playlist executor to gstreamer

Browse source
This commit is contained in:
maroy 2005-06-30 14:30:36 +00:00
parent 87b2840b53
commit fcb2fab676
6 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
livesupport/bin/user_setup.sh
View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.5 $ # Version : $Revision: 1.6 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/user_setup.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/user_setup.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -108,7 +108,7 @@ dbpassword=test
homedir=$HOME homedir=$HOME
configdir=$homedir/.livesupport configdir=$homedir/.livesupport
htmldir=$homedir/public_html htmldir=$homedir/public_html
outputdsp=/dev/dsp output_device=plughw:0,0
@ -127,7 +127,7 @@ echo " apache daemon group: $apache_group";
echo " home directory: $homedir"; echo " home directory: $homedir";
echo " configuration directory: $configdir"; echo " configuration directory: $configdir";
echo " web base directory: $htmldir"; echo " web base directory: $htmldir";
echo " output audio device: $outputdsp"; echo " output audio device: $output_device";
echo "" echo ""
@ -167,7 +167,7 @@ ls_scheduler_port=$scheduler_port
ls_scheduler_urlPrefix= ls_scheduler_urlPrefix=
ls_scheduler_xmlRpcPrefix=RC2 ls_scheduler_xmlRpcPrefix=RC2
ls_output_dsp=$outputdsp ls_output_alsa_device=$output_device
# replace / characters with a \/ sequence, for sed below # replace / characters with a \/ sequence, for sed below
@ -182,7 +182,6 @@ ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \
sed -e "s/\//\\\\\\\\\//g"` sed -e "s/\//\\\\\\\\\//g"`
ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \ ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \
sed -e "s/\//\\\\\\\\\//g"` sed -e "s/\//\\\\\\\\\//g"`
ls_output_dsp_s=`echo $ls_output_dsp | sed -e "s/\//\\\\\\\\\//g"`
replace_sed_string="s/ls_install_dir/$installdir_s/; \ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_dbuser/$ls_dbuser/; \ s/ls_dbuser/$ls_dbuser/; \
@ -200,7 +199,7 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \ s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \
s/ls_scheduler_host/$ls_scheduler_host/; \ s/ls_scheduler_host/$ls_scheduler_host/; \
s/ls_scheduler_port/$ls_scheduler_port/; \ s/ls_scheduler_port/$ls_scheduler_port/; \
s/ls_output_dsp/$ls_output_dsp_s/;" s/ls_output_alsa_device/$ls_output_alsa_device/;"

2
livesupport/products/scheduler/etc/Makefile.in
View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.60 $ # Version : $Revision: 1.61 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@

7
livesupport/products/scheduler/etc/scheduler-local.xml
View file

@ -63,11 +63,14 @@
<!ELEMENT playLogFactory (postgresqlPlayLog) > <!ELEMENT playLogFactory (postgresqlPlayLog) >
<!ELEMENT postgresqlPlayLog EMPTY > <!ELEMENT postgresqlPlayLog EMPTY >
<!ELEMENT audioPlayer (helixPlayer) > <!ELEMENT audioPlayer (helixPlayer|gstreamerPlayer) >
<!ELEMENT helixPlayer EMPTY > <!ELEMENT helixPlayer EMPTY >
<!ATTLIST helixPlayer dllPath CDATA #REQUIRED > <!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
<!ELEMENT gstreamerPlayer EMPTY >
<!ATTLIST gstreamerPlayer audioDevice CDATA #IMPLIED >
<!ELEMENT xmlRpcDaemon EMPTY > <!ELEMENT xmlRpcDaemon EMPTY >
<!ATTLIST xmlRpcDaemon xmlRpcHost CDATA #REQUIRED > <!ATTLIST xmlRpcDaemon xmlRpcHost CDATA #REQUIRED >
<!ATTLIST xmlRpcDaemon xmlRpcPort NMTOKEN #REQUIRED > <!ATTLIST xmlRpcDaemon xmlRpcPort NMTOKEN #REQUIRED >
@ -126,7 +129,7 @@
</playLogFactory> </playLogFactory>
<audioPlayer> <audioPlayer>
<helixPlayer dllPath = "../../usr/lib/helix"/> <gstreamerPlayer audioDevice = "plughw:0,0" />
</audioPlayer> </audioPlayer>
<xmlRpcDaemon xmlRpcHost = "localhost" <xmlRpcDaemon xmlRpcHost = "localhost"

7
livesupport/products/scheduler/etc/scheduler.xml
View file

@ -66,7 +66,7 @@
<!ELEMENT playLogFactory (postgresqlPlayLog) > <!ELEMENT playLogFactory (postgresqlPlayLog) >
<!ELEMENT postgresqlPlayLog EMPTY > <!ELEMENT postgresqlPlayLog EMPTY >
<!ELEMENT audioPlayer (helixPlayer) > <!ELEMENT audioPlayer (helixPlayer|gstreamerPlayer) >
<!ELEMENT helixPlayer EMPTY > <!ELEMENT helixPlayer EMPTY >
<!ATTLIST helixPlayer dllPath CDATA #REQUIRED > <!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
@ -74,6 +74,9 @@
<!ATTLIST helixPlayer audioStreamTimeout NMTOKEN #IMPLIED > <!ATTLIST helixPlayer audioStreamTimeout NMTOKEN #IMPLIED >
<!ATTLIST helixPlayer fadeLookAheatTime NMTOKEN #IMPLIED > <!ATTLIST helixPlayer fadeLookAheatTime NMTOKEN #IMPLIED >
<!ELEMENT gstreamerPlayer EMPTY >
<!ATTLIST gstreamerPlayer audioDevice CDATA #IMPLIED >
<!ELEMENT xmlRpcDaemon EMPTY > <!ELEMENT xmlRpcDaemon EMPTY >
<!ATTLIST xmlRpcDaemon xmlRpcHost CDATA #REQUIRED > <!ATTLIST xmlRpcDaemon xmlRpcHost CDATA #REQUIRED >
<!ATTLIST xmlRpcDaemon xmlRpcPort NMTOKEN #REQUIRED > <!ATTLIST xmlRpcDaemon xmlRpcPort NMTOKEN #REQUIRED >
@ -114,7 +117,7 @@
</playLogFactory> </playLogFactory>
<audioPlayer> <audioPlayer>
<helixPlayer dllPath = "../../usr/lib/helix"/> <gstreamerPlayer audioDevice = "plughw:0,0" />
</audioPlayer> </audioPlayer>
<xmlRpcDaemon xmlRpcHost = "localhost" <xmlRpcDaemon xmlRpcHost = "localhost"

9
livesupport/products/scheduler/etc/scheduler.xml.template
View file

@ -66,7 +66,7 @@
<!ELEMENT playLogFactory (postgresqlPlayLog) > <!ELEMENT playLogFactory (postgresqlPlayLog) >
<!ELEMENT postgresqlPlayLog EMPTY > <!ELEMENT postgresqlPlayLog EMPTY >
<!ELEMENT audioPlayer (helixPlayer) > <!ELEMENT audioPlayer (helixPlayer|gstreamerPlayer) >
<!ELEMENT helixPlayer EMPTY > <!ELEMENT helixPlayer EMPTY >
<!ATTLIST helixPlayer dllPath CDATA #REQUIRED > <!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
@ -74,6 +74,9 @@
<!ATTLIST helixPlayer audioStreamTimeout NMTOKEN #IMPLIED > <!ATTLIST helixPlayer audioStreamTimeout NMTOKEN #IMPLIED >
<!ATTLIST helixPlayer fadeLookAheatTime NMTOKEN #IMPLIED > <!ATTLIST helixPlayer fadeLookAheatTime NMTOKEN #IMPLIED >
<!ELEMENT gstreamerPlayer EMPTY >
<!ATTLIST gstreamerPlayer audioDevice CDATA #IMPLIED >
<!ELEMENT xmlRpcDaemon EMPTY > <!ELEMENT xmlRpcDaemon EMPTY >
<!ATTLIST xmlRpcDaemon xmlRpcHost CDATA #REQUIRED > <!ATTLIST xmlRpcDaemon xmlRpcHost CDATA #REQUIRED >
<!ATTLIST xmlRpcDaemon xmlRpcPort NMTOKEN #REQUIRED > <!ATTLIST xmlRpcDaemon xmlRpcPort NMTOKEN #REQUIRED >
@ -114,9 +117,7 @@
</playLogFactory> </playLogFactory>
<audioPlayer> <audioPlayer>
<helixPlayer dllPath = "ls_install_dir/lib/helix" <gstreamerPlayer audioDevice = "ls_output_alsa_device" />
audioDevice = "ls_output_dsp"
/>
</audioPlayer> </audioPlayer>
<xmlRpcDaemon xmlRpcHost = "ls_scheduler_host" <xmlRpcDaemon xmlRpcHost = "ls_scheduler_host"

8
livesupport/products/scheduler/src/PlaylistEventTest.h
View file

@ -22,7 +22,7 @@
Author : $Author: maroy $ Author : $Author: maroy $
Version : $Revision: 1.6 $ Version : $Revision: 1.7 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/PlaylistEventTest.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/PlaylistEventTest.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -71,15 +71,15 @@ using namespace LiveSupport::PlaylistExecutor;
* Unit test for the PlaylistEvent class * Unit test for the PlaylistEvent class
* *
* @author $Author: maroy $ * @author $Author: maroy $
* @version $Revision: 1.6 $ * @version $Revision: 1.7 $
* @see PlaylistEvent * @see PlaylistEvent
*/ */
class PlaylistEventTest : public CPPUNIT_NS::TestFixture class PlaylistEventTest : public CPPUNIT_NS::TestFixture
{ {
CPPUNIT_TEST_SUITE(PlaylistEventTest); CPPUNIT_TEST_SUITE(PlaylistEventTest);
CPPUNIT_TEST(simpleTest); CPPUNIT_TEST(simpleTest);
// CPPUNIT_TEST(initializeTest); CPPUNIT_TEST(initializeTest);
// CPPUNIT_TEST(playTest); CPPUNIT_TEST(playTest);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private: