projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reconstruct and use global state commands (mute/solo/rec-enable/meter point)
[ardour.git]
/
libs
/
ardour
/
session_process.cc
diff --git
a/libs/ardour/session_process.cc
b/libs/ardour/session_process.cc
index 43849793d467e176ae732e9577e483b739e613d4..06ba4e304ec5ba67cc3c8b5e39ecad4a6c5438d3 100644
(file)
--- a/
libs/ardour/session_process.cc
+++ b/
libs/ardour/session_process.cc
@@
-44,7
+44,7
@@
using namespace PBD;
using namespace std;
void
using namespace std;
void
-Session::process (
jack_
nframes_t nframes)
+Session::process (nframes_t nframes)
{
if (synced_to_jack() && waiting_to_start) {
if ( _engine.transport_state() == AudioEngine::TransportRolling) {
{
if (synced_to_jack() && waiting_to_start) {
if ( _engine.transport_state() == AudioEngine::TransportRolling) {
@@
-53,7
+53,7
@@
Session::process (jack_nframes_t nframes)
}
if (non_realtime_work_pending()) {
}
if (non_realtime_work_pending()) {
- if (
g_atomic_int_get (&butler_should_do_transport_work) == 0
) {
+ if (
!transport_work_requested ()
) {
post_transport ();
}
}
post_transport ();
}
}
@@
-73,9
+73,9
@@
Session::prepare_diskstreams ()
}
int
}
int
-Session::no_roll (
jack_nframes_t nframes, jack_
nframes_t offset)
+Session::no_roll (
nframes_t nframes,
nframes_t offset)
{
{
-
jack_
nframes_t end_frame = _transport_frame + nframes;
+ nframes_t end_frame = _transport_frame + nframes;
int ret = 0;
bool declick = get_transport_declick_required();
boost::shared_ptr<RouteList> r = routes.reader ();
int ret = 0;
bool declick = get_transport_declick_required();
boost::shared_ptr<RouteList> r = routes.reader ();
@@
-111,7
+111,7
@@
Session::no_roll (jack_nframes_t nframes, jack_nframes_t offset)
}
int
}
int
-Session::process_routes (
jack_nframes_t nframes, jack_
nframes_t offset)
+Session::process_routes (
nframes_t nframes,
nframes_t offset)
{
bool record_active;
int declick = get_transport_declick_required();
{
bool record_active;
int declick = get_transport_declick_required();
@@
-156,7
+156,7
@@
Session::process_routes (jack_nframes_t nframes, jack_nframes_t offset)
}
int
}
int
-Session::silent_process_routes (
jack_nframes_t nframes, jack_
nframes_t offset)
+Session::silent_process_routes (
nframes_t nframes,
nframes_t offset)
{
bool record_active = actively_recording();
int declick = get_transport_declick_required();
{
bool record_active = actively_recording();
int declick = get_transport_declick_required();
@@
-197,7
+197,7
@@
Session::silent_process_routes (jack_nframes_t nframes, jack_nframes_t offset)
}
void
}
void
-Session::commit_diskstreams (
jack_
nframes_t nframes, bool &needs_butler)
+Session::commit_diskstreams (nframes_t nframes, bool &needs_butler)
{
int dret;
float pworst = 1.0f;
{
int dret;
float pworst = 1.0f;
@@
-242,14
+242,14
@@
Session::commit_diskstreams (jack_nframes_t nframes, bool &needs_butler)
}
void
}
void
-Session::process_with_events (
jack_
nframes_t nframes)
+Session::process_with_events (nframes_t nframes)
{
Event* ev;
{
Event* ev;
-
jack_
nframes_t this_nframes;
-
jack_
nframes_t end_frame;
-
jack_
nframes_t offset;
+ nframes_t this_nframes;
+ nframes_t end_frame;
+ nframes_t offset;
bool session_needs_butler = false;
bool session_needs_butler = false;
-
jack_
nframes_t stop_limit;
+ nframes_t stop_limit;
long frames_moved;
/* make sure the auditioner is silent */
long frames_moved;
/* make sure the auditioner is silent */
@@
-363,7
+363,7
@@
Session::process_with_events (jack_nframes_t nframes)
nframes -= this_nframes;
offset += this_nframes;
nframes -= this_nframes;
offset += this_nframes;
- frames_moved = (
jack_
nframes_t) floor (_transport_speed * this_nframes);
+ frames_moved = (nframes_t) floor (_transport_speed * this_nframes);
if (frames_moved < 0) {
decrement_transport_position (-frames_moved);
if (frames_moved < 0) {
decrement_transport_position (-frames_moved);
@@
-410,7
+410,7
@@
Session::process_with_events (jack_nframes_t nframes)
summon_butler ();
}
summon_butler ();
}
- if (!_engine.freewheeling() && send_mtc) {
+ if (!_engine.freewheeling() && se
ssion_se
nd_mtc) {
send_midi_time_code_in_another_thread ();
}
send_midi_time_code_in_another_thread ();
}
@@
-431,7
+431,7
@@
Session::transport_locked () const
{
Slave* sl = _slave;
{
Slave* sl = _slave;
- if (!locate_pending() && ((
_slave_type
== None) || (sl && sl->ok() && sl->locked()))) {
+ if (!locate_pending() && ((
Config->get_slave_source()
== None) || (sl && sl->ok() && sl->locked()))) {
return true;
}
return true;
}
@@
-439,17
+439,17
@@
Session::transport_locked () const
}
bool
}
bool
-Session::follow_slave (
jack_nframes_t nframes, jack_
nframes_t offset)
+Session::follow_slave (
nframes_t nframes,
nframes_t offset)
{
float slave_speed;
{
float slave_speed;
-
jack_
nframes_t slave_transport_frame;
-
jack_
nframes_t this_delta;
+ nframes_t slave_transport_frame;
+ nframes_t this_delta;
int dir;
bool starting;
if (!_slave->ok()) {
stop_transport ();
int dir;
bool starting;
if (!_slave->ok()) {
stop_transport ();
-
set_slave_source (None, 0
);
+
Config->set_slave_source (None
);
goto noroll;
}
goto noroll;
}
@@
-540,9
+540,9
@@
Session::follow_slave (jack_nframes_t nframes, jack_nframes_t offset)
Location* al = _locations.auto_loop_location();
Location* al = _locations.auto_loop_location();
- if (al &&
auto
_loop && (slave_transport_frame < al->start() || slave_transport_frame > al->end())) {
+ if (al &&
play
_loop && (slave_transport_frame < al->start() || slave_transport_frame > al->end())) {
// cancel looping
// cancel looping
- request_
auto
_loop(false);
+ request_
play
_loop(false);
}
if (slave_transport_frame != _transport_frame) {
}
if (slave_transport_frame != _transport_frame) {
@@
-569,7
+569,7
@@
Session::follow_slave (jack_nframes_t nframes, jack_nframes_t offset)
slave_state = Running;
bool ok = true;
slave_state = Running;
bool ok = true;
-
jack_
nframes_t frame_delta = slave_transport_frame - _transport_frame;
+ nframes_t frame_delta = slave_transport_frame - _transport_frame;
boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
@@
-591,7
+591,7
@@
Session::follow_slave (jack_nframes_t nframes, jack_nframes_t offset)
/* XXX what? */
}
/* XXX what? */
}
- memset (delta_accumulator, 0, sizeof (
jack_
nframes_t) * delta_accumulator_size);
+ memset (delta_accumulator, 0, sizeof (nframes_t) * delta_accumulator_size);
average_slave_delta = 0;
this_delta = 0;
}
average_slave_delta = 0;
this_delta = 0;
}
@@
-614,7
+614,7
@@
Session::follow_slave (jack_nframes_t nframes, jack_nframes_t offset)
// << " tf = " << _transport_frame
// << endl;
// << " tf = " << _transport_frame
// << endl;
- if (
_slave_type
== JACK) {
+ if (
Config->get_slave_source()
== JACK) {
last_stop_frame = _transport_frame;
}
last_stop_frame = _transport_frame;
}
@@
-662,7
+662,7
@@
Session::follow_slave (jack_nframes_t nframes, jack_nframes_t offset)
request_transport_speed (adjusted_speed);
#if 1
request_transport_speed (adjusted_speed);
#if 1
- if ((
jack_
nframes_t) average_slave_delta > _slave->resolution()) {
+ if ((nframes_t) average_slave_delta > _slave->resolution()) {
// cerr << "not locked\n";
goto silent_motion;
}
// cerr << "not locked\n";
goto silent_motion;
}
@@
-701,7
+701,7
@@
Session::follow_slave (jack_nframes_t nframes, jack_nframes_t offset)
increment_transport_position (frames_moved);
}
increment_transport_position (frames_moved);
}
-
jack_
nframes_t stop_limit;
+ nframes_t stop_limit;
if (actively_recording()) {
stop_limit = max_frames;
if (actively_recording()) {
stop_limit = max_frames;
@@
-723,12
+723,12
@@
Session::follow_slave (jack_nframes_t nframes, jack_nframes_t offset)
}
void
}
void
-Session::process_without_events (
jack_
nframes_t nframes)
+Session::process_without_events (nframes_t nframes)
{
bool session_needs_butler = false;
{
bool session_needs_butler = false;
-
jack_
nframes_t stop_limit;
+ nframes_t stop_limit;
long frames_moved;
long frames_moved;
-
jack_
nframes_t offset = 0;
+ nframes_t offset = 0;
{
if (post_transport_work & (PostTransportLocate|PostTransportStop)) {
{
if (post_transport_work & (PostTransportLocate|PostTransportStop)) {
@@
-784,7
+784,7
@@
Session::process_without_events (jack_nframes_t nframes)
} else {
increment_transport_position (frames_moved);
}
} else {
increment_transport_position (frames_moved);
}
-
+
maybe_stop (stop_limit);
check_declick_out ();
maybe_stop (stop_limit);
check_declick_out ();
@@
-794,7
+794,7
@@
Session::process_without_events (jack_nframes_t nframes)
summon_butler ();
}
summon_butler ();
}
- if (!_engine.freewheeling() && send_mtc) {
+ if (!_engine.freewheeling() && se
ssion_se
nd_mtc) {
send_midi_time_code_in_another_thread ();
}
send_midi_time_code_in_another_thread ();
}
@@
-802,7
+802,7
@@
Session::process_without_events (jack_nframes_t nframes)
}
void
}
void
-Session::process_audition (
jack_
nframes_t nframes)
+Session::process_audition (nframes_t nframes)
{
Event* ev;
boost::shared_ptr<RouteList> r = routes.reader ();
{
Event* ev;
boost::shared_ptr<RouteList> r = routes.reader ();
@@
-842,9
+842,9
@@
Session::process_audition (jack_nframes_t nframes)
}
bool
}
bool
-Session::maybe_sync_start (
jack_nframes_t& nframes, jack_
nframes_t& offset)
+Session::maybe_sync_start (
nframes_t& nframes,
nframes_t& offset)
{
{
-
jack_
nframes_t sync_offset;
+ nframes_t sync_offset;
if (!waiting_for_sync_offset) {
return false;
if (!waiting_for_sync_offset) {
return false;