From 22b07e0233a29d9633ffa825a79503befaf2e16e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 5 Oct 2015 16:17:49 +0200 Subject: NOOP, remove trailing tabs/whitespace. --- libs/backends/jack/jack_audiobackend.cc | 36 ++++++++++++++++----------------- libs/backends/jack/jack_audiobackend.h | 2 +- libs/backends/jack/jack_connection.cc | 2 +- libs/backends/jack/jack_portengine.cc | 12 +++++------ libs/backends/jack/jack_session.cc | 14 ++++++------- 5 files changed, 33 insertions(+), 33 deletions(-) (limited to 'libs/backends/jack') diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index 5de12294e1..b414eda563 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -126,7 +126,7 @@ JACKAudioBackend::enumerate_devices () const if (all_devices.find (_target_driver) == all_devices.end()) { all_devices.insert (make_pair (_target_driver, std::set())); } - + /* store every device we've found, by driver name. * * This is so we do not confuse ALSA, FFADO, netjack etc. devices @@ -138,7 +138,7 @@ JACKAudioBackend::enumerate_devices () const for (vector::const_iterator d = currently_available.begin(); d != currently_available.end(); ++d) { all.insert (*d); } - + for (DeviceList::const_iterator d = all.begin(); d != all.end(); ++d) { if (find (currently_available.begin(), currently_available.end(), *d) == currently_available.end()) { statuses.push_back (DeviceStatus (*d, false)); @@ -146,7 +146,7 @@ JACKAudioBackend::enumerate_devices () const statuses.push_back (DeviceStatus (*d, false)); } } - + return statuses; } @@ -154,7 +154,7 @@ vector JACKAudioBackend::available_sample_rates (const string& device) const { vector f; - + if (device == _target_device && available()) { f.push_back (sample_rate()); return f; @@ -174,7 +174,7 @@ JACKAudioBackend::available_sample_rates (const string& device) const f.push_back (96000.0); f.push_back (192000.0); f.push_back (384000.0); - + return f; } @@ -182,7 +182,7 @@ vector JACKAudioBackend::available_buffer_sizes (const string& device) const { vector s; - + if (device == _target_device && available()) { s.push_back (buffer_size()); return s; @@ -286,7 +286,7 @@ JACKAudioBackend::set_input_channels (uint32_t cnt) } _target_input_channels = cnt; - + return 0; } @@ -473,7 +473,7 @@ JACKAudioBackend::setup_jack_startup_command (bool for_latency_measurement) } options.realtime = true; options.ports_max = 2048; - + ARDOUR::set_midi_option (options, _target_midi_option); /* this must always be true for any server instance we start ourselves @@ -514,14 +514,14 @@ JACKAudioBackend::_start (bool for_latency_measurement) return -1; } } - + GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); /* get the buffer size and sample rates established */ jack_sample_rate_callback (jack_get_sample_rate (_priv_jack)); jack_bufsize_callback (jack_get_buffer_size (_priv_jack)); - + /* Now that we have buffer size and sample rate established, the engine can go ahead and do its stuff */ @@ -534,9 +534,9 @@ JACKAudioBackend::_start (bool for_latency_measurement) if (!jack_port_type_get_buffer_size) { warning << _("This version of JACK is old - you should upgrade to a newer version that supports jack_port_type_get_buffer_size()") << endmsg; } - + set_jack_callbacks (); - + if (jack_activate (_priv_jack) == 0) { _running = true; } else { @@ -553,7 +553,7 @@ JACKAudioBackend::stop () { _running = false; // no 'engine halted message'. GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); - + _jack_connection->close (); _current_buffer_size = 0; @@ -571,7 +571,7 @@ JACKAudioBackend::freewheel (bool onoff) if (onoff == _freewheeling) { /* already doing what has been asked for */ - + return 0; } @@ -930,7 +930,7 @@ JACKAudioBackend::process_thread () GET_PRIVATE_JACK_POINTER_RET(_priv_jack,0); pframes_t nframes = jack_cycle_wait (_priv_jack); - + if (engine.process_callback (nframes)) { return 0; } @@ -1050,7 +1050,7 @@ JACKAudioBackend::n_physical (unsigned long flags) const } } } - + jack_free (ports); } @@ -1084,9 +1084,9 @@ JACKAudioBackend::control_app_name () const if (_target_driver.empty() || _target_device.empty()) { return appname; } - + if (_target_driver == "ALSA") { - + if (_target_device == "Hammerfall DSP") { appname = "hdspconf"; } else if (_target_device == "M Audio Delta 1010") { diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h index 7e860df3b8..530e3fdfd7 100644 --- a/libs/backends/jack/jack_audiobackend.h +++ b/libs/backends/jack/jack_audiobackend.h @@ -237,7 +237,7 @@ class JACKAudioBackend : public AudioBackend { JACKAudioBackend* engine; boost::function f; size_t stacksize; - + ThreadData (JACKAudioBackend* e, boost::function fp, size_t stacksz) : engine (e) , f (fp) , stacksize (stacksz) {} }; diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc index acc32c4400..2747832ec0 100644 --- a/libs/backends/jack/jack_connection.cc +++ b/libs/backends/jack/jack_connection.cc @@ -145,7 +145,7 @@ JackConnection::close () { GET_PRIVATE_JACK_POINTER_RET (_jack, -1); - if (_priv_jack) { + if (_priv_jack) { int ret = jack_client_close (_priv_jack); _jack = 0; diff --git a/libs/backends/jack/jack_portengine.cc b/libs/backends/jack/jack_portengine.cc index 257feb2bf2..10b2efed6b 100644 --- a/libs/backends/jack/jack_portengine.cc +++ b/libs/backends/jack/jack_portengine.cc @@ -41,7 +41,7 @@ static uint32_t ardour_port_flags_to_jack_flags (PortFlags flags) { uint32_t jack_flags = 0; - + if (flags & IsInput) { jack_flags |= JackPortIsInput; } @@ -242,7 +242,7 @@ JACKAudioBackend::physically_connected (PortHandle p, bool process_callback_safe jack_port_t* port = (jack_port_t*) p; const char** ports; - + if (process_callback_safe) { ports = jack_port_get_connections ((jack_port_t*)port); } else { @@ -328,7 +328,7 @@ JACKAudioBackend::get_ports (const string& port_name_pattern, DataType type, Por } jack_free (ports); - + return s.size(); } @@ -442,7 +442,7 @@ int JACKAudioBackend::connect (const std::string& src, const std::string& dst) { GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); - + int r = jack_connect (_priv_jack, src.c_str(), dst.c_str()); return r; } @@ -505,7 +505,7 @@ void JACKAudioBackend::set_latency_range (PortHandle port, bool for_playback, LatencyRange r) { jack_latency_range_t range; - + range.min = r.min; range.max = r.max; @@ -517,7 +517,7 @@ JACKAudioBackend::get_latency_range (PortHandle port, bool for_playback) { jack_latency_range_t range; LatencyRange ret; - + jack_port_get_latency_range ((jack_port_t*) port, for_playback ? JackPlaybackLatency : JackCaptureLatency, &range); ret.min = range.min; diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc index 8495a5971f..1e9d956876 100644 --- a/libs/backends/jack/jack_session.cc +++ b/libs/backends/jack/jack_session.cc @@ -94,7 +94,7 @@ JACKSession::session_event (jack_session_event_t* event) */ jack_client_t* jack_client = (jack_client_t*) AudioEngine::instance()->port_engine().private_handle(); - + if (jack_client) { jack_session_reply (jack_client, event); } @@ -119,23 +119,23 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/, /* BBT info */ TempoMetric metric (tempo_map.metric_at (tf)); - + try { tempo_map.bbt_time_rt (tf, bbt); - + pos->bar = bbt.bars; pos->beat = bbt.beats; pos->tick = bbt.ticks; - + // XXX still need to set bar_start_tick - + pos->beats_per_bar = metric.meter().divisions_per_bar(); pos->beat_type = metric.meter().note_divisor(); pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_beat; pos->beats_per_minute = metric.tempo().beats_per_minute(); - + pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT); - + } catch (...) { /* no message */ } -- cgit v1.2.3