diff options
author | David Robillard <d@drobilla.net> | 2011-05-13 23:32:42 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-05-13 23:32:42 +0000 |
commit | 162308c36dadbc5384d9074f6542b6105b2b8c52 (patch) | |
tree | 4cc5f8ddf47d7556ad20428c1da8638b34650ed2 /src | |
parent | 93947ee94eb79d76d31cd7ed3828135b9efa3781 (diff) | |
download | ingen-162308c36dadbc5384d9074f6542b6105b2b8c52.tar.gz ingen-162308c36dadbc5384d9074f6542b6105b2b8c52.tar.bz2 ingen-162308c36dadbc5384d9074f6542b6105b2b8c52.zip |
Apply 0002-Reformat-some-code-to-use-hard-tabs.patch from ticket #688, except with modifications to not add broken indentation.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3263 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r-- | src/bindings/ingen_bindings.hpp | 4 | ||||
-rw-r--r-- | src/client/OSCClientReceiver.cpp | 4 | ||||
-rw-r--r-- | src/client/PluginUI.hpp | 2 | ||||
-rw-r--r-- | src/server/PostProcessor.hpp | 4 | ||||
-rw-r--r-- | src/server/Request.hpp | 12 | ||||
-rw-r--r-- | src/server/events/Disconnect.cpp | 22 | ||||
-rw-r--r-- | src/shared/World.cpp | 10 |
7 files changed, 29 insertions, 29 deletions
diff --git a/src/bindings/ingen_bindings.hpp b/src/bindings/ingen_bindings.hpp index f76a4ea7..d4b2603b 100644 --- a/src/bindings/ingen_bindings.hpp +++ b/src/bindings/ingen_bindings.hpp @@ -8,8 +8,8 @@ class World; extern World* ingen_world; extern "C" { - bool run(World* world, const char* filename); - void script_iteration(World* world); + bool run(World* world, const char* filename); + void script_iteration(World* world); } } // namespace Shared diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index d0119987..2e28019b 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -111,8 +111,8 @@ OSCClientReceiver::generic_cb(const char* path, const char* types, lo_arg** argv for (int i=0; i < argc; ++i) { lo_arg_pp(lo_type(types[i]), argv[i]); printf("\t"); - } - printf("\n"); + } + printf("\n"); return 1; // not handled } diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp index 9f5b0e52..b93f4f3a 100644 --- a/src/client/PluginUI.hpp +++ b/src/client/PluginUI.hpp @@ -68,7 +68,7 @@ private: static SuilHost* ui_host; - SharedPtr<Shared::LV2Features::FeatureArray> _features; + SharedPtr<Shared::LV2Features::FeatureArray> _features; }; } // namespace Client diff --git a/src/server/PostProcessor.hpp b/src/server/PostProcessor.hpp index a48c89f8..f06a182e 100644 --- a/src/server/PostProcessor.hpp +++ b/src/server/PostProcessor.hpp @@ -48,8 +48,8 @@ public: /** Push a list of events on to the process queue, realtime-safe, not thread-safe. */ inline void append(Raul::List<Event*>* l) { _events.append(*l); } - /** Post-process and delete all pending events */ - void process(); + /** Post-process and delete all pending events */ + void process(); /** Set the latest event time that should be post-processed */ void set_end_time(FrameTime time) { _max_time = time; } diff --git a/src/server/Request.hpp b/src/server/Request.hpp index 5b91798d..185c250c 100644 --- a/src/server/Request.hpp +++ b/src/server/Request.hpp @@ -42,7 +42,7 @@ public: ClientInterface* client=0, int32_t id=1) : _source(source) - , _client(client) + , _client(client) , _id(id) {} @@ -53,10 +53,10 @@ public: ClientInterface* client() const { return _client; } void set_client(ClientInterface* client) { _client = client; } - void unblock() { - if (_source) - _source->unblock(); - } + void unblock() { + if (_source) + _source->unblock(); + } void respond_ok() { if (_client) @@ -69,7 +69,7 @@ public: } private: - EventSource* _source; + EventSource* _source; ClientInterface* _client; int32_t _id; }; diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index e9374648..e7177fab 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -225,13 +225,13 @@ Disconnect::execute(ProcessContext& context) void Disconnect::post_process() { - if (_error == NO_ERROR) { - if (_request) - _request->respond_ok(); - _engine.broadcaster()->disconnect(_src_port->path(), _dst_port->path()); - } else { - string msg("Unable to disconnect "); - msg.append(_src_port_path.str() + " => " + _dst_port_path.str()); + if (_error == NO_ERROR) { + if (_request) + _request->respond_ok(); + _engine.broadcaster()->disconnect(_src_port->path(), _dst_port->path()); + } else { + string msg("Unable to disconnect "); + msg.append(_src_port_path.str() + " => " + _dst_port_path.str()); msg.append(" ("); switch (_error) { case PARENT_PATCH_DIFFERENT: @@ -256,11 +256,11 @@ Disconnect::post_process() break; } msg.append(")"); - if (_request) - _request->respond_error(msg); - } + if (_request) + _request->respond_error(msg); + } - delete _impl; + delete _impl; } } // namespace Server diff --git a/src/shared/World.cpp b/src/shared/World.cpp index e0bff450..f29e6ef8 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -172,12 +172,12 @@ public: LV2Features* lv2_features; Sord::World* rdf_world; SharedPtr<LV2URIMap> uris; - SharedPtr<ServerInterface> engine; + SharedPtr<ServerInterface> engine; SharedPtr<EngineBase> local_engine; - SharedPtr<Serialisation::Serialiser> serialiser; - SharedPtr<Serialisation::Parser> parser; - SharedPtr<Store> store; - LilvWorld* lilv_world; + SharedPtr<Serialisation::Serialiser> serialiser; + SharedPtr<Serialisation::Parser> parser; + SharedPtr<Store> store; + LilvWorld* lilv_world; std::string jack_uuid; }; |