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

removed Configurable dependecy from AudioPlayerInterface

This commit is contained in:
maroy 2004-11-08 10:42:05 +00:00
parent 28b2da6dd9
commit e9431a2495
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h
View File

@ -22,7 +22,7 @@
Author : $Author: maroy $ Author : $Author: maroy $
Version : $Revision: 1.1 $ Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -41,14 +41,10 @@
#endif #endif
#include "LiveSupport/Core/Configurable.h"
namespace LiveSupport { namespace LiveSupport {
namespace PlaylistExecutor { namespace PlaylistExecutor {
using namespace LiveSupport; using namespace LiveSupport;
using namespace LiveSupport::Core;
/* ================================================================ constants */ /* ================================================================ constants */
@ -62,9 +58,9 @@ using namespace LiveSupport::Core;
* A generic interface for playing audio files. * A generic interface for playing audio files.
* *
* @author $Author: maroy $ * @author $Author: maroy $
* @version $Revision: 1.1 $ * @version $Revision: 1.2 $
*/ */
class AudioPlayerInterface : virtual public Configurable class AudioPlayerInterface
{ {
public: public:
/** /**
@ -75,20 +71,6 @@ class AudioPlayerInterface : virtual public Configurable
{ {
} }
/**
* Configure the object based on the XML element supplied.
*
* @param element the XML element to configure the object from.
* @exception std::invalid_argument if the supplied XML element
* contains bad configuraiton information
* @exception std::logic_error if the scheduler daemon has already
* been configured, and can not be reconfigured.
*/
virtual void
configure(const xmlpp::Element & element)
throw (std::invalid_argument,
std::logic_error) = 0;
/** /**
* Initialize the Player object, so that it is ready to * Initialize the Player object, so that it is ready to
* play audio files. * play audio files.

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

@ -22,7 +22,7 @@
Author : $Author: maroy $ Author : $Author: maroy $
Version : $Revision: 1.2 $ Version : $Revision: 1.3 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -46,6 +46,7 @@
#include <dllacces.h> #include <dllacces.h>
#include <dllpath.h> #include <dllpath.h>
#include "LiveSupport/Core/Configurable.h"
#include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h"
#include "AdviseSink.h" #include "AdviseSink.h"
@ -89,9 +90,10 @@ using namespace LiveSupport::Core;
* </pre></code> * </pre></code>
* *
* @author $Author: maroy $ * @author $Author: maroy $
* @version $Revision: 1.2 $ * @version $Revision: 1.3 $
*/ */
class HelixPlayer : virtual public AudioPlayerInterface class HelixPlayer : virtual public Configurable,
virtual public AudioPlayerInterface
{ {
friend void * eventHandlerThread(void *) throw(); friend void * eventHandlerThread(void *) throw();