#include "control_protocol/control_protocol.h"
+#include "editor_drag.h"
#include "editor.h"
#include "actions.h"
#include "audio_time_axis.h"
#include "editor_regions.h"
#include "editor_cursors.h"
#include "midi_region_view.h"
+#include "sfdb_ui.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
return;
}
- if (!clicked_routeview) {
- return;
+ RouteGroup* group = NULL;
+ if (clicked_routeview) {
+ group = clicked_routeview->route()->route_group();
}
- bool had_tracks = !selection->tracks.empty();
- RouteGroup* group = clicked_routeview->route()->route_group();
- RouteGroup& arg (_session->all_route_group());
-
switch (op) {
case Selection::Toggle:
if (selection->selected (clicked_axisview)) {
- if (arg.is_select() && arg.is_active()) {
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- selection->remove(*i);
- }
- } else if (group && group->is_active()) {
+ if (group && group->is_active()) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- if ((*i)->route_group() == group)
+ if ((*i)->route_group() == group) {
selection->remove(*i);
+ }
}
} else {
selection->remove (clicked_axisview);
}
} else {
- if (arg.is_select() && arg.is_active()) {
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- selection->add(*i);
- }
- } else if (group && group->is_active()) {
+ if (group && group->is_active()) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- if ( (*i)->route_group() == group)
+ if ((*i)->route_group() == group) {
selection->add(*i);
+ }
}
} else {
selection->add (clicked_axisview);
break;
case Selection::Add:
- if (!had_tracks && arg.is_select() && arg.is_active()) {
- /* nothing was selected already, and all group is active etc. so use
- all tracks.
- */
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- selection->add(*i);
- }
- } else if (group && group->is_active()) {
+ if (group && group->is_active()) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- if ((*i)->route_group() == group)
+ if ((*i)->route_group() == group) {
selection->add(*i);
+ }
}
} else {
selection->add (clicked_axisview);
case Selection::Set:
selection->clear();
- if (!had_tracks && arg.is_select() && arg.is_active()) {
- /* nothing was selected already, and all group is active etc. so use
- all tracks.
- */
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- selection->add(*i);
- }
- } else if (group && group->is_active()) {
+ if (group && group->is_active()) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
- if ((*i)->route_group() == group)
+ if ((*i)->route_group() == group) {
selection->add(*i);
+ }
}
} else {
selection->set (clicked_axisview);
void
Editor::set_selected_track (TimeAxisView& view, Selection::Operation op, bool no_remove)
{
+ begin_reversible_selection_op (X_("Set Selected Track"));
+
switch (op) {
case Selection::Toggle:
if (selection->selected (&view)) {
extend_selection_to_track (view);
break;
}
+
+ commit_reversible_selection_op ();
}
void
return false;
}
+ bool ret = false;
+
switch (op) {
case Selection::Set:
- if (press) {
+ if (!selection->selected (clicked_control_point)) {
selection->set (clicked_control_point);
+ ret = true;
+ } else {
+ /* clicked on an already selected point */
+ if (press) {
+ break;
+ } else {
+ if (selection->points.size() > 1) {
+ selection->set (clicked_control_point);
+ ret = true;
+ }
+ }
}
break;
+
case Selection::Add:
if (press) {
selection->add (clicked_control_point);
+ ret = true;
}
break;
case Selection::Toggle:
+
/* This is a bit of a hack; if we Primary-Click-Drag a control
point (for push drag) we want the point we clicked on to be
selected, otherwise we end up confusingly dragging an
*/
selection->toggle (clicked_control_point);
_control_point_toggled_on_press = true;
+ ret = true;
} else if (!press && !_control_point_toggled_on_press) {
/* This is the release, and the point wasn't toggled on the press, so do it now */
selection->toggle (clicked_control_point);
+ ret = true;
} else {
/* Reset our flag */
_control_point_toggled_on_press = false;
break;
}
- return true;
+ return ret;
}
void
Editor::get_onscreen_tracks (TrackViewList& tvl)
{
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- if ((*i)->y_position() < _canvas_height) {
+ if ((*i)->y_position() < _visible_canvas_height) {
tvl.push_back (*i);
}
}
RouteTimeAxisView* v = dynamic_cast<RouteTimeAxisView*> (*i);
if (v && v->route()->route_group() == group) {
-
+
boost::shared_ptr<Track> t = v->track();
if (t) {
if (playlists.insert (t->playlist()).second) {
if (press) {
if (selection->selected (clicked_routeview)) {
- get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
+ get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
} else {
all_equivalent_regions.push_back (clicked_regionview);
}
case Selection::Set:
if (!selection->selected (clicked_regionview)) {
- get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
+ get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
selection->set (all_equivalent_regions);
commit = true;
} else {
- /* no commit necessary: clicked on an already selected region */
- goto out;
+ /* clicked on an already selected region */
+ if (press)
+ goto out;
+ else {
+ if (selection->regions.size() > 1) {
+ /* collapse region selection down to just this one region (and its equivalents) */
+ get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
+ selection->set(all_equivalent_regions);
+ commit = true;
+ }
+ }
}
break;
RouteTimeAxisView* closest = 0;
int distance = INT_MAX;
- int key = rtv->route()->order_key ();
+ int key = rtv->route()->presentation_info().order ();
for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
if (result.second) {
/* newly added to already_in_selection */
- int d = artv->route()->order_key ();
+ int d = artv->route()->presentation_info().order ();
d -= key;
/* now add all tracks between that one and this one */
- int okey = closest->route()->order_key ();
+ int okey = closest->route()->presentation_info().order ();
if (okey > key) {
swap (okey, key);
RouteTimeAxisView* artv = dynamic_cast<RouteTimeAxisView*>(*x);
if (artv && artv != rtv) {
- int k = artv->route()->order_key ();
+ int k = artv->route()->presentation_info().order ();
if (k >= okey && k <= key) {
return;
}
- begin_reversible_command (_("set selected regions"));
+ begin_reversible_selection_op (X_("set selected regions"));
switch (op) {
case Selection::Toggle:
break;
}
- commit_reversible_command () ;
+ commit_reversible_selection_op () ;
}
bool
return true;
}
- begin_reversible_command (_("set selected regions"));
+ begin_reversible_selection_op (X_("set selected regions"));
selection->set (rv);
- commit_reversible_command () ;
+ commit_reversible_selection_op () ;
return true;
}
}
RouteNotificationListPtr routes (new RouteNotificationList);
+ StripableNotificationListPtr stripables (new StripableNotificationList);
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
if (rtav) {
routes->push_back (rtav->route());
+ stripables->push_back (rtav->route());
}
}
}
ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
/* notify control protocols */
-
- ControlProtocol::TrackSelectionChanged (routes);
+
+ ControlProtocol::StripableSelectionChanged (stripables);
+
+ if (sfbrowser && _session && !_session->deletion_in_progress()) {
+ uint32_t audio_track_cnt = 0;
+ uint32_t midi_track_cnt = 0;
+
+ for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) {
+ AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*x);
+
+ if (atv) {
+ if (atv->is_audio_track()) {
+ audio_track_cnt++;
+ }
+
+ } else {
+ MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(*x);
+
+ if (mtv) {
+ if (mtv->is_midi_track()) {
+ midi_track_cnt++;
+ }
+ }
+ }
+ }
+
+ sfbrowser->reset (audio_track_cnt, midi_track_cnt);
+ }
}
void
Editor::time_selection_changed ()
{
- if (Profile->get_sae()) {
- return;
- }
+ /* XXX this is superficially inefficient. Hide the selection in all
+ * tracks, then show it in all selected tracks.
+ *
+ * However, if you investigate what this actually does, it isn't
+ * anywhere nearly as bad as it may appear. Remember: nothing is
+ * redrawn or even recomputed during these two loops - that only
+ * happens when we next render ...
+ */
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
(*i)->hide_selection ();
ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true);
}
- if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->time.empty()) {
- _session->request_locate (selection->time.start());
+ /* propagate into backend, but only when there is no drag or we are at
+ * the end of a drag, otherwise this is too expensive (could case a
+ * locate per mouse motion event.
+ */
+
+ if (_session && !_drags->active()) {
+ if (selection->time.length() != 0) {
+ _session->set_range_selection (selection->time.start(), selection->time.end_frame());
+ } else {
+ _session->clear_range_selection ();
+ }
}
}
void
Editor::sensitize_the_right_region_actions ()
{
-
RegionSelection rs = get_regions_from_selection_and_entered ();
sensitize_all_region_actions (!rs.empty ());
bool have_inactive_fade_out = false;
bool have_active_fade_in = false;
bool have_active_fade_out = false;
+ bool have_transients = false;
for (list<RegionView*>::const_iterator i = rs.begin(); i != rs.end(); ++i) {
have_not_at_natural_position = true;
}
+ if (r->has_transients ()){
+ have_transients = true;
+ }
+
if (ar) {
if (ar->envelope_active()) {
have_envelope_active = true;
}
}
+ _region_actions->get_action("split-region-at-transients")->set_sensitive (have_transients);
+
if (rs.size() > 1) {
_region_actions->get_action("show-region-list-editor")->set_sensitive (false);
_region_actions->get_action("show-region-properties")->set_sensitive (false);
editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (false);
_region_actions->get_action("show-region-list-editor")->set_sensitive (false);
_region_actions->get_action("quantize-region")->set_sensitive (false);
+ _region_actions->get_action("legatize-region")->set_sensitive (false);
+ _region_actions->get_action("remove-overlap")->set_sensitive (false);
+ _region_actions->get_action("transform-region")->set_sensitive (false);
_region_actions->get_action("fork-region")->set_sensitive (false);
_region_actions->get_action("insert-patch-change-context")->set_sensitive (false);
_region_actions->get_action("insert-patch-change")->set_sensitive (false);
} else {
- _region_actions->get_action("analyze-region")->set_sensitive (false);
+ _region_actions->get_action("loudness-analyze-region")->set_sensitive (false);
+ _region_actions->get_action("spectral-analyze-region")->set_sensitive (false);
_region_actions->get_action("reset-region-gain-envelopes")->set_sensitive (false);
_region_actions->get_action("toggle-region-gain-envelope-active")->set_sensitive (false);
_region_actions->get_action("pitch-shift-region")->set_sensitive (false);
+ _region_actions->get_action("strip-region-silence")->set_sensitive (false);
+ _region_actions->get_action("show-rhythm-ferret")->set_sensitive (false);
}
if (have_active_fade_out && have_inactive_fade_out) {
// a->set_inconsistent ();
}
-
+
bool const have_active_fade = have_active_fade_in || have_active_fade_out;
bool const have_inactive_fade = have_inactive_fade_in || have_inactive_fade_out;
if (have_active_fade && have_inactive_fade) {
// a->set_inconsistent ();
}
-
+
_ignore_region_action = false;
_all_region_actions_sensitized = false;
_regions->block_change_connection (false);
editor_regions_selection_changed_connection.block(false);
- if (!_all_region_actions_sensitized) {
- /* This selection change might have changed what region actions
- are allowed, so sensitize them all in case a key is pressed.
- */
- sensitize_all_region_actions (true);
+ if (selection->regions.empty()) {
+ sensitize_all_region_actions (false);
+ } else {
+ if (!_all_region_actions_sensitized) {
+ /* This selection change might have changed what region actions
+ are allowed, so sensitize them all in case a key is pressed.
+ */
+ sensitize_all_region_actions (true);
+ }
}
if (_session && !_session->transport_rolling() && !selection->regions.empty()) {
maybe_locate_with_edit_preroll (selection->regions.start());
}
+
+ /* propagate into backend */
+
+ if (_session) {
+ if (!selection->regions.empty()) {
+ _session->set_object_selection (selection->regions.start(), selection->regions.end_frame());
+ } else {
+ _session->clear_object_selection ();
+ }
+ }
+
}
void
return;
}
+ begin_reversible_selection_op (X_("Select All in Track"));
+
clicked_routeview->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
switch (op) {
selection->add (touched);
break;
}
+
+ commit_reversible_selection_op ();
}
-void
+bool
Editor::select_all_internal_edit (Selection::Operation)
{
+ bool selected = false;
+
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
if (mrv) {
mrv->select_all_notes ();
+ selected = true;
}
}
+
+ MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(entered_regionview);
+ if (mrv) {
+ mrv->select_all_notes ();
+ selected = true;
+ }
+
+ return selected;
}
void
-Editor::select_all (Selection::Operation op)
+Editor::select_all_objects (Selection::Operation op)
{
list<Selectable *> touched;
- TrackViewList ts;
-
- if (selection->tracks.empty()) {
- if (entered_track) {
- ts.push_back (entered_track);
- } else {
- ts = track_views;
- }
- } else {
- ts = selection->tracks;
- }
-
- if (_internal_editing) {
-
- bool midi_selected = false;
-
- for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
- if ((*iter)->hidden()) {
- continue;
- }
-
- RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*iter);
-
- if (rtav && rtav->is_midi_track()) {
- midi_selected = true;
- break;
- }
- }
+ TrackViewList ts = track_views;
- if (midi_selected) {
- select_all_internal_edit (op);
- return;
- }
+ if (internal_editing() && select_all_internal_edit(op)) {
+ return; // Selected notes
}
for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
continue;
}
(*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
+ selection->add (*iter);
}
- begin_reversible_command (_("select all"));
+
+ begin_reversible_selection_op (X_("select all"));
switch (op) {
case Selection::Add:
selection->add (touched);
/* meaningless, because we're selecting everything */
break;
}
- commit_reversible_command ();
+ commit_reversible_selection_op ();
}
void
return;
}
+ begin_reversible_selection_op (X_("Invert Selection in Track"));
clicked_routeview->get_inverted_selectables (*selection, touched);
selection->set (touched);
+ commit_reversible_selection_op ();
}
void
{
list<Selectable *> touched;
- if (_internal_editing) {
+ if (internal_editing()) {
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
if (mrv) {
(*iter)->get_inverted_selectables (*selection, touched);
}
+ begin_reversible_selection_op (X_("Invert Selection"));
selection->set (touched);
+ commit_reversible_selection_op ();
}
/** @param start Start time in session frames.
}
if (found.empty()) {
+ selection->clear_objects();
+ selection->clear_time ();
return;
}
if (preserve_if_selected && op != Selection::Toggle) {
list<Selectable*>::iterator i = found.begin();
- while (i != found.end() && (*i)->get_selected()) {
+ while (i != found.end() && (*i)->selected()) {
++i;
}
}
}
- begin_reversible_command (_("select all within"));
+ begin_reversible_selection_op (X_("select all within"));
switch (op) {
case Selection::Add:
selection->add (found);
break;
}
- commit_reversible_command ();
+ commit_reversible_selection_op ();
}
void
return;
}
- selection->set (selection->regions.start(), selection->regions.end_frame());
- if (!Profile->get_sae()) {
- set_mouse_mode (Editing::MouseRange, false);
+ /* find all the tracks that have selected regions */
+
+ set<TimeAxisView*> tracks;
+
+ for (RegionSelection::const_iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) {
+ tracks.insert (&(*r)->get_time_axis_view());
}
+
+ TrackViewList tvl;
+ tvl.insert (tvl.end(), tracks.begin(), tracks.end());
+
+ /* select range (this will clear the region selection) */
+
+ selection->set (selection->regions.start(), selection->regions.end_frame());
+
+ /* and select the tracks */
+
+ selection->set (tvl);
+
+ set_mouse_mode (Editing::MouseRange, false);
}
void
void
Editor::set_selection_from_range (Location& loc)
{
- begin_reversible_command (_("set selection from range"));
+ begin_reversible_selection_op (X_("set selection from range"));
selection->set (loc.start(), loc.end());
- commit_reversible_command ();
+ commit_reversible_selection_op ();
- if (!Profile->get_sae()) {
- set_mouse_mode (Editing::MouseRange, false);
- }
+ set_mouse_mode (Editing::MouseRange, false);
}
void
(*iter)->get_selectables (start, end - 1, 0, DBL_MAX, touched);
}
- begin_reversible_command (_("select all from range"));
+ begin_reversible_selection_op (X_("select all from range"));
selection->set (touched);
- commit_reversible_command ();
+ commit_reversible_selection_op ();
}
}
(*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched);
}
- begin_reversible_command (_("select all from punch"));
+ begin_reversible_selection_op (X_("select all from punch"));
selection->set (touched);
- commit_reversible_command ();
+ commit_reversible_selection_op ();
}
}
(*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched);
}
- begin_reversible_command (_("select all from loop"));
+ begin_reversible_selection_op (X_("select all from loop"));
selection->set (touched);
- commit_reversible_command ();
+ commit_reversible_selection_op ();
}
list<Selectable *> touched;
if (after) {
- start = cursor->current_frame;
+ start = cursor->current_frame();
end = _session->current_end_frame();
} else {
- if (cursor->current_frame > 0) {
+ if (cursor->current_frame() > 0) {
start = 0;
- end = cursor->current_frame - 1;
+ end = cursor->current_frame() - 1;
} else {
return;
}
}
- if (_internal_editing) {
+ if (internal_editing()) {
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
if (mrv) {
}
if (after) {
- begin_reversible_command (_("select all after cursor"));
+ begin_reversible_selection_op (X_("select all after cursor"));
} else {
- begin_reversible_command (_("select all before cursor"));
+ begin_reversible_selection_op (X_("select all before cursor"));
}
TrackViewList* ts;
(*iter)->get_selectables (start, end, 0, DBL_MAX, touched);
}
selection->set (touched);
- commit_reversible_command ();
+ commit_reversible_selection_op ();
}
void
-Editor::select_all_selectables_using_edit (bool after)
+Editor::select_all_selectables_using_edit (bool after, bool from_context_menu)
{
framepos_t start;
framepos_t end;
list<Selectable *> touched;
if (after) {
- start = get_preferred_edit_position();
+ start = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu);
end = _session->current_end_frame();
} else {
- if ((end = get_preferred_edit_position()) > 1) {
+ if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu)) > 1) {
start = 0;
end -= 1;
} else {
}
}
- if (_internal_editing) {
+ if (internal_editing()) {
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
mrv->select_range (start, end);
}
if (after) {
- begin_reversible_command (_("select all after edit"));
+ begin_reversible_selection_op (X_("select all after edit"));
} else {
- begin_reversible_command (_("select all before edit"));
+ begin_reversible_selection_op (X_("select all before edit"));
}
TrackViewList* ts;
(*iter)->get_selectables (start, end, 0, DBL_MAX, touched);
}
selection->set (touched);
- commit_reversible_command ();
+ commit_reversible_selection_op ();
}
void
-Editor::select_all_selectables_between (bool /*within*/)
+Editor::select_all_selectables_between (bool within)
{
framepos_t start;
framepos_t end;
return;
}
- if (_internal_editing) {
+ if (internal_editing()) {
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
mrv->select_range (start, end);
if ((*iter)->hidden()) {
continue;
}
- (*iter)->get_selectables (start, end, 0, DBL_MAX, touched);
+ (*iter)->get_selectables (start, end, 0, DBL_MAX, touched, within);
}
+ begin_reversible_selection_op (X_("Select all Selectables Between"));
selection->set (touched);
+ commit_reversible_selection_op ();
}
void
return;
}
+ begin_reversible_selection_op (X_("Select Range Between"));
set_mouse_mode (MouseRange);
selection->set (start, end);
+ commit_reversible_selection_op ();
}
bool
Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
{
- framepos_t m;
- bool ignored;
+// framepos_t m;
+// bool ignored;
/* if an explicit range exists, use it */
- if (!selection->time.empty()) {
+ if ( (mouse_mode == MouseRange || get_smart_mode() ) && !selection->time.empty()) {
/* we know that these are ordered */
start = selection->time.start();
end = selection->time.end_frame();
return true;
- }
-
- if (!mouse_frame (m, ignored)) {
- /* mouse is not in a canvas, try playhead+selected marker.
- this is probably most true when using menus.
- */
-
- if (selection->markers.empty()) {
- return false;
- }
-
- start = selection->markers.front()->position();
- end = _session->audible_frame();
-
} else {
-
- switch (_edit_point) {
- case EditAtPlayhead:
- if (selection->markers.empty()) {
- /* use mouse + playhead */
- start = m;
- end = _session->audible_frame();
- } else {
- /* use playhead + selected marker */
- start = _session->audible_frame();
- end = selection->markers.front()->position();
- }
- break;
-
- case EditAtMouse:
- /* use mouse + selected marker */
- if (selection->markers.empty()) {
- start = m;
- end = _session->audible_frame();
- } else {
- start = selection->markers.front()->position();
- end = m;
- }
- break;
-
- case EditAtSelectedMarker:
- /* use mouse + selected marker */
- if (selection->markers.empty()) {
-
- MessageDialog win (_("No edit range defined"),
- false,
- MESSAGE_INFO,
- BUTTONS_OK);
-
- win.set_secondary_text (
- _("the edit point is Selected Marker\nbut there is no selected marker."));
-
-
- win.set_default_response (RESPONSE_CLOSE);
- win.set_position (Gtk::WIN_POS_MOUSE);
- win.show_all();
-
- win.run ();
-
- return false; // NO RANGE
- }
- start = selection->markers.front()->position();
- end = m;
- break;
- }
- }
-
- if (start == end) {
+ start = 0;
+ end = 0;
return false;
}
- if (start > end) {
- swap (start, end);
- }
+// if (!mouse_frame (m, ignored)) {
+// /* mouse is not in a canvas, try playhead+selected marker.
+// this is probably most true when using menus.
+// */
+//
+// if (selection->markers.empty()) {
+// return false;
+// }
+
+// start = selection->markers.front()->position();
+// end = _session->audible_frame();
+
+// } else {
+
+// switch (_edit_point) {
+// case EditAtPlayhead:
+// if (selection->markers.empty()) {
+// /* use mouse + playhead */
+// start = m;
+// end = _session->audible_frame();
+// } else {
+// /* use playhead + selected marker */
+// start = _session->audible_frame();
+// end = selection->markers.front()->position();
+// }
+// break;
+
+// case EditAtMouse:
+// /* use mouse + selected marker */
+// if (selection->markers.empty()) {
+// start = m;
+// end = _session->audible_frame();
+// } else {
+// start = selection->markers.front()->position();
+// end = m;
+// }
+// break;
+
+// case EditAtSelectedMarker:
+// /* use mouse + selected marker */
+// if (selection->markers.empty()) {
+
+// MessageDialog win (_("No edit range defined"),
+// false,
+// MESSAGE_INFO,
+// BUTTONS_OK);
+
+// win.set_secondary_text (
+// _("the edit point is Selected Marker\nbut there is no selected marker."));
+
+
+// win.set_default_response (RESPONSE_CLOSE);
+// win.set_position (Gtk::WIN_POS_MOUSE);
+// win.show_all();
+
+// win.run ();
+
+// return false; // NO RANGE
+// }
+// start = selection->markers.front()->position();
+// end = m;
+// break;
+// }
+// }
+
+// if (start == end) {
+// return false;
+// }
+
+// if (start > end) {
+// swap (start, end);
+// }
/* turn range into one delimited by start...end,
not start...end-1
*/
- end++;
+// end++;
- return true;
+// return true;
}
void
Editor::deselect_all ()
{
+ begin_reversible_selection_op (X_("Deselect All"));
selection->clear ();
+ commit_reversible_selection_op ();
}
long
Editor::select_range (framepos_t s, framepos_t e)
{
+ begin_reversible_selection_op (X_("Select Range"));
selection->add (clicked_axisview);
selection->time.clear ();
- return selection->set (s, e);
+ long ret = selection->set (s, e);
+ commit_reversible_selection_op ();
+ return ret;
}
projects / ardour.git / blobdiff