From a6045e5dc58f2dd2ab9e3d3d19fd3eaf6d84216f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 7 Jan 2010 01:22:03 +0000 Subject: Tidy. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2351 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/DeprecatedLoader.cpp | 8 ++-- src/client/NodeModel.cpp | 2 - src/engine/AudioBuffer.hpp | 6 +-- src/engine/ClientBroadcaster.hpp | 3 -- src/engine/CompiledPatch.hpp | 2 - src/engine/Context.hpp | 3 +- src/engine/HTTPClientSender.cpp | 25 +--------- src/engine/HTTPClientSender.hpp | 4 -- src/engine/JackDriver.cpp | 9 ++-- src/engine/JackDriver.hpp | 6 +-- src/engine/LADSPANode.hpp | 2 +- src/engine/LADSPAPlugin.cpp | 2 +- src/engine/OSCClientSender.hpp | 2 - src/engine/OSCEngineReceiver.cpp | 2 +- src/engine/ObjectBuffer.hpp | 1 - src/engine/QueuedEngineInterface.cpp | 12 ----- src/engine/QueuedEngineInterface.hpp | 9 +--- src/engine/QueuedEvent.hpp | 5 +- src/engine/events/SendPortActivity.hpp | 4 +- src/gui/App.cpp | 2 +- src/gui/Controls.cpp | 2 +- src/gui/cmdline.h | 86 ---------------------------------- src/module/World.cpp | 4 +- 23 files changed, 30 insertions(+), 171 deletions(-) delete mode 100644 src/gui/cmdline.h (limited to 'src') diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp index 088bf17d..18785667 100644 --- a/src/client/DeprecatedLoader.cpp +++ b/src/client/DeprecatedLoader.cpp @@ -342,7 +342,7 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename, _engine->set_port_value(translate_load_path(i->port_path().str()), Atom(value)); } } else { - LOG(warn) << "Unknown preset: \"" << pm->name() << endl; + LOG(warn) << "Unknown preset `" << pm->name() << "'" << endl; } } cur = cur->next; @@ -485,7 +485,7 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr _engine->put(path, props); } else { is_port = false; - LOG(warn) << "Unknown internal plugin label \"" << plugin_label << "\"" << endl; + LOG(warn) << "Unknown internal plugin label `" << plugin_label << "'" << endl; } } @@ -494,8 +494,8 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr const string new_path = (Path::is_valid(old_path) ? old_path : Path::pathify(old_path)); if (!Path::is_valid(old_path)) - LOG(warn) << "Translating invalid port path \"" << old_path << "\" => \"" - << new_path << "\"" << endl; + LOG(warn) << "Translating invalid port path `" << old_path << "' => `" + << new_path << "'" << endl; // Set up translations (for connections etc) to alias both the old // module path and the old module/port path to the new port path diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index c4ddbbaf..07bdccf8 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -69,7 +69,6 @@ NodeModel::~NodeModel() void NodeModel::remove_port(SharedPtr port) { - // FIXME: slow for (Ports::iterator i = _ports.begin(); i != _ports.end(); ++i) { if ((*i) == port) { _ports.erase(i); @@ -83,7 +82,6 @@ NodeModel::remove_port(SharedPtr port) void NodeModel::remove_port(const Path& port_path) { - // FIXME: slow for (Ports::iterator i = _ports.begin(); i != _ports.end(); ++i) { if ((*i)->path() == port_path) { _ports.erase(i); diff --git a/src/engine/AudioBuffer.hpp b/src/engine/AudioBuffer.hpp index c7ac5238..8a0ed67e 100644 --- a/src/engine/AudioBuffer.hpp +++ b/src/engine/AudioBuffer.hpp @@ -69,9 +69,9 @@ private: LV2_Vector_Body* vector() { return(LV2_Vector_Body*)object()->body; } - State _state; ///< State of buffer for setting values next cycle - Sample _set_value; ///< Value set by set_value (for completing the set next cycle) - FrameTime _set_time; ///< Time _set_value was set (to reset next cycle) + State _state; ///< State of buffer for setting values next cycle + Sample _set_value; ///< Value set by set_value (for completing the set next cycle) + FrameTime _set_time; ///< Time _set_value was set (to reset next cycle) }; diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index 6ccaceda..f13530ca 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -54,8 +54,6 @@ public: Shared::ClientInterface* client(const Raul::URI& uri); - //void send_client_registration(const string& url, int client_id); - void bundle_begin(); void bundle_end(); @@ -81,7 +79,6 @@ private: }; - } // namespace Ingen #endif // CLIENTBROADCASTER_H diff --git a/src/engine/CompiledPatch.hpp b/src/engine/CompiledPatch.hpp index ef12bcd6..d6a61f50 100644 --- a/src/engine/CompiledPatch.hpp +++ b/src/engine/CompiledPatch.hpp @@ -68,8 +68,6 @@ private: struct CompiledPatch : public std::vector , public Raul::Deletable , public boost::noncopyable { - /*CompiledPatch() : std::vector() {} - CompiledPatch(size_t reserve) : std::vector(reserve) {}*/ }; diff --git a/src/engine/Context.hpp b/src/engine/Context.hpp index 8d3085b8..0029e00c 100644 --- a/src/engine/Context.hpp +++ b/src/engine/Context.hpp @@ -19,6 +19,7 @@ #define CONTEXT_H #include "EventSink.hpp" +#include "tuning.hpp" namespace Ingen { @@ -35,7 +36,7 @@ public: Context(Engine& engine, ID id) : _id(id) , _engine(engine) - , _event_sink(engine, 1024) // FIXME: size? + , _event_sink(engine, event_queue_size) , _start(0) , _realtime(true) {} diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp index 891a7184..7d7070f9 100644 --- a/src/engine/HTTPClientSender.cpp +++ b/src/engine/HTTPClientSender.cpp @@ -48,7 +48,7 @@ HTTPClientSender::response_error(int32_t id, const std::string& msg) void HTTPClientSender::error(const std::string& msg) { - //send("/ingen/error", "s", msg.c_str(), LO_ARGS_END); + warn << "HTTP send error " << msg << endl; } @@ -128,10 +128,7 @@ HTTPClientSender::set_port_value(const Path& port_path, const Atom& value) void HTTPClientSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value) { - /*lo_message m = lo_message_new(); - lo_message_add_string(m, port_path.c_str()); - AtomLiblo::lo_message_add_atom(m, value); - send_message("/ingen/set_port_value", m);*/ + warn << "TODO: HTTP set voice value" << endl; } @@ -144,24 +141,6 @@ HTTPClientSender::activity(const Path& path) send_chunk(msg); } -#if 0 -static void null_deleter(const GraphObject*) {} - -bool -HTTPClientSender::new_object(const GraphObject* object) -{ - SharedPtr serialiser = _engine.world()->serialiser; - serialiser->start_to_string("/", ""); - // FIXME: kludge - // FIXME: engine boost dependency? - boost::shared_ptr obj((GraphObject*)object, null_deleter); - serialiser->serialise(obj); - string str = serialiser->finish(); - send_chunk(str); - return true; -} -#endif - void HTTPClientSender::move(const Path& old_path, const Path& new_path) diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp index 81af61db..d3bc9505 100644 --- a/src/engine/HTTPClientSender.hpp +++ b/src/engine/HTTPClientSender.hpp @@ -61,15 +61,11 @@ public: /* *** ClientInterface Implementation Below *** */ - //void client_registration(const std::string& url, int client_id); - void response_ok(int32_t id); void response_error(int32_t id, const std::string& msg); void error(const std::string& msg); - //virtual bool new_object(const Shared::GraphObject* object); - virtual void put(const Raul::URI& path, const Shared::Resource::Properties& properties); diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp index 98523f43..0a747397 100644 --- a/src/engine/JackDriver.cpp +++ b/src/engine/JackDriver.cpp @@ -228,7 +228,7 @@ JackDriver::attach(const std::string& server_name, _client = jack_client_open(client_name.c_str(), JackServerName, NULL, server_name.c_str()); if (_client) - LOG(info) << "Connected to JACK server '" << server_name << "'" << endl; + LOG(info) << "Connected to JACK server `" << server_name << "'" << endl; } // Either server name not specified, or supplied server name does not exist @@ -237,12 +237,12 @@ JackDriver::attach(const std::string& server_name, _client = jack_client_open(client_name.c_str(), JackNullOption, NULL); if (_client) - LOG(info) << "Connected to default JACK server." << endl; + LOG(info) << "Connected to default JACK server" << endl; } // Still failed if (!_client) { - LOG(error) << "Unable to connect to Jack. Exiting." << endl; + LOG(error) << "Unable to connect to Jack" << endl; return false; } } else { @@ -311,7 +311,7 @@ JackDriver::deactivate() } _jack_thread->stop(); - LOG(info) << "Deactivated Jack client." << endl; + LOG(info) << "Deactivated Jack client" << endl; } } @@ -395,7 +395,6 @@ JackDriver::driver_port(const Path& path) /**** Jack Callbacks ****/ - /** Jack process callback, drives entire audio thread. * * \callgraph diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp index e120d74e..1e7165d1 100644 --- a/src/engine/JackDriver.hpp +++ b/src/engine/JackDriver.hpp @@ -57,11 +57,11 @@ public: void pre_process(ProcessContext& context); void post_process(ProcessContext& context); - jack_port_t* jack_port() const { return _jack_port; } + jack_port_t* jack_port() const { return _jack_port; } private: - JackDriver* _driver; - jack_port_t* _jack_port; + JackDriver* _driver; + jack_port_t* _jack_port; }; diff --git a/src/engine/LADSPANode.hpp b/src/engine/LADSPANode.hpp index ef7db579..b241c471 100644 --- a/src/engine/LADSPANode.hpp +++ b/src/engine/LADSPANode.hpp @@ -64,7 +64,7 @@ protected: boost::optional& lower_bound, boost::optional& upper_bound); - const LADSPA_Descriptor* _descriptor; + const LADSPA_Descriptor* _descriptor; Raul::Array* _instances; Raul::Array* _prepared_instances; }; diff --git a/src/engine/LADSPAPlugin.cpp b/src/engine/LADSPAPlugin.cpp index 7bf4ef4a..1f316849 100644 --- a/src/engine/LADSPAPlugin.cpp +++ b/src/engine/LADSPAPlugin.cpp @@ -103,7 +103,7 @@ LADSPAPlugin::instantiate(BufferFactory& bufs, } } else { - error << "Could not find plugin \"" << _id << "\" in " << _library_path << endl; + error << "Could not find plugin `" << _id << "' in " << _library_path << endl; } return n; diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp index 34d88fc4..c5317a14 100644 --- a/src/engine/OSCClientSender.hpp +++ b/src/engine/OSCClientSender.hpp @@ -61,8 +61,6 @@ public: /* *** ClientInterface Implementation Below *** */ - //void client_registration(const std::string& url, int client_id); - void response_ok(int32_t id); void response_error(int32_t id, const std::string& msg); diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index e9348d13..d4b6e43e 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -230,7 +230,7 @@ OSCEngineReceiver::set_response_address_cb(const char* path, const char* types, void OSCEngineReceiver::error_cb(int num, const char* msg, const char* path) { - error << "liblo server error " << num << " in path \"" << "\" - " << msg << endl; + error << "liblo server error " << num << " for path `" << path << "' (" << msg << ")" << endl; } diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp index 821d1028..83a2e5c1 100644 --- a/src/engine/ObjectBuffer.hpp +++ b/src/engine/ObjectBuffer.hpp @@ -37,7 +37,6 @@ public: const void* port_data(Shared::PortType port_type) const; void copy(Context& context, const Buffer* src); - //void mix(Context& context, const Buffer* src) {} void resize(size_t size); diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 03365a87..ded0b5cf 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -295,15 +295,3 @@ QueuedEngineInterface::request_all_objects() } // namespace Ingen - - -extern "C" { - -Ingen::QueuedEngineInterface* -new_queued_interface(Ingen::Engine& engine) -{ - return new Ingen::QueuedEngineInterface(engine, Ingen::event_queue_size); -} - -} // extern "C" - diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 9197a27b..ef470e3e 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -103,8 +103,7 @@ public: virtual void midi_learn(const Raul::Path& node_path); - // Requests // - + // Requests virtual void ping(); virtual void get(const Raul::URI& uri); virtual void request_property(const Raul::URI& object_path, const Raul::URI& key); @@ -112,7 +111,6 @@ public: virtual void request_all_objects(); protected: - virtual void disable_responses(); SharedPtr _responder; ///< NULL if responding disabled @@ -126,9 +124,4 @@ private: } // namespace Ingen -extern "C" { - extern Ingen::QueuedEngineInterface* new_queued_interface(Ingen::Engine& engine); -} - #endif // QUEUEDENGINEINTERFACE_H - diff --git a/src/engine/QueuedEvent.hpp b/src/engine/QueuedEvent.hpp index 71c29624..64a82304 100644 --- a/src/engine/QueuedEvent.hpp +++ b/src/engine/QueuedEvent.hpp @@ -42,13 +42,12 @@ class QueuedEventSource; class QueuedEvent : public Event { public: - /** Process this event into a realtime-suitable event. - */ + /** Process this event into a realtime-suitable event. */ virtual void pre_process(); virtual void execute(ProcessContext& context); - /** If this event blocks the prepare phase of other slow events */ + /** True iff this event blocks the prepare phase of other events. */ bool is_blocking() { return _blocking; } bool is_prepared() { return _pre_processed; } diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp index 0dd08924..c35266c5 100644 --- a/src/engine/events/SendPortActivity.hpp +++ b/src/engine/events/SendPortActivity.hpp @@ -44,8 +44,8 @@ class SendPortActivity : public Event { public: inline SendPortActivity(Engine& engine, - SampleCount timestamp, - PortImpl* port) + SampleCount timestamp, + PortImpl* port) : Event(engine, SharedPtr(), timestamp) , _port(port) { diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 3efd9dc0..9391200d 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -152,7 +152,7 @@ App::run() { assert(_main); _main->run(); - info << "GUI exiting" << endl; + info << "[GUI] Exiting" << endl; } diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index 5b7d40e8..6b825b48 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -423,7 +423,7 @@ StringControl::set_value(const Atom& val) if (val.type() == Atom::STRING) _entry->set_text(val.get_string()); else - error << "Non-string value for string port" << endl; + error << "Non-string value for string port " << _port_model->path() << endl; _enable_signal = true; } diff --git a/src/gui/cmdline.h b/src/gui/cmdline.h deleted file mode 100644 index c2e004e6..00000000 --- a/src/gui/cmdline.h +++ /dev/null @@ -1,86 +0,0 @@ -/* cmdline.h */ - -/* File autogenerated by gengetopt version 2.19.1 */ - -#ifndef CMDLINE_H -#define CMDLINE_H - -/* If we use autoconf. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#ifndef CMDLINE_PARSER_PACKAGE -#define CMDLINE_PARSER_PACKAGE "ingen" -#endif - -#ifndef CMDLINE_PARSER_VERSION -#define CMDLINE_PARSER_VERSION VERSION -#endif - -struct gengetopt_args_info -{ - const char *help_help; /* Print help and exit help description. */ - const char *version_help; /* Print version and exit help description. */ - int engine_flag; /* Run (JACK) engine (default=off). */ - const char *engine_help; /* Run (JACK) engine help description. */ - int engine_port_arg; /* Engine OSC port (default='16180'). */ - char * engine_port_orig; /* Engine OSC port original value given at command line. */ - const char *engine_port_help; /* Engine OSC port help description. */ - char * connect_arg; /* Connect to existing engine at OSC URI (default='osc.udp://localhost:16180'). */ - char * connect_orig; /* Connect to existing engine at OSC URI original value given at command line. */ - const char *connect_help; /* Connect to existing engine at OSC URI help description. */ - int gui_flag; /* Launch the GTK graphical interface (default=on). */ - const char *gui_help; /* Launch the GTK graphical interface help description. */ - int client_port_arg; /* Client OSC port. */ - char * client_port_orig; /* Client OSC port original value given at command line. */ - const char *client_port_help; /* Client OSC port help description. */ - char * load_arg; /* Load patch. */ - char * load_orig; /* Load patch original value given at command line. */ - const char *load_help; /* Load patch help description. */ - char * path_arg; /* Target path for loaded patch. */ - char * path_orig; /* Target path for loaded patch original value given at command line. */ - const char *path_help; /* Target path for loaded patch help description. */ - - int help_given ; /* Whether help was given. */ - int version_given ; /* Whether version was given. */ - int engine_given ; /* Whether engine was given. */ - int engine_port_given ; /* Whether engine-port was given. */ - int connect_given ; /* Whether connect was given. */ - int gui_given ; /* Whether gui was given. */ - int client_port_given ; /* Whether client-port was given. */ - int load_given ; /* Whether load was given. */ - int path_given ; /* Whether path was given. */ - -} ; - -extern const char *gengetopt_args_info_purpose; -extern const char *gengetopt_args_info_usage; -extern const char *gengetopt_args_info_help[]; - -int cmdline_parser (int argc, char * const *argv, - struct gengetopt_args_info *args_info); -int cmdline_parser2 (int argc, char * const *argv, - struct gengetopt_args_info *args_info, - int override, int initialize, int check_required); -int cmdline_parser_file_save(const char *filename, - struct gengetopt_args_info *args_info); - -void cmdline_parser_print_help(void); -void cmdline_parser_print_version(void); - -void cmdline_parser_init (struct gengetopt_args_info *args_info); -void cmdline_parser_free (struct gengetopt_args_info *args_info); - -int cmdline_parser_required (struct gengetopt_args_info *args_info, - const char *prog_name); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CMDLINE_H */ diff --git a/src/module/World.cpp b/src/module/World.cpp index e3b93c8f..ff55919d 100644 --- a/src/module/World.cpp +++ b/src/module/World.cpp @@ -55,7 +55,7 @@ load_module(const string& name) if (Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) { module = new Glib::Module(filename, Glib::MODULE_BIND_LAZY); if (*module) { - LOG(info) << "Loaded \"" << name << "\" from " << filename << endl; + LOG(info) << "Loaded `" << name << "' from " << filename << endl; return SharedPtr(module); } else { delete module; @@ -71,7 +71,7 @@ load_module(const string& name) Glib::MODULE_BIND_LAZY); if (*module) { - LOG(info) << "Loaded \"" << name << "\" from " << INGEN_MODULE_DIR << endl; + LOG(info) << "Loaded `" << name << "' from " << INGEN_MODULE_DIR << endl; return SharedPtr(module); } else if (!module_path_found) { LOG(error) << "Unable to find " << name -- cgit v1.2.1