13
0
Commit Graph

4011 Commits

Author SHA1 Message Date
c80649d913 restore correct behaviour of undo/redo for tempo map drags
git-svn-id: svn://localhost/ardour2/branches/3.0@11162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 20:40:06 +00:00
ac19bedc3d tweak constants that affect whether/where trimming cursors are shown for MIDI notes, to avoid making it so hard to drag relatively small notes
git-svn-id: svn://localhost/ardour2/branches/3.0@11160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 20:29:34 +00:00
f61a0d892c fix error in framepos_{plus,minus}_bbt() which miscounted beats while stepping through bars - stops dragged MIDI notes from ending up in the wrong place, and more
git-svn-id: svn://localhost/ardour2/branches/3.0@11159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 18:48:32 +00:00
Carl Hetherington
b9a9d8d047 Use a few shared_ptrs to make things slightly neater.
git-svn-id: svn://localhost/ardour2/branches/3.0@11156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 13:56:09 +00:00
b1a33855ce use BBTPoint::is_bar() rather than ::beat == 1 ; implement TempoMap::framepos_plus_{beats,bbt}() with new map structure (not totally finished or accurate yet); prevent crash when dragging a marker to replace the initial tempo/meter markers
git-svn-id: svn://localhost/ardour2/branches/3.0@11154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 02:49:01 +00:00
Carl Hetherington
783f31816c Happy New Year
git-svn-id: svn://localhost/ardour2/branches/3.0@11151 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 21:13:05 +00:00
bc003a539b save 4 bytes per Bar|Beat point in the tempo map
git-svn-id: svn://localhost/ardour2/branches/3.0@11147 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 19:03:13 +00:00
2a200bdc0e return two iterators into the Bars|Beats list of the tempo map rather than making a copy; use iterators in the GUI
git-svn-id: svn://localhost/ardour2/branches/3.0@11146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 18:43:58 +00:00
69c7dac1a1 new approach to tempo/meter: compute and store the entire map (every bar|beat point), thus enabling us to use the same computation to set the BBT points AND the metric markers (tempo + meter) on the audio timeline. It is known that snapping to the BBT grid doesn't work correctly right now, but this probably caused by the separate code in TempoMap::round_to_type() and i'll dig into that tomorrow. Note that the Bar|beat point list is evaluated "lazily" - we'll never store more than anyone actually needs to display or know, other than 1 minute's worth starting from frame zero
git-svn-id: svn://localhost/ardour2/branches/3.0@11129 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-02 04:04:14 +00:00
Carl Hetherington
084fc8b327 Slightly improve proxying of events by crossfade views; doesn't really have any positive effect, unfortunately.
git-svn-id: svn://localhost/ardour2/branches/3.0@11127 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-31 13:25:56 +00:00
Carl Hetherington
54ff6901a9 Restore update of coverage frames on playlist contents changed, which is needed for trim.
git-svn-id: svn://localhost/ardour2/branches/3.0@11124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-31 00:19:08 +00:00
Carl Hetherington
b93254f275 Anywhere that deletes regions needs to use a rdiff() on the playlist
for the undo history, so that changes to regions' layering_index
get stored in the undo record.  Make Playlist::update use add_region_internal
so that undone regions don't have their layering_index corrupted.
Setup layering indices on relayer() so that deletion of regions
causes an update.


git-svn-id: svn://localhost/ardour2/branches/3.0@11123 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 23:41:17 +00:00
Carl Hetherington
b5b921d820 Make coverage frames work slightly better; jury is still out on whether they are any use, I think.
git-svn-id: svn://localhost/ardour2/branches/3.0@11121 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 21:56:11 +00:00
Carl Hetherington
dd53e7284a Set up layering_index immediately on an explicit layer, so that undo
works properly.  Stop the layer being a stateful property, as it is
always derived from layering_index, unambigiously, by relayer().


