diff --git a/livesupport/modules/playlistExecutor/etc/helixPlayer.xml b/livesupport/modules/playlistExecutor/etc/helixPlayer.xml index ec00150b9..b9d1c4072 100644 --- a/livesupport/modules/playlistExecutor/etc/helixPlayer.xml +++ b/livesupport/modules/playlistExecutor/etc/helixPlayer.xml @@ -2,7 +2,9 @@ - + + ]> diff --git a/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx b/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx index 2e4088704..78e405192 100644 --- a/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx +++ b/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx @@ -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()); + } } diff --git a/livesupport/modules/playlistExecutor/src/HelixPlayer.h b/livesupport/modules/playlistExecutor/src/HelixPlayer.h index f0ae9dd04..cb7503423 100644 --- a/livesupport/modules/playlistExecutor/src/HelixPlayer.h +++ b/livesupport/modules/playlistExecutor/src/HelixPlayer.h @@ -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. * *

- *  
  *  

  *
  *  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:
  *
  *  

  *  
- *  
+ *  
+ *  
  *  
* * @author $Author: fgerlits $ - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ class HelixPlayer : virtual public Configurable, virtual public AudioPlayerInterface,