Commit Graph

87 Commits

Author SHA1 Message Date
Paul Davis bc89fe0147 most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 14:43:24 +00:00
Paul Davis 42db44c193 merge 3870-3890 from 2.0-ongoing into 3.X (compiles, runs, no other promises
git-svn-id: svn://localhost/ardour2/branches/3.0@4303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 18:16:12 +00:00
Paul Davis c64e96b6a8 add toggles for region fade in/out/both active, plus toggle for region fades visibility
git-svn-id: svn://localhost/ardour2/branches/3.0@3904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-09 21:55:05 +00:00
Paul Davis 757c1c1026 add global region fade toggle; fixup (?) reload of MIDI config state (both ported from 2.X)
git-svn-id: svn://localhost/ardour2/branches/3.0@3897 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-09 14:15:45 +00:00
David Robillard ec6ab8a048 Apply panners/automation patch from torbenh (Panner is-a Processor).
git-svn-id: svn://localhost/ardour2/branches/3.0@3848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-03 03:16:19 +00:00
Sakari Bergen 572fa80aa7 Add Import from session -functionality
git-svn-id: svn://localhost/ardour2/branches/3.0@3805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-26 08:29:30 +00:00
Paul Davis 1c299d5a5c merge Sakari's (sbergen) branch back into 3.0, removing libsndfile and adding taglib
git-svn-id: svn://localhost/ardour2/branches/3.0@3736 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-17 08:44:51 +00:00
Paul Davis 68e943265e merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 15:03:30 +00:00
Paul Davis 39b2e2b572 fix track selection sensitivity botch for Import action, should be toggle-waveform-visible instead
git-svn-id: svn://localhost/ardour2/branches/3.0@3393 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-22 20:56:56 +00:00
Paul Davis cb41314642 merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 14:06:50 +00:00
Paul Davis 997e4b1f9c merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:03 +00:00
David Robillard a2a6cc0404 Merge with 2.0-ongoing R3082.
Superficial generification of export stuff.


git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 22:10:27 +00:00
David Robillard 012292b4bd Less crash-happy MIDI reading on weird MIDI files.
Make "show existing automation" create/show automation tracks for all contained CC in MIDI tracks.
Fix staggered time when importing multi-track MIDI files.


git-svn-id: svn://localhost/ardour2/branches/3.0@3086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 03:24:44 +00:00
David Robillard fbfb26b45c Preliminary (read: kludgey) MIDI import support.
Only really works when tracks contain only channel 1 data for now.


git-svn-id: svn://localhost/ardour2/branches/3.0@3083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-18 19:45:52 +00:00
David Robillard 8aa9508c82 Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 22:43:18 +00:00
David Robillard 80c3677c83 Merge with 2.0-ongoing R2988
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 17:22:04 +00:00
David Robillard 9f63ab9931 Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 03:57:35 +00:00
David Robillard 7295d8e9f6 Merge with 2.0-ongoing R2943.
git-svn-id: svn://localhost/ardour2/branches/3.0@2944 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 05:06:33 +00:00
David Robillard 4ca1fe7993 Merge with trunk R2935.
git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 03:49:52 +00:00
David Robillard c4cec60d8f Fix track controls gap when showing/hiding editor meters.
git-svn-id: svn://localhost/ardour2/trunk@2916 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 00:46:54 +00:00
David Robillard e92c1669c1 Merge with 2.0-ongoing R2885.
Fix loading of 2.0 sessions.


git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 23:45:50 +00:00
David Robillard 8a2e30816e Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 22:22:29 +00:00
David Robillard bb457bb960 Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 21:20:59 +00:00
Doug McLain b42213bb04 Port level meters to trunk
git-svn-id: svn://localhost/ardour2/trunk@2802 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-20 23:25:19 +00:00
Paul Davis b01bdb7e70 merged with trunk revs 2605-2627
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 22:23:01 +00:00
Paul Davis badc087263 merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session)
git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-08 01:40:25 +00:00
Paul Davis b0f9c38c2e make import menu item work again
git-svn-id: svn://localhost/ardour2/trunk@2569 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-23 14:20:31 +00:00
Paul Davis f7f9d6fdc4 merge from 2.0-ongoing by hand, minus key binding editor
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 22:07:47 +00:00
Carl Hetherington 26305a73d7 A couple of capitalisation and space fixes for the main menu.
git-svn-id: svn://localhost/ardour2/trunk@2534 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-10 00:15:41 +00:00
David Robillard f68caf23dd Genericificationalizeified AudioFilter (now Filter).
Added primitive (non-undoable, placeholder, etc) quantization.


