From 654ec9651af44d83db8e8ae717d0ec763a3a3b37 Mon Sep 17 00:00:00 2001 From: maroy Date: Mon, 8 Nov 2004 13:18:45 +0000 Subject: [PATCH] some code cleanup --- .../EventScheduler/ScheduledEventInterface.h | 10 +++++----- .../modules/eventScheduler/src/SchedulerThread.h | 10 +++++----- .../PlaylistExecutor/AudioPlayerInterface.h | 7 +++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/livesupport/modules/eventScheduler/include/LiveSupport/EventScheduler/ScheduledEventInterface.h b/livesupport/modules/eventScheduler/include/LiveSupport/EventScheduler/ScheduledEventInterface.h index eb192c1e7..eeb61af84 100644 --- a/livesupport/modules/eventScheduler/include/LiveSupport/EventScheduler/ScheduledEventInterface.h +++ b/livesupport/modules/eventScheduler/include/LiveSupport/EventScheduler/ScheduledEventInterface.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/eventScheduler/include/LiveSupport/EventScheduler/ScheduledEventInterface.h,v $ ------------------------------------------------------------------------------*/ @@ -76,7 +76,7 @@ using namespace LiveSupport::Core; * * * @author $Author: maroy $ - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ class ScheduledEventInterface { @@ -94,7 +94,7 @@ class ScheduledEventInterface * * @return the time this event is scheduled for. */ - virtual Ptr::Ref + virtual Ptr::Ref getScheduledTime(void) throw () = 0; /** @@ -119,7 +119,7 @@ class ScheduledEventInterface * @return the maximum time for the initialize() function to complete. * @see #initialize */ - virtual Ptr::Ref + virtual Ptr::Ref maxTimeToInitialize(void) throw () = 0; /** @@ -143,7 +143,7 @@ class ScheduledEventInterface * * @return the length of the event, in time. */ - virtual Ptr::Ref + virtual Ptr::Ref eventLength(void) throw () = 0; /** diff --git a/livesupport/modules/eventScheduler/src/SchedulerThread.h b/livesupport/modules/eventScheduler/src/SchedulerThread.h index bb54c90e2..023885aa2 100644 --- a/livesupport/modules/eventScheduler/src/SchedulerThread.h +++ b/livesupport/modules/eventScheduler/src/SchedulerThread.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/eventScheduler/src/SchedulerThread.h,v $ ------------------------------------------------------------------------------*/ @@ -67,7 +67,7 @@ using namespace LiveSupport::Core; * The main, executing thread of the scheduler. * * @author $Author: maroy $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ class SchedulerThread : public virtual RunnableInterface { @@ -85,7 +85,7 @@ class SchedulerThread : public virtual RunnableInterface /** * The execution time of the next event. */ - Ptr::Ref nextEventTime; + Ptr::Ref nextEventTime; /** * The time to start the initialization of the next event. @@ -135,8 +135,8 @@ class SchedulerThread : public virtual RunnableInterface * now + granularity, false otherwise. */ bool - imminent(Ptr::Ref now, - Ptr::Ref when) const throw () + imminent(Ptr::Ref now, + Ptr::Ref when) const throw () { return *when >= *now && (*now + *granularity) > *when; } diff --git a/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h b/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h index 5ebe7d523..46e9d037f 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.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerInterface.h,v $ ------------------------------------------------------------------------------*/ @@ -40,6 +40,9 @@ #include "configure.h" #endif +#include +#include + namespace LiveSupport { namespace PlaylistExecutor { @@ -58,7 +61,7 @@ using namespace LiveSupport; * A generic interface for playing audio files. * * @author $Author: maroy $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ class AudioPlayerInterface {