diff options
| -rw-r--r-- | include/ingen/EventType.hpp | 76 | ||||
| -rw-r--r-- | src/server/Driver.hpp | 4 | ||||
| -rw-r--r-- | src/server/Engine.cpp | 1 | ||||
| -rw-r--r-- | src/server/JackDriver.cpp | 7 | ||||
| -rw-r--r-- | src/server/JackDriver.hpp | 2 | ||||
| -rw-r--r-- | src/server/ingen_lv2.cpp | 4 |
6 files changed, 3 insertions, 91 deletions
diff --git a/include/ingen/EventType.hpp b/include/ingen/EventType.hpp deleted file mode 100644 index bbe1fef8..00000000 --- a/include/ingen/EventType.hpp +++ /dev/null @@ -1,76 +0,0 @@ -/* This file is part of Ingen. - * Copyright 2008-2011 David Robillard <http://drobilla.net> - * - * 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 INGEN_INTERFACE_EVENTTYPE_HPP -#define INGEN_INTERFACE_EVENTTYPE_HPP - -#include "raul/URI.hpp" - -namespace Ingen { - -/** A type of event (that can live in an EventBuffer). - */ -class EventType { -public: - - enum Symbol { - UNKNOWN = 0, - MIDI = 1, - OSC = 2 - }; - - EventType(const Raul::URI& uri) - : _symbol(UNKNOWN) - { - if (uri == type_uri(MIDI)) { - _symbol = MIDI; - } else if (uri == type_uri(OSC)) { - _symbol = OSC; - } - } - - EventType(Symbol symbol) - : _symbol(symbol) - {} - - inline const Raul::URI& uri() const { return type_uri(_symbol); } - - inline bool operator==(const Symbol& symbol) const { return (_symbol == symbol); } - inline bool operator!=(const Symbol& symbol) const { return (_symbol != symbol); } - inline bool operator==(const EventType& type) const { return (_symbol == type._symbol); } - inline bool operator!=(const EventType& type) const { return (_symbol != type._symbol); } - - inline bool is_midi() { return _symbol == MIDI; } - inline bool is_osc() { return _symbol == OSC; } - -private: - static inline const Raul::URI& type_uri(unsigned symbol_num) { - assert(symbol_num <= OSC); - static const Raul::URI uris[] = { - "http://drobilla.net/ns/ingen#nil", - "http://drobilla.net/ns/ingen#MidiEvent", - "http://drobilla.net/ns/ingen#OSCEvent" - }; - return uris[symbol_num]; - } - - Symbol _symbol; -}; - -} // namespace Ingen - -#endif // INGEN_INTERFACE_EVENTTYPE_HPP diff --git a/src/server/Driver.hpp b/src/server/Driver.hpp index 0178b4f0..11b312eb 100644 --- a/src/server/Driver.hpp +++ b/src/server/Driver.hpp @@ -19,9 +19,11 @@ #define INGEN_ENGINE_DRIVER_HPP #include <string> + #include <boost/utility.hpp> + #include "raul/Deletable.hpp" -#include "ingen/EventType.hpp" + #include "DuplexPort.hpp" namespace Raul { class Path; } diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index eb7792f5..bf0ef61b 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -23,7 +23,6 @@ #include "raul/Maid.hpp" #include "raul/SharedPtr.hpp" #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" -#include "ingen/EventType.hpp" #include "events/CreatePatch.hpp" #include "events/CreatePort.hpp" #include "ingen/shared/World.hpp" diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 11d1ff08..821582c9 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -208,13 +208,6 @@ JackDriver::~JackDriver() } bool -JackDriver::supports(PortType port_type, EventType event_type) -{ - return (port_type == PortType::AUDIO - || (port_type == PortType::EVENTS && event_type == EventType::MIDI)); -} - -bool JackDriver::attach(const std::string& server_name, const std::string& client_name, void* jack_client) diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index d39319ba..32fb4f3e 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -88,8 +88,6 @@ public: explicit JackDriver(Engine& engine); ~JackDriver(); - bool supports(PortType port_type, EventType event_type); - bool attach(const std::string& server_name, const std::string& client_name, void* jack_client); diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index a2513946..c4e8240d 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -179,10 +179,6 @@ public: return NULL; } - virtual bool supports(PortType port_type, EventType event_type) { - return true; - } - virtual DriverPort* create_port(DuplexPort* patch_port) { return new LV2Port(this, patch_port); } |