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

made the "set audio device" option available in the configuration file of HelixPlayer

This commit is contained in:
fgerlits 2005-03-02 10:00:45 +00:00
parent 5ffbc365cb
commit 4dc37a1c9c
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
livesupport/modules/playlistExecutor/etc/helixPlayer.xml
View File

@ -2,7 +2,9 @@
<!DOCTYPE helixPlayer [
<!ELEMENT helixPlayer EMPTY >
<!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
<!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
<!ATTLIST helixPlayer audioDevice CDATA #IMPLIED >
]>
<helixPlayer dllPath = "../../usr/lib/helix"
audioDevice = "/dev/sound/dsp"
/>

11
livesupport/modules/playlistExecutor/src/HelixPlayer.cxx
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.13 $
Version : $Revision: 1.14 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/Attic/HelixPlayer.cxx,v $
------------------------------------------------------------------------------*/
@ -71,6 +71,11 @@ const std::string HelixPlayer::configElementNameStr = "helixPlayer";
*/
static const std::string dllPathName = "dllPath";
/**
* The name of the audio device attribute.
*/
static const std::string audioDeviceName = "audioDevice";
/**
* The name of the client core shared object, as found under dllPath
*/
@ -116,6 +121,10 @@ HelixPlayer :: configure(const xmlpp::Element & element)
throw std::invalid_argument(eMsg);
}
dllPath = attribute->get_value();
if ((attribute = element.get_attribute(audioDeviceName))) {
setAudioDevice(attribute->get_value());
}
}

13
livesupport/modules/playlistExecutor/src/HelixPlayer.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.11 $
Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/Attic/HelixPlayer.h,v $
------------------------------------------------------------------------------*/
@ -76,22 +76,25 @@ using namespace LiveSupport::Core;
* This class can be configured with the following XML element.
*
* <pre><code>
* <helixPlayer dllPath = "../../usr/lib/helix"
* <helixPlayer dllPath = "../../usr/lib/helix"
* audioDevice = "/dev/sound/dsp"
* />
* <pre><code>
*
* where the dllPath is the path to the directory containing the Helix
* library shared objects.
* library shared objects. The optional audioDevice argument sets the
* AUDIO environment variable which is read by the Helix client.
*
* The DTD for the above configuration is the following:
*
* <pre><code>
* <!ELEMENT helixPlayer EMPTY >
* <!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
* <!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
* <!ATTLIST helixPlayer audioDevice CDATA #IMPLIED >
* </pre></code>
*
* @author $Author: fgerlits $
* @version $Revision: 1.11 $
* @version $Revision: 1.12 $
*/
class HelixPlayer : virtual public Configurable,
virtual public AudioPlayerInterface,