summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc4
-rw-r--r--gtk2_ardour/audio_clock.cc2
-rw-r--r--gtk2_ardour/editor.cc2
-rw-r--r--gtk2_ardour/editor_drag.cc4
-rw-r--r--gtk2_ardour/editor_markers.cc18
-rw-r--r--gtk2_ardour/editor_mouse.cc4
-rw-r--r--gtk2_ardour/editor_ops.cc24
-rw-r--r--gtk2_ardour/editor_summary.cc2
-rw-r--r--gtk2_ardour/mini_timeline.cc6
9 files changed, 33 insertions, 33 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 83609a6d70..c604d0c508 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1611,7 +1611,7 @@ ARDOUR_UI::transport_goto_wallclock ()
samples += tmnow.tm_min * (60 * sample_rate);
samples += tmnow.tm_sec * sample_rate;
- _session->request_locate (samples, _session->transport_rolling ());
+ _session->request_locate (samples, DoTheRightThing);
/* force displayed area in editor to start no matter
what "follow playhead" setting is.
@@ -1829,7 +1829,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
}
if (_session->get_play_loop() && Config->get_loop_is_mode()) {
- _session->request_locate (_session->locations()->auto_loop_location()->start(), true);
+ _session->request_locate (_session->locations()->auto_loop_location()->start(), MustRoll);
} else {
if (UIConfiguration::instance().get_follow_edits()) {
list<AudioRange>& range = editor->get_selection().time;
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 8556405a51..690b2ffd56 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -2184,7 +2184,7 @@ AudioClock::locate ()
return;
}
- _session->request_locate (current_time(), _session->transport_rolling ());
+ _session->request_locate (current_time(), DoTheRightThing);
}
void
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 6e806b9c94..ca2b73d0a8 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1131,7 +1131,7 @@ Editor::control_scroll (float fraction)
bool
Editor::deferred_control_scroll (samplepos_t /*target*/)
{
- _session->request_locate (*_control_scroll_target, _session->transport_rolling());
+ _session->request_locate (*_control_scroll_target, DoTheRightThing);
/* reset for next stream */
_control_scroll_target = boost::none;
_dragging_playhead = false;
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 57d8b08cea..a2c43abeda 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -4104,7 +4104,7 @@ CursorDrag::finished (GdkEvent* event, bool movement_occurred)
Session* s = _editor->session ();
if (s) {
- s->request_locate (_editor->playhead_cursor->current_sample (), _was_rolling);
+ s->request_locate (_editor->playhead_cursor->current_sample (), _was_rolling ? MustRoll : MustStop);
_editor->_pending_locate_request = true;
s->request_resume_timecode_transmission ();
}
@@ -6002,7 +6002,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred)
/* didn't drag, so just locate */
- _editor->session()->request_locate (grab_sample(), _editor->session()->transport_rolling());
+ _editor->session()->request_locate (grab_sample(), DoTheRightThing);
} else if (_operation == CreateCDMarker) {
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 99a538e60b..d125536ac1 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1179,15 +1179,15 @@ Editor::marker_menu_play_from ()
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
- _session->request_locate (l->start(), true);
+ _session->request_locate (l->start(), MustRoll);
}
else {
//_session->request_bounded_roll (l->start(), l->end());
if (is_start) {
- _session->request_locate (l->start(), true);
+ _session->request_locate (l->start(), MustRoll);
} else {
- _session->request_locate (l->end(), true);
+ _session->request_locate (l->end(), MustRoll);
}
}
}
@@ -1209,13 +1209,13 @@ Editor::marker_menu_set_playhead ()
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
- _session->request_locate (l->start(), false);
+ _session->request_locate (l->start(), MustStop);
}
else {
if (is_start) {
- _session->request_locate (l->start(), false);
+ _session->request_locate (l->start(), MustStop);
} else {
- _session->request_locate (l->end(), false);
+ _session->request_locate (l->end(), MustStop);
}
}
}
@@ -1330,7 +1330,7 @@ Editor::marker_menu_play_range ()
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
- _session->request_locate (l->start(), true);
+ _session->request_locate (l->start(), MustRoll);
}
else {
_session->request_bounded_roll (l->start(), l->end());
@@ -1356,7 +1356,7 @@ Editor::marker_menu_loop_range ()
if (l != transport_loop_location()) {
set_loop_range (l->start(), l->end(), _("loop range from marker"));
}
- _session->request_locate (l->start(), true);
+ _session->request_locate (l->start(), MustRoll);
_session->request_play_loop (true);
}
}
@@ -1768,7 +1768,7 @@ Editor::goto_nth_marker (int n)
for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) {
if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_session_range()) {
if (n == 0) {
- _session->request_locate ((*i)->start(), _session->transport_rolling());
+ _session->request_locate ((*i)->start(), DoTheRightThing);
break;
}
--n;
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 22476d5d62..7c17228313 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1376,7 +1376,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
MusicSample where (canvas_event_sample (event), 0);
snap_to (where);
- _session->request_locate (where.sample, false);
+ _session->request_locate (where.sample, MustStop);
}
switch (event->button.button) {
@@ -2062,7 +2062,7 @@ Editor::scrub (samplepos_t sample, double current_x)
if (scrubbing_direction == 0) {
/* first move */
- _session->request_locate (sample, false);
+ _session->request_locate (sample, MustStop);
_session->request_transport_speed (0.1);
scrubbing_direction = 1;
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 195d4d1643..050809dfe3 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1351,7 +1351,7 @@ Editor::cursor_align (bool playhead_to_edit)
return;
}
- _session->request_locate (selection->markers.front()->position(), _session->transport_rolling());
+ _session->request_locate (selection->markers.front()->position(), DoTheRightThing);
} else {
const int32_t divisions = get_grid_music_divisions (0);
@@ -2445,7 +2445,7 @@ Editor::jump_forward_to_mark ()
return;
}
- _session->request_locate (pos, _session->transport_rolling());
+ _session->request_locate (pos, DoTheRightThing);
}
void
@@ -2469,7 +2469,7 @@ Editor::jump_backward_to_mark ()
return;
}
- _session->request_locate (pos, _session->transport_rolling());
+ _session->request_locate (pos, DoTheRightThing);
}
void
@@ -2640,13 +2640,13 @@ Editor::transition_to_rolling (bool fwd)
void
Editor::play_from_start ()
{
- _session->request_locate (_session->current_start_sample(), true);
+ _session->request_locate (_session->current_start_sample(), MustRoll);
}
void
Editor::play_from_edit_point ()
{
- _session->request_locate (get_preferred_edit_position(), true);
+ _session->request_locate (get_preferred_edit_position(), MustRoll);
}
void
@@ -2658,7 +2658,7 @@ Editor::play_from_edit_point_and_return ()
start_sample = get_preferred_edit_position (EDIT_IGNORE_PHEAD);
if (_session->transport_rolling()) {
- _session->request_locate (start_sample, false);
+ _session->request_locate (start_sample, MustStop);
return;
}
@@ -2739,7 +2739,7 @@ Editor::play_with_preroll ()
} else {
start = 0;
}
- _session->request_locate (start, true);
+ _session->request_locate (start, MustRoll);
_session->set_requested_return_sample (ph); //force auto-return to return to playhead location, without the preroll
}
}
@@ -2781,7 +2781,7 @@ Editor::loop_location (Location& location)
tll->set (location.start(), location.end());
// enable looping, reposition and start rolling
- _session->request_locate (tll->start(), true);
+ _session->request_locate (tll->start(), MustRoll);
_session->request_play_loop (true);
}
}
@@ -6520,7 +6520,7 @@ void
Editor::set_playhead_cursor ()
{
if (entered_marker) {
- _session->request_locate (entered_marker->position(), _session->transport_rolling());
+ _session->request_locate (entered_marker->position(), DoTheRightThing);
} else {
MusicSample where (0, 0);
bool ignored;
@@ -6532,7 +6532,7 @@ Editor::set_playhead_cursor ()
snap_to (where);
if (_session) {
- _session->request_locate (where.sample, _session->transport_rolling());
+ _session->request_locate (where.sample, DoTheRightThing);
}
}
@@ -6639,7 +6639,7 @@ Editor::set_loop_from_region (bool play)
set_loop_range (start, end, _("set loop range from region"));
if (play) {
- _session->request_locate (start, true);
+ _session->request_locate (start, MustRoll);
_session->request_play_loop (true);
}
}
@@ -7525,7 +7525,7 @@ Editor::playhead_backward_to_grid ()
}
}
- _session->request_locate (pos.sample, _session->transport_rolling());
+ _session->request_locate (pos.sample, DoTheRightThing);
}
/* keep PH visible in window */
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index 4bb53fb88b..4a8598d59c 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -437,7 +437,7 @@ EditorSummary::on_key_press_event (GdkEventKey* key)
if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
if (_session) {
get_pointer (x, y);
- _session->request_locate (_start + (samplepos_t) x / _x_scale, _session->transport_rolling());
+ _session->request_locate (_start + (samplepos_t) x / _x_scale, DoTheRightThing);
return true;
}
}
diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc
index cbda9d052d..bd8274affd 100644
--- a/gtk2_ardour/mini_timeline.cc
+++ b/gtk2_ardour/mini_timeline.cc
@@ -728,7 +728,7 @@ MiniTimeline::on_button_release_event (GdkEventButton *ev)
if (ev->y <= PADDING + _marker_height) {
for (JumpList::const_iterator i = _jumplist.begin (); i != _jumplist.end(); ++i) {
if (i->left <= ev->x && ev->x <= i->right) {
- _session->request_locate (i->to, _session->transport_rolling ());
+ _session->request_locate (i->to, DoTheRightThing);
return true;
}
}
@@ -736,7 +736,7 @@ MiniTimeline::on_button_release_event (GdkEventButton *ev)
if (ev->button == 1) {
samplepos_t when = _last_update_sample + (ev->x - get_width() * .5) / _px_per_sample;
- _session->request_locate (std::max ((samplepos_t)0, when), _session->transport_rolling ());
+ _session->request_locate (std::max ((samplepos_t)0, when), DoTheRightThing);
}
return true;
@@ -818,6 +818,6 @@ MiniTimeline::on_scroll_event (GdkEventScroll *ev)
return true;
break;
}
- _session->request_locate (std::max ((samplepos_t)0, when), _session->transport_rolling ());
+ _session->request_locate (std::max ((samplepos_t)0, when), DoTheRightThing);
return true;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 11:31:14 +0000