More juggling

git-svn-id: http://svn.drobilla.net/lad/grauph@14 a436a847-0d15-0410-975c-d299462d15a1

4 files changed, 2 insertions, 205 deletions

diff --git a/src/engine/events/Event.cpp b/src/engine/events/Event.cpp
deleted file mode 100644
index 7d590e76..00000000
--- a/src/engine/events/Event.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* This file is part of Om.  Copyright (C) 2006 Dave Robillard.
- * 
- * Om is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "Event.h"
-#include "Responder.h"
-#include "Om.h"
-#include "OmApp.h"
-#include "AudioDriver.h"
-
-namespace Om {
-
-// It'd be nice if this was inlined..
-Event::Event(CountedPtr<Responder> responder)
-: m_responder(responder),
-  m_executed(false)
-{
-      m_time_stamp = om->audio_driver()->time_stamp();
-}
-
-
-/** Construct an event with no responder.
- *
- * For internal events only, attempting to access the responder will
- * cause a NULL pointer dereference.
- */
-Event::Event()
-: m_responder(NULL),
-  m_executed(false)
-{
-      m_time_stamp = om->audio_driver()->time_stamp();
-}
-
-
-} // namespace Om
-
diff --git a/src/engine/events/Event.h b/src/engine/events/Event.h
deleted file mode 100644
index a6d06f83..00000000
--- a/src/engine/events/Event.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* This file is part of Om.  Copyright (C) 2006 Dave Robillard.
- * 
- * Om is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef EVENT_H
-#define EVENT_H
-
-#include <cassert>
-#include "util/CountedPtr.h"
-#include "util/types.h"
-#include "MaidObject.h"
-#include "Responder.h"
-
-namespace Om {	
-
-
-
-/** Base class for all events (both realtime and QueuedEvent).
- *
- * This is for time-critical events like note ons.  There is no non-realtime
- * pre-execute method as in QueuedEvent's, any lookups etc need to be done in the
- * realtime execute() method.
- *
- * QueuedEvent extends this class with a pre_process() method for any work that needs
- * to be done before processing in the realtime audio thread.
- *
- * \ingroup engine
- */
-class Event : public MaidObject
-{
-public:
-	virtual ~Event() {}
-
-	/** Execute event, MUST be realtime safe */
-	virtual void execute(samplecount offset) { assert(!m_executed); m_executed = true; }
-	
-	/** Perform any actions after execution (ie send OSC response to client).
-	 * No realtime requirement. */
-	virtual void post_process() {}
-	
-	inline samplecount time_stamp() { return m_time_stamp; }
-		
-protected:
-	Event(CountedPtr<Responder> responder);
-	Event();
-
-	// Prevent copies
-	Event(const Event&);
-	Event& operator=(const Event&);
-	
-	CountedPtr<Responder>  m_responder;
-	samplecount            m_time_stamp;
-	bool                   m_executed;
-};
-
-
-} // namespace Om
-
-#endif // EVENT_H
diff --git a/src/engine/events/Makefile.am b/src/engine/events/Makefile.am
index 9a882a4f..5b29e12b 100644
--- a/src/engine/events/Makefile.am
+++ b/src/engine/events/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 	events/RegisterClientEvent.h \
 	events/RegisterClientEvent.cpp \
diff --git a/src/engine/events/QueuedEvent.h b/src/engine/events/QueuedEvent.h
deleted file mode 100644
index 16560aaa..00000000
--- a/src/engine/events/QueuedEvent.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* This file is part of Om.  Copyright (C) 2006 Dave Robillard.
- * 
- * Om is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef QUEUEDEVENT_H
-#define QUEUEDEVENT_H
-
-#include "Event.h"
-
-namespace Om {
-
-class Responder;
-class QueuedEventSource;
-
-
-/** An Event with a not-time-critical preprocessing stage.
- *
- * These events are events that aren't able to be executed immediately by the
- * Jack thread (because they allocate memory or whatever).  They are pushed
- * on to the QueuedEventQueue where they are preprocessed then pushed on
- * to the realtime Event Queue when they are ready.
- *
- * Lookups for these events should go in the pre_process() method, since they are
- * not time critical and shouldn't waste time in the audio thread doing
- * lookups they can do beforehand.  (This applies for any expensive operation that
- * could be done before the execute() method).
- *
- * \ingroup engine
- */
-class QueuedEvent : public Event
-{
-public:
-	/** Process this event into a realtime-suitable event.
-	 */
-	virtual void pre_process() {
-		assert(m_pre_processed == false);
-		m_pre_processed = true;
-	}
-
-	virtual void execute(samplecount offset) {
-		assert(m_pre_processed);
-		Event::execute(offset);
-	}
-
-	virtual void post_process() {}
-
-	/** If this event blocks the prepare phase of other slow events */
-	bool is_blocking() { return m_blocking; }
-
-	bool is_prepared() { return m_pre_processed; }
-	
-protected:
-	// Prevent copies
-	QueuedEvent(const QueuedEvent& copy);
-	QueuedEvent& operator=(const QueuedEvent&);
-	
-	QueuedEvent(CountedPtr<Responder> responder, bool blocking = false, QueuedEventSource* source=NULL)
-	: Event(responder), m_pre_processed(false), m_blocking(blocking), m_source(source)
-	{}
-	
-	// NULL event base (for internal events)
-	QueuedEvent()
-	: Event(), m_pre_processed(false), m_blocking(false), m_source(NULL)
-	{}
-
-	bool               m_pre_processed;
-	bool               m_blocking;
-	QueuedEventSource* m_source;
-};
-
-
-} // namespace Om
-
-#endif // QUEUEDEVENT_H