From b15864870d34a1188eda93ad215734275037278e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 11 Sep 2006 11:10:35 +0000 Subject: Switched homebrew CountedPtr to boost::shared_ptr. Factories for patch windows, controller. Robustness updated in many places. Tons of cleanups, rewrites, bugfixes, etc. git-svn-id: http://svn.drobilla.net/lad/ingen@128 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/events/MidiLearnEvent.h | 2 +- src/libs/engine/events/RenameEvent.cpp | 2 +- src/libs/engine/events/RequestMetadataEvent.cpp | 2 +- src/libs/engine/events/RequestPortValueEvent.cpp | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libs/engine/events') 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(), 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, 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 m_key(key), m_value(""), m_object(NULL), - m_client(CountedPtr(NULL)) + m_client(CountedPtr()) { } 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(NULL)) + m_value(0.0) { } -- cgit v1.2.1