diff options
Diffstat (limited to 'src/libs/engine')
| -rw-r--r-- | src/libs/engine/ClientBroadcaster.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libs/engine/OSCEngineReceiver.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/OSCResponder.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/Patch.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/QueuedEvent.h | 2 | ||||
| -rw-r--r-- | src/libs/engine/Responder.h | 2 | ||||
| -rw-r--r-- | src/libs/engine/events/MidiLearnEvent.h | 2 | ||||
| -rw-r--r-- | src/libs/engine/events/RenameEvent.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/events/RequestMetadataEvent.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/events/RequestPortValueEvent.cpp | 3 |
11 files changed, 11 insertions, 12 deletions
diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp index 181e5a2c..1b4a2bd2 100644 --- a/src/libs/engine/ClientBroadcaster.cpp +++ b/src/libs/engine/ClientBroadcaster.cpp @@ -112,7 +112,7 @@ ClientBroadcaster::client(const ClientKey& key) cerr << "[ClientBroadcaster] Failed to find client." << endl; - return NULL; + return CountedPtr<ClientInterface>(); } diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index daf6db6c..99679932 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = tests DIST_SUBDIRS = events -AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events -fno-exceptions +AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events MAINTAINERCLEANFILES = Makefile.in diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index ad985b7e..2eb68d70 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -52,7 +52,7 @@ OSCEngineReceiver::OSCEngineReceiver(CountedPtr<Engine> engine, size_t queue_siz QueuedEngineInterface(engine, queue_size, queue_size), // FIXME _port(port), _server(NULL), - _osc_responder(NULL) + _osc_responder(CountedPtr<OSCResponder>()) { _server = lo_server_new(port, error_cb); diff --git a/src/libs/engine/OSCResponder.cpp b/src/libs/engine/OSCResponder.cpp index a6d68721..a2931ca5 100644 --- a/src/libs/engine/OSCResponder.cpp +++ b/src/libs/engine/OSCResponder.cpp @@ -83,7 +83,7 @@ OSCResponder::client() if (_broadcaster) return _broadcaster->client(client_key()); else - return NULL; + return CountedPtr<ClientInterface>(); } } // namespace OM diff --git a/src/libs/engine/Patch.cpp b/src/libs/engine/Patch.cpp index bcbe4e68..747d60c7 100644 --- a/src/libs/engine/Patch.cpp +++ b/src/libs/engine/Patch.cpp @@ -361,7 +361,7 @@ Patch::set_path(const Path& new_path) // Update nodes for (List<Node*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) - (*i)->set_path(new_path.base_path() + (*i)->name()); + (*i)->set_path(new_path.base() + (*i)->name()); // Update self NodeBase::set_path(new_path); diff --git a/src/libs/engine/QueuedEvent.h b/src/libs/engine/QueuedEvent.h index 733ebd38..780e6a36 100644 --- a/src/libs/engine/QueuedEvent.h +++ b/src/libs/engine/QueuedEvent.h @@ -87,7 +87,7 @@ protected: // NULL event base (for internal events only!) QueuedEvent(Engine& engine) - : Event(engine, NULL, 0) + : Event(engine, CountedPtr<Ingen::Responder>(), 0) , _pre_processed(false), _blocking(false), _source(NULL) {} diff --git a/src/libs/engine/Responder.h b/src/libs/engine/Responder.h index 3976883d..63b6fc7f 100644 --- a/src/libs/engine/Responder.h +++ b/src/libs/engine/Responder.h @@ -52,7 +52,7 @@ public: virtual ~Responder() {} virtual ClientKey client_key() { return ClientKey(); } - virtual CountedPtr<ClientInterface> client() { return NULL; } + virtual CountedPtr<ClientInterface> client() { return CountedPtr<ClientInterface>(); } virtual void set_id(int32_t id) {} diff --git a/src/libs/engine/events/MidiLearnEvent.h b/src/libs/engine/events/MidiLearnEvent.h index 7a36706c..8c4ed6d2 100644 --- a/src/libs/engine/events/MidiLearnEvent.h +++ b/src/libs/engine/events/MidiLearnEvent.h @@ -38,7 +38,7 @@ class MidiLearnResponseEvent : public Event { public: MidiLearnResponseEvent(Engine& engine, const string& port_path, SampleCount timestamp) - : Event(engine, NULL, timestamp), + : Event(engine, CountedPtr<Responder>(), timestamp), m_port_path(port_path), m_value(0.0f) {} diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp index 82fe3737..75db4395 100644 --- a/src/libs/engine/events/RenameEvent.cpp +++ b/src/libs/engine/events/RenameEvent.cpp @@ -31,7 +31,7 @@ RenameEvent::RenameEvent(Engine& engine, CountedPtr<Responder> responder, Sample : QueuedEvent(engine, responder, timestamp), m_old_path(path), m_name(name), - m_new_path(m_old_path.parent().base_path() + name), + m_new_path(m_old_path.parent().base() + name), m_parent_patch(NULL), m_store_treenode(NULL), m_error(NO_ERROR) diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp index e2169f54..f6f1bdf9 100644 --- a/src/libs/engine/events/RequestMetadataEvent.cpp +++ b/src/libs/engine/events/RequestMetadataEvent.cpp @@ -33,7 +33,7 @@ RequestMetadataEvent::RequestMetadataEvent(Engine& engine, CountedPtr<Responder> m_key(key), m_value(""), m_object(NULL), - m_client(CountedPtr<ClientInterface>(NULL)) + m_client(CountedPtr<ClientInterface>()) { } diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp index 80f55dcd..55f4731f 100644 --- a/src/libs/engine/events/RequestPortValueEvent.cpp +++ b/src/libs/engine/events/RequestPortValueEvent.cpp @@ -32,8 +32,7 @@ RequestPortValueEvent::RequestPortValueEvent(Engine& engine, CountedPtr<Responde : QueuedEvent(engine, responder, timestamp), m_port_path(port_path), m_port(NULL), - m_value(0.0), - m_client(CountedPtr<ClientInterface>(NULL)) + m_value(0.0) { } |