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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
livesupport/modules/playlistExecutor/etc/helixPlayer.xml
View file

@ -3,6 +3,8 @@
<!ELEMENT helixPlayer EMPTY > <!ELEMENT helixPlayer EMPTY >
<!ATTLIST helixPlayer dllPath CDATA #REQUIRED > <!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
<!ATTLIST helixPlayer audioDevice CDATA #IMPLIED >
]> ]>
<helixPlayer dllPath = "../../usr/lib/helix" <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 $ 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 $ 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"; 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 * 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); throw std::invalid_argument(eMsg);
} }
dllPath = attribute->get_value(); dllPath = attribute->get_value();
if ((attribute = element.get_attribute(audioDeviceName))) {
setAudioDevice(attribute->get_value());
}
} }

9
livesupport/modules/playlistExecutor/src/HelixPlayer.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ 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 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/Attic/HelixPlayer.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -77,21 +77,24 @@ using namespace LiveSupport::Core;
* *
* <pre><code> * <pre><code>
* <helixPlayer dllPath = "../../usr/lib/helix" * <helixPlayer dllPath = "../../usr/lib/helix"
* audioDevice = "/dev/sound/dsp"
* /> * />
* <pre><code> * <pre><code>
* *
* where the dllPath is the path to the directory containing the Helix * 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: * The DTD for the above configuration is the following:
* *
* <pre><code> * <pre><code>
* <!ELEMENT helixPlayer EMPTY > * <!ELEMENT helixPlayer EMPTY >
* <!ATTLIST helixPlayer dllPath CDATA #REQUIRED > * <!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
* <!ATTLIST helixPlayer audioDevice CDATA #IMPLIED >
* </pre></code> * </pre></code>
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.11 $ * @version $Revision: 1.12 $
*/ */
class HelixPlayer : virtual public Configurable, class HelixPlayer : virtual public Configurable,
virtual public AudioPlayerInterface, virtual public AudioPlayerInterface,