projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NOOP, remove trailing tabs/whitespace.
[ardour.git]
/
libs
/
backends
/
jack
/
jack_connection.cc
diff --git
a/libs/backends/jack/jack_connection.cc
b/libs/backends/jack/jack_connection.cc
index fee1b299ba098c5f6123ff856c7ff73978b72453..2747832ec004911d4e3aecf107cf533c3f2a84d7 100644
(file)
--- a/
libs/backends/jack/jack_connection.cc
+++ b/
libs/backends/jack/jack_connection.cc
@@
-19,7
+19,6
@@
#include <iostream>
#include <boost/scoped_ptr.hpp>
#include <iostream>
#include <boost/scoped_ptr.hpp>
-#include <jack/session.h>
#include <glibmm/timer.h>
#include <glibmm/timer.h>
@@
-57,8
+56,10
@@
JackConnection::JackConnection (const std::string& arg1, const std::string& arg2
: _jack (0)
, _client_name (arg1)
, session_uuid (arg2)
: _jack (0)
, _client_name (arg1)
, session_uuid (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 ();
*/
EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
@@
-78,6
+79,8
@@
JackConnection::JackConnection (const std::string& arg1, const std::string& arg2
jack_client_t* c = jack_client_open ("ardourprobe", JackNoStartServer, &status);
if (status == 0) {
jack_client_t* c = jack_client_open ("ardourprobe", JackNoStartServer, &status);
if (status == 0) {
+ _probed_buffer_size = jack_get_buffer_size(c);
+ _probed_sample_rate = jack_get_sample_rate(c);
jack_client_close (c);
_in_control = false;
} else {
jack_client_close (c);
_in_control = false;
} else {
@@
-142,7
+145,7
@@
JackConnection::close ()
{
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
{
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
- if (_priv_jack) {
+ if (_priv_jack) {
int ret = jack_client_close (_priv_jack);
_jack = 0;
int ret = jack_client_close (_priv_jack);
_jack = 0;