smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-29 09:57:44 +01:00
Code Issues Projects Releases Wiki Activity

rework snap

Browse source 
snap now fills in a struct (MusicFrame) which contins a snapped frame
along with a music divisor.
this gives useful information wrt magnetic snap which may or may not
have rounded to an exact musical position.

region position may now be set musically (using quarter notes for now).

this patch fixes several problems in the current code:

	- dragging a list of music-locked regions now maintains correct
	  musical offsets within the list.

	- splitting regions using magnetic snap works correctly (#7192)

	- cut drag should now work correctly with magnetic snap.

	- musical length of split midi regions is no longer frame based.
This commit is contained in:
nick_m 2017-01-27 00:41:17 +11:00
parent a21a414615
commit 59daffea1d
33 changed files with 747 additions and 535 deletions
Download patch file Download diff file Expand all files Collapse all files

40
gtk2_ardour/editor.h
View file

@ -452,20 +452,20 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
void snap_to (framepos_t& first,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false,
bool ensure_snap = false);
void snap_to (ARDOUR::MusicFrame& first,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false,
bool ensure_snap = false);
void snap_to_with_modifier (framepos_t& first,
GdkEvent const * ev,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false);
void snap_to_with_modifier (ARDOUR::MusicFrame& first,
GdkEvent const * ev,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false);
void snap_to (framepos_t& first,
framepos_t& last,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false);
void snap_to (ARDOUR::MusicFrame& first,
ARDOUR::MusicFrame& last,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false);
void begin_selection_op_history ();
void begin_reversible_selection_op (std::string cmd_name);
@ -542,7 +542,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
/* editing operations that need to be public */
void mouse_add_new_marker (framepos_t where, bool is_cd=false);
void split_regions_at (framepos_t, RegionSelection&, const int32_t sub_num, bool snap = true);
void split_regions_at (ARDOUR::MusicFrame, RegionSelection&, bool snap = true);
void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false);
RegionSelection get_regions_from_selection_and_mouse (framepos_t);
@ -2152,14 +2152,14 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void select_next_route ();
void select_prev_route ();
void snap_to_internal (framepos_t& first,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false,
bool ensure_snap = false);
void snap_to_internal (ARDOUR::MusicFrame& first,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false,
bool ensure_snap = false);
void timecode_snap_to_internal (framepos_t& first,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false);
void timecode_snap_to_internal (ARDOUR::MusicFrame& first,
ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
bool for_mark = false);
RhythmFerret* rhythm_ferret;