Renamed communications classes for consistency.

Removed engine dependency on OSC (mostly).


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

1 files changed, 0 insertions, 129 deletions

diff --git a/src/libs/engine/OSCReceiver.h b/src/libs/engine/OSCReceiver.h
deleted file mode 100644
index 671944fd..00000000
--- a/src/libs/engine/OSCReceiver.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* This file is part of Ingen.  Copyright (C) 2006 Dave Robillard.
- * 
- * Ingen 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.
- * 
- * Ingen 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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef OSCRECEIVER_H
-#define OSCRECEIVER_H
-
-#include "config.h"
-#include <string>
-#include <lo/lo.h>
-#include "QueuedEngineInterface.h"
-#include "OSCResponder.h"
-using std::string;
-
-namespace Ingen {
-
-class JackDriver;
-class NodeFactory;
-class Patch;
-
-
-/* Some boilerplate killing macros... */
-#define LO_HANDLER_ARGS const char* path, const char* types, lo_arg** argv, int argc, lo_message msg
-
-/* Defines a static handler to be passed to lo_add_method, which is a trivial
- * wrapper around a non-static method that does the real work.  Makes a whoole
- * lot of ugly boiler plate go away */
-#define LO_HANDLER(name) \
-int m_##name##_cb (LO_HANDLER_ARGS);\
-inline static int name##_cb(LO_HANDLER_ARGS, void* osc_receiver)\
-{ return ((OSCReceiver*)osc_receiver)->m_##name##_cb(path, types, argv, argc, msg); }
-
-
-/* FIXME: Make this receive and preprocess in the same thread? */
-
-
-/** Receives OSC messages from liblo.
- *
- * This inherits from QueuedEngineInterface and calls it's own functions
- * via OSC.  It's not actually a directly callable EngineInterface (it's
- * callable via OSC...) so it should be implemented-as-a (privately inherit)
- * QueuedEngineInterface, but it needs to be public so it's an EventSource
- * the Driver can use.  This probably should be fixed somehow..
- *
- * \ingroup engine
- */
-class OSCReceiver : public QueuedEngineInterface
-{
-public:
-	OSCReceiver(Engine& engine, size_t queue_size, const char* const port);
-	~OSCReceiver();
-
-	void activate();
-	void deactivate();
-
-private:
-	// Prevent copies (undefined)
-	OSCReceiver(const OSCReceiver&);
-	OSCReceiver& operator=(const OSCReceiver&);
-
-	virtual void _run();
-
-	static void error_cb(int num, const char* msg, const char* path);	
-	static int  set_response_address_cb(LO_HANDLER_ARGS, void* osc_receiver);
-	static int  generic_cb(LO_HANDLER_ARGS, void* osc_receiver);
-	static int  unknown_cb(LO_HANDLER_ARGS, void* osc_receiver);
-
-	LO_HANDLER(quit);
-	LO_HANDLER(ping);
-	LO_HANDLER(ping_slow);
-	LO_HANDLER(register_client);
-	LO_HANDLER(unregister_client);
-	LO_HANDLER(load_plugins);
-	LO_HANDLER(engine_activate);
-	LO_HANDLER(engine_deactivate);
-	LO_HANDLER(create_patch);
-	LO_HANDLER(rename);
-	LO_HANDLER(create_port);
-	LO_HANDLER(create_node);
-	LO_HANDLER(create_node_by_uri);
-	LO_HANDLER(enable_patch);
-	LO_HANDLER(disable_patch);
-	LO_HANDLER(clear_patch);
-	LO_HANDLER(destroy);
-	LO_HANDLER(connect);
-	LO_HANDLER(disconnect);
-	LO_HANDLER(disconnect_all);
-	LO_HANDLER(set_port_value);
-	LO_HANDLER(set_port_value_voice);
-	LO_HANDLER(set_port_value_slow);
-	LO_HANDLER(note_on);
-	LO_HANDLER(note_off);
-	LO_HANDLER(all_notes_off);
-	LO_HANDLER(midi_learn);
-	LO_HANDLER(metadata_get);
-	LO_HANDLER(metadata_set);
-	LO_HANDLER(request_plugins);
-	LO_HANDLER(request_all_objects);
-	LO_HANDLER(request_port_value);
-#ifdef HAVE_DSSI
-	LO_HANDLER(dssi);
-#endif
-#ifdef HAVE_LASH
-	LO_HANDLER(lash_restore_done);
-#endif	
-
-	const char* const _port;
-	lo_server         _server;
-
-	/** Cached OSC responder (for most recent incoming message) */
-	CountedPtr<OSCResponder> _osc_responder;
-};
-
-
-} // namespace Ingen
-
-#endif // OSCRECEIVER_H