git-svn-id: svn://localhost/ardour2/trunk@2254 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-06 05:30:18 +00:00
Paul Davis a485d10615 ben's fix for radio button grouping
git-svn-id: svn://localhost/ardour2/trunk@2164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-20 16:06:24 +00:00
David Robillard 332a3d9813 Selection of visible note range (full range vs fit contents, selectable from midi track menu).
Added note pencil tool, mock note adding (notes can be added visually but don't yet play).
Reworked MidiModel to be notes w/ duration instead of realtime style MIDI events.
Moved layering (stacked/overlaid) from auto time axis down to route time axis since it applies
to MIDI tracks as well.


git-svn-id: svn://localhost/ardour2/trunk@2128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-15 01:56:11 +00:00
David Robillard f878576f2d User toggling of editor region/route/etc list, ala editor mixer.
Canvas, from sea to shining sea.


git-svn-id: svn://localhost/ardour2/trunk@1983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-15 07:39:20 +00:00
Carl Hetherington aa3bb18b17 Re-work main right-click context menu to operate on the selection, and remove some confusion about what region(s) will be affected by menu selections.
git-svn-id: svn://localhost/ardour2/trunk@1831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 11:53:35 +00:00
Paul Davis 87726495c3 Merged changes from trunk 1699:1751 into 2.1-staging
git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1752 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-26 20:54:31 +00:00
Paul Davis 45d3ec1437 merged with 1697 revision of trunk (which is post-rc1 but pre-rc2
git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1698 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-11 13:07:51 +00:00
Paul Davis dfc75e0561 new keyboard bindings for moving playhead to region starts+ends ; use spin button for tempo, as per #1449
git-svn-id: svn://localhost/ardour2/trunk@1409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-02-02 20:55:16 +00:00
Sampo Savolainen 770481aeb9 Make meter gain entry lose focus after enter is pressed.
git-svn-id: svn://localhost/ardour2/trunk@1350 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-17 22:17:47 +00:00
Paul Davis 76c25a4a44 add sampo's synthesize_sources perl script to tools; add scroll-playhead-{forward,backward} with ctrl-<arrow> default bindings (for mr beasley)
git-svn-id: svn://localhost/ardour2/trunk@1336 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-17 13:13:58 +00:00
Nick Mainsbridge 1bddf1bc88 General SMPTE fixes mostly relating to non-integer frame rates. Please Test. Fix for sometimes entering an invalid SMPTE format by CHANGING THE SESSION FILE. ****Warning. the SMPTE frame rate will be reset to 30 NDF if you load an old sessionardour2_broken/***. Calculate the HMS verbose canvas cursor properly. Fix incorrect SMPTE display in clocks/VCC. Standardise size of SMPTE display in editor clocks. Make the zoom controls smaller (anyone with some smaller icons?).
git-svn-id: svn://localhost/ardour2/trunk@1257 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-02 13:57:06 +00:00
Paul Davis 00afa40d45 many small changes, see ardour-dev for more
git-svn-id: svn://localhost/ardour2/trunk@1160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-27 19:31:33 +00:00
Paul Davis 39f0ea6ae9 new fader design from thorwil, mostly
git-svn-id: svn://localhost/ardour2/trunk@1149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-21 17:30:47 +00:00
Paul Davis e098a23fcc deeper fixes for 80/100 subframes choice
git-svn-id: svn://localhost/ardour2/trunk@1146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-20 21:40:11 +00:00
Paul Davis ec588a28ba configurable subframes-per-frame, defaults to 80
git-svn-id: svn://localhost/ardour2/trunk@1143 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-20 14:27:56 +00:00
Paul Davis 2bf3ed423f track naming patch from brian; slightly modified F11-bug workaround from brian; undo/redo items in edit menu now show operation to be undone/redone; canvas allocations now handled by an idle handler; region views respond to changes in fade/in/out curves ; undo/redo possible for some fade in/out operations; automation tracks extend to max_frames
git-svn-id: svn://localhost/ardour2/trunk@1134 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-16 18:42:48 +00:00
Paul Davis 638336eee5 new svn_revision.h build system, plus no more SMPTE, just Timecode
git-svn-id: svn://localhost/ardour2/trunk@1116 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-12 20:41:06 +00:00
Paul Davis a0e8568266 fix crashing bug caused by recursive set_state() nonsense; sync snap_type, snap_mode, zoom_focus GUI elements; minor tweaks
git-svn-id: svn://localhost/ardour2/trunk@1048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-01 17:41:28 +00:00
Paul Davis 3e577fee98 move BWF header options into Configuration option, rationalize crossfade parameter names, ensure full GUI display of crossfade parameters (in menus)
git-svn-id: svn://localhost/ardour2/trunk@996 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-20 16:50:46 +00:00
Paul Davis 02115563fe fixes for various bugs including dangling ref to route in session, opening sessions from the NSD, closing a session leaving dangling pointers etc etc
git-svn-id: svn://localhost/ardour2/trunk@938 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-02 18:09:34 +00:00
Paul Davis 0b6139304b actually connect Editor to config state change system
git-svn-id: svn://localhost/ardour2/trunk@937 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-01 13:06:43 +00:00