From 9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 16 Apr 2011 19:02:36 +0000 Subject: Squeeze blank lines and delete trailing whitespace. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3152 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/JackDriver.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'src/engine/JackDriver.cpp') diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp index e3c89ca6..d60a0ec2 100644 --- a/src/engine/JackDriver.cpp +++ b/src/engine/JackDriver.cpp @@ -62,7 +62,6 @@ typedef jack_default_audio_sample_t jack_sample_t; namespace Ingen { - //// JackPort //// JackPort::JackPort(JackDriver* driver, DuplexPort* patch_port) @@ -75,13 +74,11 @@ JackPort::JackPort(JackDriver* driver, DuplexPort* patch_port) create(); } - JackPort::~JackPort() { assert(_jack_port == NULL); } - void JackPort::create() { @@ -100,7 +97,6 @@ JackPort::create() } } - void JackPort::destroy() { @@ -110,14 +106,12 @@ JackPort::destroy() _jack_port = NULL; } - void JackPort::move(const Raul::Path& path) { jack_port_set_name(_jack_port, ingen_jack_port_name(path).c_str()); } - void JackPort::pre_process(ProcessContext& context) { @@ -153,7 +147,6 @@ JackPort::pre_process(ProcessContext& context) } } - void JackPort::post_process(ProcessContext& context) { @@ -189,7 +182,6 @@ JackPort::post_process(ProcessContext& context) } } - //// JackDriver //// JackDriver::JackDriver(Engine& engine) @@ -208,7 +200,6 @@ JackDriver::JackDriver(Engine& engine) LV2_EVENT_URI, "http://lv2plug.in/ns/ext/midi#MidiEvent"); } - JackDriver::~JackDriver() { deactivate(); @@ -217,7 +208,6 @@ JackDriver::~JackDriver() jack_client_close(_client); } - bool JackDriver::supports(Shared::PortType port_type, Shared::EventType event_type) { @@ -225,7 +215,6 @@ JackDriver::supports(Shared::PortType port_type, Shared::EventType event_type) || (port_type == PortType::EVENTS && event_type == EventType::MIDI)); } - bool JackDriver::attach(const std::string& server_name, const std::string& client_name, @@ -252,7 +241,7 @@ JackDriver::attach(const std::string& server_name, LOG(info) << "Connected to JACK server `" << server_name << "'" << endl; } } - + // Either server name not specified, or supplied server name does not exist // Connect to default server if (!_client) { @@ -287,7 +276,6 @@ JackDriver::attach(const std::string& server_name, return true; } - void JackDriver::activate() { @@ -317,7 +305,6 @@ JackDriver::activate() } } - void JackDriver::deactivate() { @@ -340,7 +327,6 @@ JackDriver::deactivate() } } - /** Add a Jack port. * * Realtime safe, this is to be called at the beginning of a process cycle to @@ -356,7 +342,6 @@ JackDriver::add_port(DriverPort* port) _ports.push_back((JackPort*)port); } - /** Remove a Jack port. * * Realtime safe. This is to be called at the beginning of a process cycle to @@ -383,7 +368,6 @@ JackDriver::remove_port(const Path& path, DriverPort** port) return NULL; } - DriverPort* JackDriver::port(const Path& path) { @@ -394,7 +378,6 @@ JackDriver::port(const Path& path) return NULL; } - DriverPort* JackDriver::create_port(DuplexPort* patch_port) { @@ -409,7 +392,6 @@ JackDriver::create_port(DuplexPort* patch_port) } } - DriverPort* JackDriver::driver_port(const Path& path) { @@ -422,10 +404,8 @@ JackDriver::driver_port(const Path& path) return NULL; } - /**** Jack Callbacks ****/ - /** Jack process callback, drives entire audio thread. * * \callgraph @@ -500,7 +480,6 @@ JackDriver::_process_cb(jack_nframes_t nframes) return 0; } - void JackDriver::_thread_init_cb() { @@ -511,7 +490,6 @@ JackDriver::_thread_init_cb() ThreadManager::assert_thread(THREAD_PROCESS); } - void JackDriver::_shutdown_cb() { @@ -522,7 +500,6 @@ JackDriver::_shutdown_cb() _client = NULL; } - int JackDriver::_sample_rate_cb(jack_nframes_t nframes) { @@ -535,7 +512,6 @@ JackDriver::_sample_rate_cb(jack_nframes_t nframes) return 0; } - int JackDriver::_block_length_cb(jack_nframes_t nframes) { @@ -547,7 +523,6 @@ JackDriver::_block_length_cb(jack_nframes_t nframes) return 0; } - #ifdef INGEN_JACK_SESSION void JackDriver::_session_cb(jack_session_event_t* event) -- cgit v1.2.1