projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new port design, probably about 90% done (i.e it mostly works and this commit is...
[ardour.git]
/
libs
/
ardour
/
jack_slave.cc
diff --git
a/libs/ardour/jack_slave.cc
b/libs/ardour/jack_slave.cc
index 352bcaeee54e1603b466f59883edf40e0e721358..f65be1deead78051fff8ee0697643a7f76058805 100644
(file)
--- a/
libs/ardour/jack_slave.cc
+++ b/
libs/ardour/jack_slave.cc
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <iostream>
*/
#include <iostream>
@@
-36,7
+35,7
@@
JACK_Slave::JACK_Slave (jack_client_t* j)
: jack (j)
{
float x;
: jack (j)
{
float x;
-
jack_
nframes_t p;
+ nframes_t p;
/* call this to initialize things */
speed_and_position (x, p);
}
/* call this to initialize things */
speed_and_position (x, p);
}
@@
-45,6
+44,12
@@
JACK_Slave::~JACK_Slave ()
{
}
{
}
+void
+JACK_Slave::reset_client (jack_client_t* j)
+{
+ jack = j;
+}
+
bool
JACK_Slave::locked() const
{
bool
JACK_Slave::locked() const
{
@@
-58,7
+63,7
@@
JACK_Slave::ok() const
}
bool
}
bool
-JACK_Slave::speed_and_position (float& sp,
jack_
nframes_t& position)
+JACK_Slave::speed_and_position (float& sp, nframes_t& position)
{
jack_position_t pos;
jack_transport_state_t state;
{
jack_position_t pos;
jack_transport_state_t state;