From a324a4da27413245fefaf482faf793bcb1c1bb65 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 9 Dec 2009 02:28:35 +0000 Subject: Fix compilation with --jack-dbus. git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@2302 a436a847-0d15-0410-975c-d299462d15a1 --- src/JackDbusDriver.cpp | 13 +++++----- src/JackDbusDriver.hpp | 68 ++++++++++++++++++-------------------------------- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp index d5da26d..17a6beb 100644 --- a/src/JackDbusDriver.cpp +++ b/src/JackDbusDriver.cpp @@ -67,8 +67,8 @@ JackDriver::JackDriver(Patchage* app) : Driver(128) , _app(app) , _dbus_connection(0) - , _server_started(false) , _server_responding(false) + , _server_started(false) , _graph_version(0) , _max_dsp_load(0.0) { @@ -91,7 +91,7 @@ JackDriver::~JackDriver() /** Destroy all JACK (canvas) ports. */ void -JackDriver::destroy_all_ports() +JackDriver::destroy_all() { ItemList modules = _app->canvas()->items(); // copy for (ItemList::iterator m = modules.begin(); m != modules.end(); ++m) { @@ -102,7 +102,7 @@ JackDriver::destroy_all_ports() PortVector ports = module->ports(); // copy for (PortVector::iterator p = ports.begin(); p != ports.end(); ++p) { boost::shared_ptr port = boost::dynamic_pointer_cast(*p); - if (port && port->type() == JACK_AUDIO || port->type() == JACK_MIDI) { + if (port && (port->type() == JACK_AUDIO || port->type() == JACK_MIDI)) { module->remove_port(port); port->hide(); } @@ -111,7 +111,7 @@ JackDriver::destroy_all_ports() if (module->ports().empty()) _app->canvas()->remove_item(module); else - _app->enqueue_resize(); + _app->enqueue_resize(module); } } @@ -711,7 +711,6 @@ JackDriver::refresh_internal(bool force) { DBusMessage* reply_ptr; DBusMessageIter iter; - int type; dbus_uint64_t version; const char * reply_signature; DBusMessageIter clients_array_iter; @@ -760,7 +759,7 @@ JackDriver::refresh_internal(bool force) goto unref; } - destroy_all_ports(); + destroy_all(); //info_msg(str(boost::format("got new graph version %llu") % version)); _graph_version = version; @@ -976,6 +975,8 @@ JackDriver::set_buffer_size(jack_nframes_t size) } dbus_message_unref(reply_ptr); + + return true; } diff --git a/src/JackDbusDriver.hpp b/src/JackDbusDriver.hpp index 0a6b864..bd13ef1 100644 --- a/src/JackDbusDriver.hpp +++ b/src/JackDbusDriver.hpp @@ -45,16 +45,16 @@ public: bool is_realtime() const; void refresh(); + void destroy_all(); - bool - connect( + bool connect( boost::shared_ptr src, boost::shared_ptr dst); - bool - disconnect( + bool disconnect( boost::shared_ptr src, boost::shared_ptr dst); + void start_transport(); void stop_transport(); void rewind_transport(); @@ -62,22 +62,20 @@ public: void reset_xruns(); jack_nframes_t buffer_size(); - bool set_buffer_size(jack_nframes_t size); + bool set_buffer_size(jack_nframes_t size); float sample_rate(); size_t xruns(); float get_max_dsp_load(); - void reset_max_dsp_load(); + void reset_max_dsp_load(); - boost::shared_ptr - find_port_view( + boost::shared_ptr find_port_view( Patchage* patchage, const PortID& ref); - boost::shared_ptr - create_port_view( + boost::shared_ptr create_port_view( Patchage* patchage, const PortID& ref); @@ -85,20 +83,17 @@ private: void error_msg(const std::string& msg) const; void info_msg(const std::string& msg) const; - boost::shared_ptr - find_or_create_module( + boost::shared_ptr find_or_create_module( ModuleType type, const std::string& name); - void - add_port( + void add_port( boost::shared_ptr& module, PortType type, const std::string& name, bool is_input); - void - add_port( + void add_port( dbus_uint64_t client_id, const char *client_name, dbus_uint64_t port_id, @@ -106,15 +101,13 @@ private: dbus_uint32_t port_flags, dbus_uint32_t port_type); - void - remove_port( + void remove_port( dbus_uint64_t client_id, const char *client_name, dbus_uint64_t port_id, const char *port_name); - void - connect_ports( + void connect_ports( dbus_uint64_t connection_id, dbus_uint64_t client1_id, const char *client1_name, @@ -125,8 +118,7 @@ private: dbus_uint64_t port2_id, const char *port2_name); - void - disconnect_ports( + void disconnect_ports( dbus_uint64_t connection_id, dbus_uint64_t client1_id, const char *client1_name, @@ -137,8 +129,7 @@ private: dbus_uint64_t port2_id, const char *port2_name); - bool - call( + bool call( bool response_expected, const char* iface, const char* method, @@ -146,39 +137,28 @@ private: int in_type, ...); - void - update_attached(); - - bool - is_started(); + void update_attached(); - void - start_server(); + bool is_started(); - void - stop_server(); + void start_server(); - void - destroy_all_ports(); + void stop_server(); void refresh_internal(bool force); - static - DBusHandlerResult - dbus_message_hook( + static DBusHandlerResult dbus_message_hook( DBusConnection *connection, DBusMessage *message, void *me); - void - on_jack_appeared(); + void on_jack_appeared(); - void - on_jack_disappeared(); + void on_jack_disappeared(); private: - Patchage* _app; - DBusError _dbus_error; + Patchage* _app; + DBusError _dbus_error; DBusConnection* _dbus_connection; bool _server_responding; -- cgit v1.2.1