summaryrefslogtreecommitdiff
path: root/libs/backends/jack
diff options
context:
space:
mode:
Diffstat (limited to 'libs/backends/jack')
-rw-r--r--libs/backends/jack/jack_api.cc2
-rw-r--r--libs/backends/jack/jack_audiobackend.cc24
-rw-r--r--libs/backends/jack/jack_audiobackend.h20
-rw-r--r--libs/backends/jack/jack_connection.cc2
-rw-r--r--libs/backends/jack/jack_connection.h2
-rw-r--r--libs/backends/jack/jack_portengine.cc6
-rw-r--r--libs/backends/jack/jack_session.cc2
-rw-r--r--libs/backends/jack/jack_session.h2
-rw-r--r--libs/backends/jack/jack_utils.cc4
9 files changed, 32 insertions, 32 deletions
diff --git a/libs/backends/jack/jack_api.cc b/libs/backends/jack/jack_api.cc
index ce1109c7f0..b63b1c1f69 100644
--- a/libs/backends/jack/jack_api.cc
+++ b/libs/backends/jack/jack_api.cc
@@ -66,7 +66,7 @@ instantiate (const std::string& arg1, const std::string& arg2)
return 0;
}
-static int
+static int
deinstantiate ()
{
backend.reset ();
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index c3ce0b0d6c..5de12294e1 100644
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -72,7 +72,7 @@ JACKAudioBackend::~JACKAudioBackend()
}
string
-JACKAudioBackend::name() const
+JACKAudioBackend::name() const
{
return X_("JACK");
}
@@ -127,7 +127,7 @@ JACKAudioBackend::enumerate_devices () const
all_devices.insert (make_pair (_target_driver, std::set<string>()));
}
- /* store every device we've found, by driver name.
+ /* store every device we've found, by driver name.
*
* This is so we do not confuse ALSA, FFADO, netjack etc. devices
* with each other.
@@ -160,7 +160,7 @@ JACKAudioBackend::available_sample_rates (const string& device) const
return f;
}
- /* if JACK is not already running, just list a bunch of reasonable
+ /* if JACK is not already running, just list a bunch of reasonable
values and let the future sort it all out.
*/
@@ -339,7 +339,7 @@ JACKAudioBackend::device_name () const
if (!_jack_connection->in_control()) {
return "???"; // JACK has no way (as of fall 2013) to return
// the device name
- }
+ }
return _target_device;
}
@@ -441,7 +441,7 @@ JACKAudioBackend::systemic_output_latency () const
return _target_systemic_output_latency;
}
-size_t
+size_t
JACKAudioBackend::raw_buffer_size(DataType t)
{
std::map<DataType,size_t>::const_iterator s = _raw_buffer_sizes.find(t);
@@ -504,7 +504,7 @@ JACKAudioBackend::_start (bool for_latency_measurement)
if (!available()) {
if (_jack_connection->in_control()) {
- /* we will be starting JACK, so set up the
+ /* we will be starting JACK, so set up the
command that JACK will use when it (auto-)starts
*/
setup_jack_startup_command (for_latency_measurement);
@@ -522,7 +522,7 @@ JACKAudioBackend::_start (bool for_latency_measurement)
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
+ /* Now that we have buffer size and sample rate established, the engine
can go ahead and do its stuff
*/
@@ -606,8 +606,8 @@ JACKAudioBackend::transport_locate (framepos_t where)
jack_transport_locate (_priv_jack, where);
}
-framepos_t
-JACKAudioBackend::transport_frame () const
+framepos_t
+JACKAudioBackend::transport_frame () const
{
GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
return jack_get_current_transport_frame (_priv_jack);
@@ -1018,8 +1018,8 @@ JACKAudioBackend::disconnected (const char* why)
}
}
-float
-JACKAudioBackend::dsp_load() const
+float
+JACKAudioBackend::dsp_load() const
{
GET_PRIVATE_JACK_POINTER_RET(_priv_jack,0);
return jack_cpu_load (_priv_jack);
@@ -1137,7 +1137,7 @@ JACKAudioBackend::speed_and_position (double& speed, framepos_t& position)
jack_transport_state_t state;
bool starting;
- /* this won't be called if the port engine in use is not JACK, so we do
+ /* this won't be called if the port engine in use is not JACK, so we do
not have to worry about the type of PortEngine::private_handle()
*/
diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h
index 5319c52587..7e860df3b8 100644
--- a/libs/backends/jack/jack_audiobackend.h
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -42,7 +42,7 @@ class JACKAudioBackend : public AudioBackend {
public:
JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, boost::shared_ptr<JackConnection>);
~JACKAudioBackend ();
-
+
/* AUDIOBACKEND API */
std::string name() const;
@@ -120,7 +120,7 @@ class JACKAudioBackend : public AudioBackend {
void update_latencies ();
static bool already_configured();
-
+
/* PORTENGINE API */
const std::string& my_name() const;
@@ -148,7 +148,7 @@ class JACKAudioBackend : public AudioBackend {
int disconnect_all (PortHandle);
int connect (const std::string& src, const std::string& dst);
int disconnect (const std::string& src, const std::string& dst);
-
+
/* MIDI */
std::vector<std::string> enumerate_midi_options () const;
@@ -182,7 +182,7 @@ class JACKAudioBackend : public AudioBackend {
/* Latency management
*/
-
+
void set_latency_range (PortHandle, bool for_playback, LatencyRange);
LatencyRange get_latency_range (PortHandle, bool for_playback);
@@ -220,7 +220,7 @@ class JACKAudioBackend : public AudioBackend {
static void _freewheel_callback (int , void *arg);
static void _latency_callback (jack_latency_callback_mode_t, void*);
static void _session_callback (jack_session_event_t *event, void *arg);
-
+
void jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int);
int jack_sync_callback (jack_transport_state_t, jack_position_t*);
int jack_bufsize_callback (pframes_t);
@@ -232,7 +232,7 @@ class JACKAudioBackend : public AudioBackend {
void set_jack_callbacks ();
int reconnect_to_jack ();
-
+
struct ThreadData {
JACKAudioBackend* engine;
boost::function<void()> f;
@@ -241,7 +241,7 @@ class JACKAudioBackend : public AudioBackend {
ThreadData (JACKAudioBackend* e, boost::function<void()> fp, size_t stacksz)
: engine (e) , f (fp) , stacksize (stacksz) {}
};
-
+
void* process_thread ();
static void* _start_process_thread (void*);
@@ -265,7 +265,7 @@ class JACKAudioBackend : public AudioBackend {
typedef std::set<std::string> DeviceList;
typedef std::map<std::string,DeviceList> DriverDeviceMap;
-
+
mutable DriverDeviceMap all_devices;
PBD::ScopedConnection disconnect_connection;
@@ -284,7 +284,7 @@ class JACKAudioBackend : public AudioBackend {
void when_connected_to_jack ();
PBD::ScopedConnection jack_connection_connection;
- /* Object to manage interactions with Session in a way that
+ /* Object to manage interactions with Session in a way that
keeps JACK out of libardour directly
*/
@@ -297,4 +297,4 @@ class JACKAudioBackend : public AudioBackend {
} // namespace
#endif /* __ardour_audiobackend_h__ */
-
+
diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc
index af938ad21b..acc32c4400 100644
--- a/libs/backends/jack/jack_connection.cc
+++ b/libs/backends/jack/jack_connection.cc
@@ -59,7 +59,7 @@ JackConnection::JackConnection (const std::string& arg1, const std::string& arg2
, _probed_buffer_size (0)
, _probed_sample_rate (0)
{
- /* See if the server is already up
+ /* See if the server is already up
*/
EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
diff --git a/libs/backends/jack/jack_connection.h b/libs/backends/jack/jack_connection.h
index 3b0ccb8d46..f0fb2c1fdb 100644
--- a/libs/backends/jack/jack_connection.h
+++ b/libs/backends/jack/jack_connection.h
@@ -41,6 +41,6 @@ class JackConnection {
uint32_t _probed_sample_rate; // when not in control
};
-} // namespace
+} // namespace
#endif /* __libardour_jack_connection_h__ */
diff --git a/libs/backends/jack/jack_portengine.cc b/libs/backends/jack/jack_portengine.cc
index 8aa489dbca..257feb2bf2 100644
--- a/libs/backends/jack/jack_portengine.cc
+++ b/libs/backends/jack/jack_portengine.cc
@@ -315,8 +315,8 @@ JACKAudioBackend::get_ports (const string& port_name_pattern, DataType type, Por
GET_PRIVATE_JACK_POINTER_RET (_priv_jack,0);
- const char** ports = jack_get_ports (_priv_jack, port_name_pattern.c_str(),
- ardour_data_type_to_jack_port_type (type),
+ const char** ports = jack_get_ports (_priv_jack, port_name_pattern.c_str(),
+ ardour_data_type_to_jack_port_type (type),
ardour_port_flags_to_jack_flags (flags));
if (ports == 0) {
@@ -419,7 +419,7 @@ PortEngine::PortHandle
JACKAudioBackend::register_port (const std::string& shortname, ARDOUR::DataType type, ARDOUR::PortFlags flags)
{
GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
- return jack_port_register (_priv_jack, shortname.c_str(),
+ return jack_port_register (_priv_jack, shortname.c_str(),
ardour_data_type_to_jack_port_type (type),
ardour_port_flags_to_jack_flags (flags),
0);
diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc
index c9ee8c61e0..8495a5971f 100644
--- a/libs/backends/jack/jack_session.cc
+++ b/libs/backends/jack/jack_session.cc
@@ -89,7 +89,7 @@ JACKSession::session_event (jack_session_event_t* event)
}
}
- /* this won't be called if the port engine in use is not JACK, so we do
+ /* this won't be called if the port engine in use is not JACK, so we do
not have to worry about the type of PortEngine::private_handle()
*/
diff --git a/libs/backends/jack/jack_session.h b/libs/backends/jack/jack_session.h
index 996ab1fd6b..89b03d2e5d 100644
--- a/libs/backends/jack/jack_session.h
+++ b/libs/backends/jack/jack_session.h
@@ -33,7 +33,7 @@ class JACKSession : public ARDOUR::SessionHandlePtr
public:
JACKSession (ARDOUR::Session* s);
~JACKSession ();
-
+
void session_event (jack_session_event_t* event);
void timebase_callback (jack_transport_state_t /*state*/,
ARDOUR::pframes_t /*nframes*/,
diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
index 2ea110d6d7..029b922f73 100644
--- a/libs/backends/jack/jack_utils.cc
+++ b/libs/backends/jack/jack_utils.cc
@@ -536,7 +536,7 @@ ARDOUR::get_jack_server_dir_paths (vector<std::string>& server_dir_paths)
#ifdef PLATFORM_WINDOWS
// N.B. The #define (immediately below) can be safely removed once we know that this code builds okay with mingw
#ifdef COMPILER_MSVC
- IShellLinkA *pISL = NULL;
+ IShellLinkA *pISL = NULL;
IPersistFile *ppf = NULL;
// Mixbus creates a Windows shortcut giving the location of its
@@ -940,7 +940,7 @@ ARDOUR::write_jack_config_file (const std::string& config_file_path, const strin
}
vector<string>
-ARDOUR::enumerate_midi_options ()
+ARDOUR::enumerate_midi_options ()
{
if (midi_options.empty()) {
#ifdef HAVE_ALSA
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 11:49:47 +0000