projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First part of consolidating ::roll(), ::no_roll()
[ardour.git]
/
libs
/
ardour
/
slave.cc
diff --git
a/libs/ardour/slave.cc
b/libs/ardour/slave.cc
index e8c63b43c184c3cce54461b52e86c7d1c22eec90..47dd80f8b4b59ef06d60d61614cfb10c155bde48 100644
(file)
--- a/
libs/ardour/slave.cc
+++ b/
libs/ardour/slave.cc
@@
-29,40
+29,53
@@
SlaveSessionProxy::tempo_map() const
return session.tempo_map();
}
return session.tempo_map();
}
-
fram
ecnt_t
-SlaveSessionProxy::
fram
e_rate() const
+
sampl
ecnt_t
+SlaveSessionProxy::
sampl
e_rate() const
{
{
- return session.
fram
e_rate();
+ return session.
sampl
e_rate();
}
}
-framepos_t
-SlaveSessionProxy::audible_frame() const
+pframes_t
+SlaveSessionProxy::samples_per_cycle() const
+{
+ return session.engine().samples_per_cycle();
+}
+
+samplepos_t
+SlaveSessionProxy::audible_sample() const
{
{
- return session.audible_
fram
e();
+ return session.audible_
sampl
e();
}
}
-
fram
epos_t
-SlaveSessionProxy::transport_
fram
e() const
+
sampl
epos_t
+SlaveSessionProxy::transport_
sampl
e() const
{
{
- return session.transport_
fram
e();
+ return session.transport_
sampl
e();
}
pframes_t
}
pframes_t
-SlaveSessionProxy::
fram
es_since_cycle_start() const
+SlaveSessionProxy::
sampl
es_since_cycle_start() const
{
return session.engine().samples_since_cycle_start();
}
{
return session.engine().samples_since_cycle_start();
}
-framepos_t
-SlaveSessionProxy::frame_time() const
+samplepos_t
+SlaveSessionProxy::sample_time_at_cycle_start() const
+{
+ return session.engine().sample_time_at_cycle_start();
+}
+
+
+samplepos_t
+SlaveSessionProxy::sample_time() const
{
return session.engine().sample_time();
}
void
{
return session.engine().sample_time();
}
void
-SlaveSessionProxy::request_locate(
framepos_t fram
e, bool with_roll)
+SlaveSessionProxy::request_locate(
samplepos_t sampl
e, bool with_roll)
{
{
- session.request_locate(
fram
e, with_roll);
+ session.request_locate(
sampl
e, with_roll);
}
void
}
void