projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore negative value locates and MMC locate commands
[ardour.git]
/
libs
/
ardour
/
session_process.cc
diff --git
a/libs/ardour/session_process.cc
b/libs/ardour/session_process.cc
index 067a91da48f45449933c1960cdc3482fe7681e3e..497fbd4d2e1f437f32484f586300cc58e6f95a28 100644
(file)
--- a/
libs/ardour/session_process.cc
+++ b/
libs/ardour/session_process.cc
@@
-35,18
+35,16
@@
#include "ardour/graph.h"
#include "ardour/port.h"
#include "ardour/process_thread.h"
#include "ardour/graph.h"
#include "ardour/port.h"
#include "ardour/process_thread.h"
+#include "ardour/scene_changer.h"
#include "ardour/session.h"
#include "ardour/slave.h"
#include "ardour/ticker.h"
#include "ardour/types.h"
#include "ardour/session.h"
#include "ardour/slave.h"
#include "ardour/ticker.h"
#include "ardour/types.h"
-#include "midi++/manager.h"
#include "midi++/mmc.h"
#include "i18n.h"
#include "midi++/mmc.h"
#include "i18n.h"
-#include <xmmintrin.h>
-
using namespace ARDOUR;
using namespace PBD;
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace std;
@@
-86,9
+84,12
@@
Session::process (pframes_t nframes)
*/
try {
*/
try {
- if (!_
engine.freewheeling() && Config->get_send_midi_clock() && transport_speed() == 1.0f
&& midi_clock->has_midi_port()) {
- midi_clock->tick (transport_at_start);
+ if (!_
silent && !_engine.freewheeling() && Config->get_send_midi_clock() && (transport_speed() == 1.0f || transport_speed() == 0.0f)
&& midi_clock->has_midi_port()) {
+ midi_clock->tick (transport_at_start
, nframes
);
}
}
+
+ _scene_changer->run (transport_at_start, transport_at_start + nframes);
+
} catch (...) {
/* don't bother with a message */
}
} catch (...) {
/* don't bother with a message */
}
@@
-153,11
+154,6
@@
Session::process_routes (pframes_t nframes, bool& need_butler)
int declick = get_transport_declick_required();
boost::shared_ptr<RouteList> r = routes.reader ();
int declick = get_transport_declick_required();
boost::shared_ptr<RouteList> r = routes.reader ();
- if (transport_sub_state & StopPendingCapture) {
- /* force a declick out */
- declick = -1;
- }
-
const framepos_t start_frame = _transport_frame;
const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed);
const framepos_t start_frame = _transport_frame;
const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed);
@@
-327,7
+323,7
@@
Session::process_with_events (pframes_t nframes)
* and prepare for rolling)
*/
if (_send_timecode_update) {
* and prepare for rolling)
*/
if (_send_timecode_update) {
- send_full_time_code (_transport_frame);
+ send_full_time_code (_transport_frame
, nframes
);
}
if (!process_can_proceed()) {
}
if (!process_can_proceed()) {
@@
-424,7
+420,9
@@
Session::process_with_events (pframes_t nframes)
check_declick_out ();
}
check_declick_out ();
}
- _engine.split_cycle (this_nframes);
+ if (nframes > 0) {
+ _engine.split_cycle (this_nframes);
+ }
/* now handle this event and all others scheduled for the same time */
/* now handle this event and all others scheduled for the same time */
@@
-578,7
+576,7
@@
Session::follow_slave (pframes_t nframes)
#endif
if (_slave->give_slave_full_control_over_transport_speed()) {
#endif
if (_slave->give_slave_full_control_over_transport_speed()) {
- set_transport_speed (slave_speed, false, false);
+ set_transport_speed (slave_speed,
0,
false, false);
//std::cout << "set speed = " << slave_speed << "\n";
} else {
float adjusted_speed = slave_speed + (1.5 * (delta / float(_current_frame_rate)));
//std::cout << "set speed = " << slave_speed << "\n";
} else {
float adjusted_speed = slave_speed + (1.5 * (delta / float(_current_frame_rate)));
@@
-876,7
+874,7
@@
Session::process_audition (pframes_t nframes)
/* if using a monitor section, run it because otherwise we don't hear anything */
/* if using a monitor section, run it because otherwise we don't hear anything */
- if (auditioner->needs_monitor()) {
+ if (
_monitor_out &&
auditioner->needs_monitor()) {
_monitor_out->monitor_run (_transport_frame, _transport_frame + nframes, nframes, false);
}
_monitor_out->monitor_run (_transport_frame, _transport_frame + nframes, nframes, false);
}
@@
-1011,7
+1009,7
@@
Session::process_event (SessionEvent* ev)
switch (ev->type) {
case SessionEvent::SetLoop:
switch (ev->type) {
case SessionEvent::SetLoop:
- set_play_loop (ev->yes_or_no);
+ set_play_loop (ev->yes_or_no
, ev->speed
);
break;
case SessionEvent::AutoLoop:
break;
case SessionEvent::AutoLoop:
@@
-1058,6
+1056,15
@@
Session::process_event (SessionEvent* ev)
_send_timecode_update = true;
break;
_send_timecode_update = true;
break;
+ case SessionEvent::Skip:
+ if (Config->get_skip_playback()) {
+ start_locate (ev->target_frame, true, true, false);
+ _send_timecode_update = true;
+ }
+ remove = false;
+ del = false;
+ break;
+
case SessionEvent::LocateRollLocate:
// locate is handled by ::request_roll_at_and_return()
_requested_return_frame = ev->target_frame;
case SessionEvent::LocateRollLocate:
// locate is handled by ::request_roll_at_and_return()
_requested_return_frame = ev->target_frame;
@@
-1066,7
+1073,7
@@
Session::process_event (SessionEvent* ev)
case SessionEvent::SetTransportSpeed:
case SessionEvent::SetTransportSpeed:
- set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no, ev->third_yes_or_no);
+ set_transport_speed (ev->speed, ev->
target_frame, ev->
yes_or_no, ev->second_yes_or_no, ev->third_yes_or_no);
break;
case SessionEvent::PunchIn:
break;
case SessionEvent::PunchIn:
@@
-1089,8
+1096,8
@@
Session::process_event (SessionEvent* ev)
case SessionEvent::StopOnce:
if (!non_realtime_work_pending()) {
case SessionEvent::StopOnce:
if (!non_realtime_work_pending()) {
- stop_transport (ev->yes_or_no);
_clear_event_type (SessionEvent::StopOnce);
_clear_event_type (SessionEvent::StopOnce);
+ stop_transport (ev->yes_or_no);
}
remove = false;
del = false;
}
remove = false;
del = false;
@@
-1139,6
+1146,10
@@
Session::process_event (SessionEvent* ev)
set_play_range (ev->audio_range, (ev->speed == 1.0f));
break;
set_play_range (ev->audio_range, (ev->speed == 1.0f));
break;
+ case SessionEvent::CancelPlayAudioRange:
+ unset_play_range();
+ break;
+
case SessionEvent::RealTimeOperation:
process_rtop (ev);
del = false; // other side of RT request needs to clean up
case SessionEvent::RealTimeOperation:
process_rtop (ev);
del = false; // other side of RT request needs to clean up