From e9431a24954e43c6b08c5caed0de1d4c61c4c999 Mon Sep 17 00:00:00 2001
From: maroy <maroy@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Mon, 8 Nov 2004 10:42:05 +0000
Subject: [PATCH] removed Configurable dependecy from AudioPlayerInterface
---
.../PlaylistExecutor/AudioPlayerInterface.h | 24 +++----------------
.../playlistExecutor/src/HelixPlayer.h | 8 ++++---
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h b/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h
index f23f8fdf9..5ebe7d523 100644
--- a/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h
+++ b/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h
@@ -22,7 +22,7 @@
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 $
------------------------------------------------------------------------------*/
@@ -41,14 +41,10 @@
#endif
-#include "LiveSupport/Core/Configurable.h"
-
-
namespace LiveSupport {
namespace PlaylistExecutor {
using namespace LiveSupport;
-using namespace LiveSupport::Core;
/* ================================================================ constants */
@@ -62,9 +58,9 @@ using namespace LiveSupport::Core;
* A generic interface for playing audio files.
*
* @author $Author: maroy $
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
-class AudioPlayerInterface : virtual public Configurable
+class AudioPlayerInterface
{
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
* play audio files.
diff --git a/livesupport/modules/playlistExecutor/src/HelixPlayer.h b/livesupport/modules/playlistExecutor/src/HelixPlayer.h
index e5e8ef924..554a38994 100644
--- a/livesupport/modules/playlistExecutor/src/HelixPlayer.h
+++ b/livesupport/modules/playlistExecutor/src/HelixPlayer.h
@@ -22,7 +22,7 @@
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 $
------------------------------------------------------------------------------*/
@@ -46,6 +46,7 @@
#include <dllacces.h>
#include <dllpath.h>
+#include "LiveSupport/Core/Configurable.h"
#include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h"
#include "AdviseSink.h"
@@ -89,9 +90,10 @@ using namespace LiveSupport::Core;
* </pre></code>
*
* @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();