Disabled/enabled with the shift key. no config stuff at all now.
Move existing (strange) trim feature to primary + tertiary modifiers.
<menuitem action='cycle-edit-point-with-marker'/>
</menu>
<menu name='SnapMode' action='SnapMode'>
- <menuitem action='snap-absolute'/>
- <menuitem action='snap-relative'/>
- <separator/>
<menuitem action='snap-off'/>
<menuitem action='snap-normal'/>
<menuitem action='snap-magnetic'/>
// This involves some cpp magic. --taybin
#define SNAPTYPE(a) /*empty*/
-#define SNAPDELTA(a) /*empty*/
#define SNAPMODE(a) /*empty*/
#define REGIONLISTSORTTYPE(a) /*empty*/
#define MOUSEMODE(a) /*empty*/
#undef SNAPTYPE
#define SNAPTYPE(a) /*empty*/
-
-// SNAPDELTA
-#undef SNAPDELTA
-#define SNAPDELTA(s) if (!strcmp(type, #s)) {return s;}
-SnapDelta
-str2snapdelta (const string & str) {
- const char* type = str.c_str();
- #include "editing_syms.h"
- return SnapAbsolute;
-}
-
-#undef SNAPDELTA
-#define SNAPDELTA(s) N_(#s),
-const char *snapdeltastrs[] = {
- #include "editing_syms.h"
- 0
-};
-#undef SNAPDELTA
-#define SNAPDELTA(a) /*empty*/
-
-
// SNAPMODE
#undef SNAPMODE
#define SNAPMODE(s) if (!strcmp(type, #s)) {return s;}
#define SNAPTYPE(a) /*empty*/
#define SNAPMODE(a) /*empty*/
-#define SNAPDELTA(a) /*empty*/
#define REGIONLISTSORTTYPE(a) /*empty*/
#define MOUSEMODE(a) /*empty*/
#define MIDIEDITMODE(a) /*empty*/
#undef SNAPMODE
#define SNAPMODE(a) /*empty*/
-// SNAPDELTA
-#undef SNAPDELTA
-#define SNAPDELTA(a) a,
-enum SnapDelta {
- #include "editing_syms.h"
-};
-extern const char *snapdeltastrs[];
-inline const char* enum2str(SnapDelta m) {return snapdeltastrs[m];}
-SnapDelta str2snapdelta(const std::string &);
-
-#undef SNAPDELTA
-#define SNAPDELTA(a) /*empty*/
-
// REGIONLISTSORTTYPE
#undef REGIONLISTSORTTYPE
#define REGIONLISTSORTTYPE(a) a,
SNAPMODE(SnapNormal)
SNAPMODE(SnapMagnetic)
-SNAPDELTA(SnapAbsolute)
-SNAPDELTA(SnapRelative)
-
REGIONLISTSORTTYPE(ByEndInFile)
REGIONLISTSORTTYPE(ByLength)
REGIONLISTSORTTYPE(ByName)
0
};
-static const gchar *_snap_delta_strings[] = {
- N_("Absolute"),
- N_("Relative"),
- 0
-};
-
static const gchar *_snap_mode_strings[] = {
N_("No Grid"),
N_("Grid"),
tempo_lines = 0;
snap_type_strings = I18N (_snap_type_strings);
- snap_delta_strings = I18N (_snap_delta_strings);
snap_mode_strings = I18N (_snap_mode_strings);
zoom_focus_strings = I18N (_zoom_focus_strings);
edit_mode_strings = I18N (_edit_mode_strings);
build_edit_mode_menu();
build_zoom_focus_menu();
build_track_count_menu();
- build_snap_delta_menu();
build_snap_mode_menu();
build_snap_type_menu();
build_edit_point_menu();
set_visible_track_count (_visible_track_count);
_snap_type = SnapToBeat;
set_snap_to (_snap_type);
- _snap_delta = SnapAbsolute;
- set_snap_delta (_snap_delta);
_snap_mode = SnapOff;
set_snap_mode (_snap_mode);
set_mouse_mode (MouseObject, true);
return _snap_type;
}
-SnapDelta
-Editor::snap_delta() const
-{
- return _snap_delta;
-}
-
SnapMode
Editor::snap_mode() const
{
SnapChanged (); /* EMIT SIGNAL */
}
-void
-Editor::set_snap_delta (SnapDelta delta)
-{
- string str = snap_delta_strings[(int)delta];
-
- _snap_delta = delta;
-
- if (str != snap_delta_selector.get_text ()) {
- snap_delta_selector.set_text (str);
- }
-
- instant_save ();
-}
-
void
Editor::set_snap_mode (SnapMode mode)
{
snap_type_selection_done ((SnapType) string_2_enum (prop->value(), _snap_type));
}
- if ((prop = node.property ("snap-delta"))) {
- snap_delta_selection_done((SnapDelta) string_2_enum (prop->value(), _snap_delta));
- }
-
if ((prop = node.property ("snap-mode"))) {
snap_mode_selection_done((SnapMode) string_2_enum (prop->value(), _snap_mode));
}
snprintf (buf, sizeof(buf), "%" PRId64, samples_per_pixel);
node->add_property ("zoom", buf);
node->add_property ("snap-to", enum_2_string (_snap_type));
- node->add_property ("snap-delta", enum_2_string (_snap_delta));
node->add_property ("snap-mode", enum_2_string (_snap_mode));
node->add_property ("internal-snap-to", enum_2_string (internal_snap_type));
node->add_property ("internal-snap-mode", enum_2_string (internal_snap_mode));
mouse_mode_size_group->add_widget (visible_tracks_selector);
mouse_mode_size_group->add_widget (snap_type_selector);
- mouse_mode_size_group->add_widget (snap_delta_selector);
mouse_mode_size_group->add_widget (snap_mode_selector);
mouse_mode_size_group->add_widget (edit_point_selector);
snap_type_selector.set_name ("mouse mode button");
- snap_delta_selector.set_name ("mouse mode button");
snap_mode_selector.set_name ("mouse mode button");
edit_point_selector.set_name ("mouse mode button");
- snap_box.pack_start (snap_delta_selector, false, false);
snap_box.pack_start (snap_mode_selector, false, false);
snap_box.pack_start (snap_type_selector, false, false);
snap_box.pack_start (edit_point_selector, false, false);
set_size_request_to_display_given_text (edit_mode_selector, edit_mode_strings, COMBO_TRIANGLE_WIDTH, 2);
}
-void
-Editor::build_snap_delta_menu ()
-{
- using namespace Menu_Helpers;
-
- snap_delta_selector.AddMenuElem (MenuElem ( snap_delta_strings[(int)SnapAbsolute], sigc::bind (sigc::mem_fun(*this, &Editor::snap_delta_selection_done), (SnapDelta) SnapAbsolute)));
- snap_delta_selector.AddMenuElem (MenuElem ( snap_delta_strings[(int)SnapRelative], sigc::bind (sigc::mem_fun(*this, &Editor::snap_delta_selection_done), (SnapDelta) SnapRelative)));
-
- set_size_request_to_display_given_text (snap_delta_selector, snap_delta_strings, COMBO_TRIANGLE_WIDTH, 2);
-}
-
void
Editor::build_snap_mode_menu ()
{
ARDOUR_UI::instance()->set_tip (tav_shrink_button, _("Shrink Tracks"));
ARDOUR_UI::instance()->set_tip (visible_tracks_selector, _("Number of visible tracks"));
ARDOUR_UI::instance()->set_tip (snap_type_selector, _("Snap/Grid Units"));
- ARDOUR_UI::instance()->set_tip (snap_delta_selector, _("Relative Snap Mode"));
ARDOUR_UI::instance()->set_tip (snap_mode_selector, _("Snap/Grid Mode"));
ARDOUR_UI::instance()->set_tip (edit_point_selector, _("Edit point"));
ARDOUR_UI::instance()->set_tip (edit_mode_selector, _("Edit Mode"));
}
}
-void
-Editor::snap_delta_selection_done (SnapDelta delta)
-{
- RefPtr<RadioAction> ract = snap_delta_action (delta);
-
- if (ract) {
- ract->set_active (true);
- }
-}
-
void
Editor::snap_mode_selection_done (SnapMode mode)
{
void prev_snap_choice_music_only ();
void prev_snap_choice_music_and_time ();
void set_snap_to (Editing::SnapType);
- void set_snap_delta (Editing::SnapDelta);
void set_snap_mode (Editing::SnapMode);
void set_snap_threshold (double pixel_distance) {snap_threshold = pixel_distance;}
- Editing::SnapDelta snap_delta () const;
Editing::SnapMode snap_mode () const;
Editing::SnapType snap_type () const;
void move_range_selection_start_or_end_to_region_boundary (bool, bool);
Editing::SnapType _snap_type;
- Editing::SnapDelta _snap_delta;
Editing::SnapMode _snap_mode;
/// Snap threshold in pixels
ArdourDropdown snap_type_selector;
void build_snap_type_menu ();
- ArdourDropdown snap_delta_selector;
ArdourDropdown snap_mode_selector;
- void build_snap_delta_menu ();
void build_snap_mode_menu ();
Gtk::HBox snap_box;
std::vector<std::string> snap_type_strings;
- std::vector<std::string> snap_delta_strings;
std::vector<std::string> snap_mode_strings;
void snap_type_selection_done (Editing::SnapType);
- void snap_delta_selection_done (Editing::SnapDelta);
void snap_mode_selection_done (Editing::SnapMode);
- void snap_delta_chosen (Editing::SnapDelta);
void snap_mode_chosen (Editing::SnapMode);
void snap_type_chosen (Editing::SnapType);
Glib::RefPtr<Gtk::RadioAction> snap_type_action (Editing::SnapType);
- Glib::RefPtr<Gtk::RadioAction> snap_delta_action (Editing::SnapDelta);
Glib::RefPtr<Gtk::RadioAction> snap_mode_action (Editing::SnapMode);
//zoom focus meu stuff
ActionManager::register_action (editor_actions, "set-edit-lock", S_("EditMode|Lock"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Lock));
ActionManager::register_action (editor_actions, "cycle-edit-mode", _("Cycle Edit Mode"), sigc::mem_fun (*this, &Editor::cycle_edit_mode));
- ActionManager::register_action (editor_actions, X_("SnapDelta"), _("Snap Delta"));
- RadioAction::Group snap_delta_group;
- ActionManager::register_radio_action (editor_actions, snap_delta_group, X_("snap-absolute"), _("Absolute"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_delta_chosen), Editing::SnapAbsolute)));
- ActionManager::register_radio_action (editor_actions, snap_delta_group, X_("snap-relative"), _("Relative"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_delta_chosen), Editing::SnapRelative)));
-
ActionManager::register_action (editor_actions, X_("SnapTo"), _("Snap to"));
ActionManager::register_action (editor_actions, X_("SnapMode"), _("Snap Mode"));
+
RadioAction::Group snap_mode_group;
ActionManager::register_radio_action (editor_actions, snap_mode_group, X_("snap-off"), _("No Grid"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapOff)));
ActionManager::register_radio_action (editor_actions, snap_mode_group, X_("snap-normal"), _("Grid"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapNormal)));
}
}
-RefPtr<RadioAction>
-Editor::snap_delta_action (SnapDelta delta)
-{
- const char* action = 0;
- RefPtr<Action> act;
-
- switch (delta) {
- case Editing::SnapAbsolute:
- action = X_("snap-absolute");
- break;
- case Editing::SnapRelative:
- action = X_("snap-relative");
- break;
- default:
- fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible snap delta type", (int) delta) << endmsg;
- abort(); /*NOTREACHED*/
- }
-
- act = ActionManager::get_action (X_("Editor"), action);
-
- if (act) {
- RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
- return ract;
-
- } else {
- error << string_compose (_("programming error: %1: %2"), "Editor::snap_delta_chosen could not find action to match mode.", action) << endmsg;
- return RefPtr<RadioAction> ();
- }
-}
-
RefPtr<RadioAction>
Editor::snap_mode_action (SnapMode mode)
{
}
}
-void
-Editor::snap_delta_chosen (SnapDelta rel)
-{
- /* this is driven by a toggle on a radio group, and so is invoked twice,
- once for the item that became inactive and once for the one that became
- active.
- */
-
- RefPtr<RadioAction> ract = snap_delta_action (rel);
-
- if (ract && ract->get_active()) {
- set_snap_delta (rel);
- }
-}
-
void
Editor::snap_mode_chosen (SnapMode mode)
{
return adjusted_frame (_drags->current_pointer_frame (), event, snap);
}
+frameoffset_t
+Drag::snap_delta (GdkEvent const * event) const
+{
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
+ return _snap_delta;
+ } else {
+ return 0;
+ }
+}
+
double
Drag::current_pointer_x() const
{
void
Drag::setup_snap_delta (framepos_t pos)
{
- if (_editor->snap_delta () == SnapRelative) {
- framepos_t temp = pos;
- _editor->snap_to_no_magnets (temp);
- _snap_delta = temp - pos;
- }
+ framepos_t temp = pos;
+ _editor->snap_to_no_magnets (temp);
+ _snap_delta = temp - pos;
}
bool
Drag::start_grab (event, cursor);
setup_snap_delta (_last_frame_position);
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
_single_axis = true;
}
/* compute the amount of pointer motion in frames, and where
the region would be if we moved it by that much.
*/
- *pending_region_position = adjusted_frame (_drags->current_pointer_frame () + snap_delta (), event, true);
+ *pending_region_position = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event), event, true);
framepos_t sync_frame;
framecnt_t sync_offset;
_editor->snap_to_with_modifier (sync_frame, event);
- *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - snap_delta ();
+ *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - snap_delta (event);
} else {
*pending_region_position = _last_frame_position;
region = &cnote->region_view();
- if (_editor->snap_delta () == SnapRelative) {
- double temp;
- temp = region->snap_to_pixel_no_magnets (cnote->x0 ());
- _snap_delta = temp - cnote->x0 ();
- }
+ double temp;
+ temp = region->snap_to_pixel_no_magnets (cnote->x0 ());
+ _snap_delta = temp - cnote->x0 ();
_item->grab ();
}
void
-NoteResizeDrag::motion (GdkEvent* /*event*/, bool /*first_move*/)
+NoteResizeDrag::motion (GdkEvent* event, bool /*first_move*/)
{
MidiRegionSelection& ms (_editor->get_selection().midi_regions);
for (MidiRegionSelection::iterator r = ms.begin(); r != ms.end(); ++r) {
assert (nb);
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*r);
if (mrv) {
- mrv->update_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, _snap_delta);
+ double sd = 0.0;
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
+ sd = _snap_delta;
+ }
+ mrv->update_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, sd);
}
}
}
void
-NoteResizeDrag::finished (GdkEvent*, bool /*movement_occurred*/)
+NoteResizeDrag::finished (GdkEvent* event, bool /*movement_occurred*/)
{
MidiRegionSelection& ms (_editor->get_selection().midi_regions);
for (MidiRegionSelection::iterator r = ms.begin(); r != ms.end(); ++r) {
NoteBase* nb = reinterpret_cast<NoteBase*> (_item->get_data ("notebase"));
assert (nb);
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*r);
+ double sd = 0.0;
+ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
+ sd = _snap_delta;
+ }
if (mrv) {
- mrv->commit_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, _snap_delta);
+ mrv->commit_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, sd);
}
}
if (pf < (region_start + region_length/2)) {
/* closer to front */
_operation = StartTrim;
-
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
Drag::start_grab (event, _editor->cursors()->anchored_left_side_trim);
} else {
Drag::start_grab (event, _editor->cursors()->left_side_trim);
} else {
/* closer to end */
_operation = EndTrim;
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
Drag::start_grab (event, _editor->cursors()->anchored_right_side_trim);
} else {
Drag::start_grab (event, _editor->cursors()->right_side_trim);
}
}
}
-
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ /* XXX this "feature" gives the user no clue as to what is going to happen. */
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
_jump_position_when_done = true;
}
if (tv && tv->is_track()) {
speed = tv->track()->speed();
}
- framecnt_t adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (), event, true);
- framecnt_t dt = adj_frame - raw_grab_frame () + _pointer_frame_offset - snap_delta ();
+ framecnt_t adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event), event, true);
+ framecnt_t dt = adj_frame - raw_grab_frame () + _pointer_frame_offset - snap_delta (event);
if (first_move) {
bool non_overlap_trim = false;
- if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
non_overlap_trim = true;
}
}
}
-
void
TrimDrag::finished (GdkEvent* event, bool movement_occurred)
{
_grab_zoom = _editor->samples_per_pixel;
- framepos_t where = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (where, event);
}
}
- fake_locate (where - snap_delta ());
+ fake_locate (where - snap_delta (event));
}
void
CursorDrag::motion (GdkEvent* event, bool)
{
- framepos_t where = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (where, event);
if (where != last_pointer_frame()) {
- fake_locate (where - snap_delta ());
+ fake_locate (where - snap_delta (event));
}
}
{
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
}
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
{
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
cy = max (0.0, cy);
cy = min ((double) _point->line().height(), cy);
- framepos_t cx_frames = _editor->pixel_to_sample (cx) + snap_delta ();
+ framepos_t cx_frames = _editor->pixel_to_sample (cx) + snap_delta (event);
if (!_x_constrained) {
_editor->snap_to_with_modifier (cx_frames, event);
}
- cx_frames -= snap_delta ();
+ cx_frames -= snap_delta (event);
cx_frames = min (cx_frames, _point->line().maximum_time());
float const fraction = 1.0 - (cy / _point->line().height());
if (!movement_occurred) {
/* just a click */
-
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
_editor->reset_point_selection ();
}
pair<TimeAxisView*, double> const tv = _editor->trackview_by_y_position (grab_y());
int layer = tv.first->layer_display() == Overlaid ? 0 : tv.second;
int layers = tv.first->layer_display() == Overlaid ? 1 : cv->layers();
- framepos_t pf = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pf = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pf, event);
- pf -= snap_delta ();
+ pf -= snap_delta (event);
if (pf > rv->region()->position()) {
rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf, layers, layer);
/** @return Current total drag x change in frames */
frameoffset_t
-NoteDrag::total_dx () const
+NoteDrag::total_dx (GdkEvent const * event) const
{
/* dx in frames */
frameoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x());
frameoffset_t const n = _region->source_beats_to_absolute_frames (_primary->note()->time ());
/* new time of the primary note in session frames */
- frameoffset_t st = n + dx + snap_delta ();
+ frameoffset_t st = n + dx + snap_delta (event);
framepos_t const rp = _region->region()->position ();
st = max (st, rp);
/* snap and return corresponding delta */
- return _region->snap_frame_to_frame (st - rp) + rp - n - snap_delta ();
+ return _region->snap_frame_to_frame (st - rp) + rp - n - snap_delta (event);
}
/** @return Current total drag y change in note number */
}
void
-NoteDrag::motion (GdkEvent *, bool)
+NoteDrag::motion (GdkEvent * event, bool)
{
/* Total change in x and y since the start of the drag */
- frameoffset_t const dx = total_dx ();
+ frameoffset_t const dx = total_dx (event);
int8_t const dy = total_dy ();
/* Now work out what we have to do to the note canvas items to set this new drag delta */
}
}
} else {
- _region->note_dropped (_primary, total_dx(), total_dy());
+ _region->note_dropped (_primary, total_dx (ev), total_dy());
}
}
return _last_pointer_frame;
}
- ARDOUR::frameoffset_t snap_delta () const {
- return _snap_delta;
- }
+ ARDOUR::frameoffset_t snap_delta (GdkEvent const *) const;
double current_pointer_x () const;
double current_pointer_y () const;
private:
- ARDOUR::frameoffset_t total_dx () const;
+ ARDOUR::frameoffset_t total_dx (GdkEvent const *) const;
int8_t total_dy () const;
MidiRegionView* _region;
LayerDisplay layer_display;
RegionListSortType region_list_sort_type;
SnapType snap_type;
- SnapDelta snap_delta;
SnapMode snap_mode;
ZoomFocus zoom_focus;
ItemType item_type;
REGISTER_ENUM (ByTimestamp);
REGISTER (region_list_sort_type);
- REGISTER_ENUM (SnapAbsolute);
- REGISTER_ENUM (SnapRelative);
- REGISTER (snap_delta);
-
REGISTER_ENUM (SnapToCDFrame);
REGISTER_ENUM (SnapToTimecodeFrame);
REGISTER_ENUM (SnapToTimecodeSeconds);
/* Convert that to a frame within the source */
framepos_t current_fr = snap_pixel_to_sample (current_x) + _region->start ();
- double one_frame = region_frames_to_region_beats_double (current_fr) - region_frames_to_region_beats_double (current_fr - 1);
- cerr << "commit one frame in beats : " << one_frame << endl;
+
/* and then to beats */
const Evoral::Beats x_beats = region_frames_to_region_beats (current_fr);
if (at_front && x_beats < canvas_note->note()->end_time()) {
if (!at_front) {
const Evoral::Beats len = std::max(Evoral::Beats(1 / 512.0),
- x_beats - canvas_note->note()->time() - (sign * delta_beats) - one_frame);
+ x_beats - canvas_note->note()->time() - (sign * delta_beats));
note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
}
virtual void set_snap_to (Editing::SnapType t) = 0;
virtual Editing::SnapType snap_type () const = 0;
- virtual Editing::SnapDelta snap_delta () const = 0;
virtual Editing::SnapMode snap_mode () const = 0;
- virtual void set_snap_delta (Editing::SnapDelta m) = 0;
-
/** Set the snap mode.
* @param m Snap mode (defined in editing_syms.h)
*/
projects / ardour.git / commitdiff