git-svn-id: svn://localhost/ardour2/branches/3.0@11120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 20:05:48 +00:00
ccc93c4aef centralize use of "from-context-menu" in Editor::get_preferred_edit_position(), and use it when pasting as well
git-svn-id: svn://localhost/ardour2/branches/3.0@11118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 17:28:05 +00:00
6df1d06f8b fix logic for context-menu-mouse-dependent actions so that if the edit point is not the mouse, we still use the edit point even from the context menu. klar?
git-svn-id: svn://localhost/ardour2/branches/3.0@11117 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 16:21:10 +00:00
Carl Hetherington
42aea0b9fd Clean up comments to create_note_at, since it no longers snaps its length parameter. Move the 1 tick shortening out of the method for the same reason. Make sure that create drags make notes with a minimum length of 1 tick (#4600).
git-svn-id: svn://localhost/ardour2/branches/3.0@11116 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 13:41:16 +00:00
976e163406 make insert-patch-change from context menu use context click event for position (fixes #4570)
git-svn-id: svn://localhost/ardour2/branches/3.0@11113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 01:50:34 +00:00
Carl Hetherington
b177514930 Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it.
git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 22:14:15 +00:00
c19121459b stupid hack to fix issues with OS X Carbon headers
git-svn-id: svn://localhost/ardour2/branches/3.0@11107 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 16:44:49 +00:00
09b0ae782c avoid crash on region drag end trying to access TimeAxisView::view() for TAV's that don't have one
git-svn-id: svn://localhost/ardour2/branches/3.0@11105 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 14:48:42 +00:00
724771f18a tweak up size+spacing of main menu bar info box
git-svn-id: svn://localhost/ardour2/branches/3.0@11104 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 14:29:23 +00:00
a85e0b0a2e a huge set of changes to tempo+meter handling. testing feedback requested. the_CLA, you know who i mean :)
git-svn-id: svn://localhost/ardour2/branches/3.0@11103 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-28 21:02:31 +00:00
Carl Hetherington
67914e4fc7 Remove some unused stuff.
git-svn-id: svn://localhost/ardour2/branches/3.0@11100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-28 02:34:22 +00:00
Carl Hetherington
9e785781f2 Fix another bug wrt visual appearance of layered regions in
overlaid mode.


git-svn-id: svn://localhost/ardour2/branches/3.0@11098 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 21:10:20 +00:00
Carl Hetherington
f440f91849 Try to make new layering stuff play nicely with undo.
git-svn-id: svn://localhost/ardour2/branches/3.0@11097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 20:21:00 +00:00
Carl Hetherington
e470fd6303 Update layer order when switching back to overlaid mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@11093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 18:33:54 +00:00
Carl Hetherington
2db69318ce Fix up confusion with relayering after movement drags in
overlaid mode.


git-svn-id: svn://localhost/ardour2/branches/3.0@11092 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 18:33:49 +00:00
Carl Hetherington
e41d64724c Create Freesound working directory a little more lazily so
that a Freesound directory doesn't appear in /home/carl
without ever using Freesound.


git-svn-id: svn://localhost/ardour2/branches/3.0@11090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 14:36:14 +00:00
Carl Hetherington
3239706d40 Fix mistake in error checking of audio clock BBT times (#4589)
git-svn-id: svn://localhost/ardour2/branches/3.0@11089 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 02:15:28 +00:00
Carl Hetherington
6304261b98 Re-work layering in possibly debatable ways. Sketchy docs in doc/layering.
git-svn-id: svn://localhost/ardour2/branches/3.0@11088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 01:42:49 +00:00
Carl Hetherington
fd48e72fc2 Fix comparison of beats to frames when deciding whether to show a patch change (should fix #4569).
git-svn-id: svn://localhost/ardour2/branches/3.0@11085 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 00:22:26 +00:00
75a3964c10 add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588, mostly
git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:38:56 +00:00
e6e0476d5e fix coloring of region layer order editor clock
git-svn-id: svn://localhost/ardour2/branches/3.0@11082 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:18:58 +00:00
7856f14c44 when a context click event occurs in the editor, store the event so we can use it to determine position later during its handling, if necessary
git-svn-id: svn://localhost/ardour2/branches/3.0@11081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:18:24 +00:00
2b4d07e304 make the "with-parent" constructor for ArdourWindow actually work by calling set_transient_for
git-svn-id: svn://localhost/ardour2/branches/3.0@11080 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:17:33 +00:00
Carl Hetherington
2adb3fb579 Show panner drag information tool-tip style, and also show
it when the button is pressed to start a drag (#4584 and
#4585).


git-svn-id: svn://localhost/ardour2/branches/3.0@11072 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 14:30:35 +00:00
Carl Hetherington
6e79521e8b Move some bits from MonoPanner and StereoPanner into a
common base class.


git-svn-id: svn://localhost/ardour2/branches/3.0@11071 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 14:05:19 +00:00
5d509146c8 followup to the previous tempo-dragging commit: use argument to Drag::aborted() to know if we moved; update the frame position of tempo map metrics when we remove a tempo mark (should fix visual glitches when dragging tempo)
git-svn-id: svn://localhost/ardour2/branches/3.0@11049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 14:21:05 +00:00
Carl Hetherington
c0f435d36a Patch from Prokoudine to fix translators list (#4580).
git-svn-id: svn://localhost/ardour2/branches/3.0@11048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 14:01:18 +00:00
5cd27a4a85 similar to treatment of meter markers, remove tempo marks from the tempo map while dragging, to avoid wierd side effects
git-svn-id: svn://localhost/ardour2/branches/3.0@11047 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 02:53:33 +00:00
24a29f61d9 provide config parameter to allow non-quarter note pulses; off by default; no GUI to reset it at this point
git-svn-id: svn://localhost/ardour2/branches/3.0@11046 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 02:33:38 +00:00
a9adbd9404 remove comment
git-svn-id: svn://localhost/ardour2/branches/3.0@11045 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 02:11:03 +00:00
06320b2ed3 use the same kludge-removal approach in the prior commit for the meter dialog too, and fix a minor bug in the tempo dialog setup
git-svn-id: svn://localhost/ardour2/branches/3.0@11028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-20 16:56:07 +00:00
6227b5d473 rework tempo dialog to (a) allow selection of pulse note type (b) avoid awful kludge to get note type from the combobox; show pulse note type in tempo markers
git-svn-id: svn://localhost/ardour2/branches/3.0@11027 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-20 16:29:44 +00:00
e9b4f14668 rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_division which is a more accurate and informative name. The number doesn't describe the smallest division of a "beat" (which is only defined contextually anyway), but rather the smallest division of the the divisions of a bar. If using a meter of 4/8, there are 4 divisions per bar, and we can divide each one into ticks_per_bar_division pieces; in a separate meter (section) of 3/8, there are 3 divisions per bar, each of which can be divided into ticks_per_bar_division_pieces.
git-svn-id: svn://localhost/ardour2/branches/3.0@11022 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-19 19:44:43 +00:00
ca9a444aa9 do not convert from grid-type-beats to frames and back to beats when determining the length of a ghost note or the actual note to be inserted on button-press: just use grid-type-beats as is
git-svn-id: svn://localhost/ardour2/branches/3.0@11021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-19 18:32:57 +00:00
fb5f590b11 Show generic plugin UI toolbar (for presets etc.) on LV2 UIs (except external).
git-svn-id: svn://localhost/ardour2/branches/3.0@11019 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-18 02:25:19 +00:00
9f0eed8d7e updated czech translation from pavel fric
git-svn-id: svn://localhost/ardour2/branches/3.0@11017 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-17 16:40:35 +00:00
Carl Hetherington
c3d1a8dda5 Patch from GMaq to add Freedesktop category
AudioEditing.


git-svn-id: svn://localhost/ardour2/branches/3.0@11010 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 12:11:49 +00:00