projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove old call_the_mothership code
[ardour.git]
/
libs
/
ardour
/
jack_slave.cc
diff --git
a/libs/ardour/jack_slave.cc
b/libs/ardour/jack_slave.cc
index 0f425d09c6855c2bf665fd68ef72efb902b1bc0a..4c2da4c6c45287a7a57aea78dde464ed28ab641d 100644
(file)
--- a/
libs/ardour/jack_slave.cc
+++ b/
libs/ardour/jack_slave.cc
@@
-18,25
+18,21
@@
*/
#include <iostream>
*/
#include <iostream>
+#include <cerrno>
-#include <errno.h>
#include <jack/jack.h>
#include <jack/transport.h>
#include "ardour/slave.h"
#include <jack/jack.h>
#include <jack/transport.h>
#include "ardour/slave.h"
-#include "ardour/session.h"
-
-#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
-using namespace sigc;
JACK_Slave::JACK_Slave (jack_client_t* j)
: jack (j)
{
double x;
JACK_Slave::JACK_Slave (jack_client_t* j)
: jack (j)
{
double x;
-
nframes64
_t p;
+
framepos
_t p;
/* call this to initialize things */
speed_and_position (x, p);
}
/* call this to initialize things */
speed_and_position (x, p);
}
@@
-64,7
+60,7
@@
JACK_Slave::ok() const
}
bool
}
bool
-JACK_Slave::speed_and_position (double& sp,
nframes64
_t& position)
+JACK_Slave::speed_and_position (double& sp,
framepos
_t& position)
{
jack_position_t pos;
jack_transport_state_t state;
{
jack_position_t pos;
jack_transport_state_t state;