ardour/livetrax
13
0
Fork 0
Code
3,379 Commits 1 Branch 1 Tag 199 MiB
42e1e00f06
Commit Graph

170 Commits

Author SHA1 Message Date
Paul Davis
42e1e00f06 add step-rest keybinding for step editing 
git-svn-id: svn://localhost/ardour2/branches/3.0@5653 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-10 22:20:37 +00:00
Paul Davis
2ff1cd99af do not crash when loading old history files with MIDI edits; add all notes in region to canvas, but pay attention to visibility 
git-svn-id: svn://localhost/ardour2/branches/3.0@5652 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-10 21:19:01 +00:00
Paul Davis
7b8adc78b6 more MIDI editing cleanups, mostly fixing subtleties. Will break loading the history file for older sessions with MIDI editing present - we warned you :) 
git-svn-id: svn://localhost/ardour2/branches/3.0@5651 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-10 20:41:08 +00:00
Paul Davis
5f319d0a08 re-use canvas note items when the model changes ; slightly more efficient (probably) and avoids invalidating references to said items in, for example, ResizeData in a copied region 
git-svn-id: svn://localhost/ardour2/branches/3.0@5650 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-09 16:46:18 +00:00
Paul Davis
5328a114c9 time line items now have 64 bit location + duration; start making note resize apply across regions 
git-svn-id: svn://localhost/ardour2/branches/3.0@5642 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-09 02:09:04 +00:00
Paul Davis
1bf79fa885 move note drag & note resize mouse handling up into the Drag/Editor infrastructure/level 
git-svn-id: svn://localhost/ardour2/branches/3.0@5641 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-08 21:45:44 +00:00
Paul Davis
539c8361de use diff commands for quantize, with infrastructure changes as required 
git-svn-id: svn://localhost/ardour2/branches/3.0@5639 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-07 16:53:53 +00:00
Paul Davis
79dc191d6b add anonymous union to DiffCommand to allow uint8t_t and time-based arguments; use DiffCommand for note trimming 
git-svn-id: svn://localhost/ardour2/branches/3.0@5638 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-07 13:38:06 +00:00
Paul Davis
837bfc9af4 the start (only the start) of MIDI diff commands 
git-svn-id: svn://localhost/ardour2/branches/3.0@5637 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-06 18:11:55 +00:00
Paul Davis
c3c5c9a559 just one timeout callback for step editing, not one per track 
git-svn-id: svn://localhost/ardour2/branches/3.0@5635 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-05 14:11:48 +00:00
Paul Davis
b7fe417f70 better way to "engage" step edit, and extend region correctly as needed 
git-svn-id: svn://localhost/ardour2/branches/3.0@5630 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-03 14:50:21 +00:00
Paul Davis
b0b584c2a5 the basics of step editing, more details to follow 
git-svn-id: svn://localhost/ardour2/branches/3.0@5629 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-03 12:39:50 +00:00
Paul Davis
e7e071db1a more MIDI editing tweaks ; flip mouse mode buttons around for MIDI so that "object" mode is the most likely mode for both region \& region editing ; frame handle events (from lincoln's region trimming patch) are now handled more explicitly 
git-svn-id: svn://localhost/ardour2/branches/3.0@5600 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-28 16:06:08 +00:00
Paul Davis
3845af6ce9 lots of MIDI editing stuff. to be explained on the website when its done 
git-svn-id: svn://localhost/ardour2/branches/3.0@5596 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-27 03:09:30 +00:00
Paul Davis
b116282bbb make shift-click for extend-selection sort-of work for MIDI 
git-svn-id: svn://localhost/ardour2/branches/3.0@5541 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-18 02:37:57 +00:00
Paul Davis
3162ffb4f4 move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode buttons when in internal/MIDI mode; arrow key control of note velocity, value and position - hey look ma, MIDI editing! 
git-svn-id: svn://localhost/ardour2/branches/3.0@5539 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-17 15:58:47 +00:00
Paul Davis
e3ac55f7b1 fix up display of notes when creating/editing a MIDI region with the pencil; fix position of paste for regions that are not at frame zero 
git-svn-id: svn://localhost/ardour2/branches/3.0@5527 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-14 03:00:41 +00:00
Paul Davis
e57c4d4c43 more MIDI paste improvements, plus move region-mute binding to PRIMARY-m and use "m" for toggle-internal-editing 
git-svn-id: svn://localhost/ardour2/branches/3.0@5525 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-13 19:48:10 +00:00
Paul Davis
84fb6ae9ba actually paste MIDI at the right spot 
git-svn-id: svn://localhost/ardour2/branches/3.0@5521 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-13 12:19:28 +00:00
Paul Davis
02e3f7c769 kinda-sorta paste MIDI at the right spot 
git-svn-id: svn://localhost/ardour2/branches/3.0@5519 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-13 12:10:34 +00:00
Paul Davis
0178875021 MIDI cut&paste round two (not done yet); a small region trim fix from lincoln s. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5517 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-13 01:57:03 +00:00
Paul Davis
0bf3eb7759 first part of MIDI cut/copy/paste ; fix for input/output_streams of an IOProcessor being reported in a misleading way; in/out translation fix from 2.X, sort of 
git-svn-id: svn://localhost/ardour2/branches/3.0@5510 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-10 19:29:29 +00:00
Paul Davis
3ae28868ff remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route 
git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-28 20:51:28 +00:00
Carl Hetherington
402cc384ce Back out big shared_ptr change. Moving to a branch. Apologies all. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-09 17:58:13 +00:00
Carl Hetherington
4297071b3f Use shared_ptr for the TimeAxisView hierarchy. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5339 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-09 13:39:45 +00:00
Carl Hetherington
7f3e6769b3 Fix a drag crash and some warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5135 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-06-09 15:46:33 +00:00
Carl Hetherington
0874426a5b Further refactoring of drag code. Changes so that drags from the region list display a region view during the drag. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5127 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-06-08 19:28:51 +00:00
Nick Mainsbridge
72f1209520 Use pixbufs as region name labels rather than Gnome::Canvas::Text. Don't set height on every regionview in non-stacked mode in StreamView::add_region_view (speeds up some playlist operations). 
git-svn-id: svn://localhost/ardour2/branches/3.0@5071 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-13 15:33:41 +00:00
David Robillard
006d3a9f46 Fix note dragging. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5049 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-05 00:57:08 +00:00
David Robillard
6c93b8c44f Remove useless/broken concept of 'erase touch dragging'. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5048 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-05 00:18:21 +00:00
David Robillard
7863c03cfc Make MIDI note editing work somewhat again... 
Only show note velocity text when the user is actually editing velocity.


git-svn-id: svn://localhost/ardour2/branches/3.0@5047 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-05 00:08:30 +00:00
David Robillard
03536cd399 Fix a bunch of warnings. 
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4668 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-26 00:58:35 +00:00
David Robillard
e0aaed6d65 *** NEW CODING POLICY *** 
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-25 18:26:51 +00:00
David Robillard
c9582da233 Make source length a dynamic thing. 
Update MIDI region length (actually and visually) when position changes.


git-svn-id: svn://localhost/ardour2/branches/3.0@4644 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-20 00:30:42 +00:00
David Robillard
0f71728a92 Interpret tempo time based on read position (not source timeline position which is more or less meaningless). 
Move time conversion into the region view rather than the source.
Adapt MIDI (including controllers) regions to the destination tempo when moved (e.g. dragging a region to a location with half the tempo will make the notes twice as long).


git-svn-id: svn://localhost/ardour2/branches/3.0@4635 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-19 04:12:54 +00:00
David Robillard
b857756f60 Remove unnecessary/unused template parameter from canvas sysex flags. 
Add license headers to canvas sysex files (tsk, tsk).


git-svn-id: svn://localhost/ardour2/branches/3.0@4610 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-17 02:19:16 +00:00
Hans Baier
80e3845982 * First prototype of SysEx GUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@4604 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 09:51:40 +00:00
David Robillard
31a6e0b254 Fix time / positioning of PC flags (beat time). 
Fix needless string copying in flag stuff.
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4601 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 05:54:12 +00:00
David Robillard
de88640598 Don't do a linear search through controls for program change for no reason. 
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4600 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 05:33:23 +00:00
David Robillard
5f7b4de024 Time unit translation for AutomationLine (correctly display MIDI controller data). 
git-svn-id: svn://localhost/ardour2/branches/3.0@4597 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 04:46:45 +00:00
David Robillard
3963d2b0b2 Move all beats <-> frames time conversion into a single object that can be passed around. 
This has 3 main benefits:
 - All conversion code is in one place (less duplication, potential bugs)
 - The conversion method can be passed to things that are ignorant
   of the actual time units involved, information required, etc.
   (In the future it would be nice to have user selectable tempo/frame time)
 - It should be relatively simple now to support tempo changes part-way
   through a MIDI region (at least architecturally speaking)


git-svn-id: svn://localhost/ardour2/branches/3.0@4594 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 02:51:16 +00:00
David Robillard
beb3eea62b Fix horizontal positioning of PC flags. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4593 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 01:12:49 +00:00
David Robillard
5b71b9333a Bring the note mode menu back from the dead. 
Fix percussive note (diamonds) placement.


git-svn-id: svn://localhost/ardour2/branches/3.0@4587 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 21:19:01 +00:00
David Robillard
9c89a93e4f Remove dead code. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4584 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 19:56:06 +00:00
David Robillard
166395c96b Fix genererally retarded and broken note range / diskstream display / etc. related things (correctly display region contents on initial session load). 
git-svn-id: svn://localhost/ardour2/branches/3.0@4583 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 19:44:27 +00:00
David Robillard
ecaf107ed3 The Big Change: Store time in MidiModel as tempo time, not frame time. 
The time stamp of an event is now always tempo, from file to model and
back again.  Frame time is only relevant at playback or recording time,
in the audio thread (MidiModel and MidiBuffer).

I think perhaps we don't need to change the actual time from double (which is
convenient for math), it is the time base conversion that caused problems.
Using a correct equality comparison (i.e.  not == which is not correct for
floating point) should probably make the undo issues go away, in 99.99% of
cases anyway.

There's almost certainly some regressions in here somewhere, but they do not
seem to be time related.  The bugs I'm hitting in testing are old ones that
seem unrelated now, so it's checkpoint time.

This sets us up for fancy things like tempo map import and tempo/meter changes
halfway through MIDI regions, but for now it's still assumed that the tempo
at the start of the region is valid for the duration of the entire region.


git-svn-id: svn://localhost/ardour2/branches/3.0@4582 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 17:30:42 +00:00
David Robillard
166ef64e3d Make (MIDI) event time stamp type a template parameter. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4473 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-02 02:36:05 +00:00
Hans Baier
3705a2d630 * MIDI control lanes: Set Interpolationtype according to Parameter 
git-svn-id: svn://localhost/ardour2/branches/3.0@4452 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-01-28 04:55:31 +00:00
David Robillard
3f662b9f9d Fix audible note select: 
- Don't play note a bajillion times when touch selecting
	- Don't spawn a thread for each note off (schedule an idle handler instead)
	- Play notes when rect selecting


git-svn-id: svn://localhost/ardour2/branches/3.0@4392 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-01-07 02:40:13 +00:00
Carl Hetherington
042997e5ed Cleanups and a few comments. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4374 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-01-02 00:17:55 +00:00