13
0
Commit Graph

90 Commits

Author SHA1 Message Date
8277d134b9 Merged with trunk R708
git-svn-id: svn://localhost/ardour2/branches/midi@712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-28 01:08:57 +00:00
60454cc8dc Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and
associated stuff are now separated (with common things in base classes).

Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses
all look (and really are) distinct in the GUI.


git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 12:03:19 +00:00
50a3102b9b Merge big changes (mostly Controllable) from trunk
git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-14 03:43:32 +00:00
5dc4abef79 More toolbar tweaking - Ardour fits on 1024x768!
git-svn-id: svn://localhost/ardour2/branches/midi@659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 17:15:45 +00:00
f57bc15a6c Complete edit toolbar overhaul
git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 08:03:43 +00:00
fe13d08874 Large nasty commit in the form of a 5000 line patch chock-full of completely
unecessary changes.  (Sorry, doing a "sprint" based thing, this is the end of the first one)

Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them.  Should be set to start work on actually recording and playing midi to/from disk now.

Relevant (significant) changes:

- Creation of a Buffer class.  Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template).  Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise.  Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below).  There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary.  Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)

- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports.  IO::register_***_port has a type argument that defaults to the default type if not passed.  Rationale:  previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things.  This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain.  (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)

- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument.  Ditto for output.

- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created.  Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part.  It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.

- MidiTrack creation.  Same thing as AudioTrack but with a different default type basically.  No big deal here.

- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)

Known broken:  Loading of sessions containing MIDI tracks.




git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 16:01:34 +00:00
b5db1f624d Merged with trunk revision 600
git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 01:34:54 +00:00
868f557f26 Merged with trunk (painfully)
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-13 07:27:52 +00:00
74dd5bd706 Committed filthy mess of a working copy solely for moving between machines.
Nothing to see here, move along now...


git-svn-id: svn://localhost/trunk/ardour2midi@575 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-08 23:46:42 +00:00
62b491362c fix timestretch dialog/progress etc; make tranzport protocol non-mandatory
git-svn-id: svn://localhost/trunk/ardour2@517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-20 02:57:38 +00:00
9c6984dbbb allow for mandatory control protocols, plus some ongoing work on automation control point selection (unfinished)
git-svn-id: svn://localhost/trunk/ardour2@516 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-19 20:10:35 +00:00
60fbeedb5f a) basic prototype of OSC control
b) various changes to ControlProtocol model/implementation
c) more attempts to get autoscroll to work nicely (unfinished)
d) move editor item types into their own header


git-svn-id: svn://localhost/trunk/ardour2@506 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-18 02:19:27 +00:00
979b95a56e enable use of arrow keys, fix hscroller issues, start work on smoother auto-scroll
git-svn-id: svn://localhost/trunk/ardour2@490 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-02 01:08:34 +00:00
74e6e37d30 a) fix editor hscroller to follow PT behaviour - scrollbar always
covers 0...full session + 10% of current zoom page size
b) add "big meter" mode to tranzport and fix more bugs with tranzport
   support


git-svn-id: svn://localhost/trunk/ardour2@455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-19 02:11:39 +00:00
e9f9ca5278 3 different data wheel modes for tranzport, plus lock on writes, and more
git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 16:51:27 +00:00
Nick Mainsbridge
825d7a769d fix incorrect marker/range marker right-click menus, try to clarify the text in them, select all between cursors ('u' is the shortcut) separate regions using range marker (a new right click menu on a range matker), easter egg
git-svn-id: svn://localhost/trunk/ardour2@438 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-01 00:21:25 +00:00
2aced5ff65 a) add "Add Range Markers" to region context menu
b) add "Set Range" to region context menu


git-svn-id: svn://localhost/trunk/ardour2@437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-31 23:00:40 +00:00
f9ee71f60e gcc4 fix for new import/embed code, plus inline reject_if_rate_differs() function
git-svn-id: svn://localhost/trunk/ardour2@417 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-22 22:18:08 +00:00
3aa346b253 significant changes in code to handle import/embedding - much cleaner and less code, plus the import progress bar now works; unify response handling for Gtkmm2ext::Choice
git-svn-id: svn://localhost/trunk/ardour2@415 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-22 17:03:00 +00:00
eb3fc0d966 add crossfade and layering options to menu system; add missing crossfade editor curve image; add control for destructive recording xfade; remove dead options from options editor
git-svn-id: svn://localhost/trunk/ardour2@411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-21 15:27:57 +00:00
5e836403ad lots of fidgety work to get track renaming to work correctly now that we have to rename audio files too; some GUI tweaks
git-svn-id: svn://localhost/trunk/ardour2@404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-17 17:39:21 +00:00
1dee60510a Make the FFT Anaylsis optional and disabled by default until further discussion.
git-svn-id: svn://localhost/trunk/ardour2@386 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-13 03:27:58 +00:00
Sampo Savolainen
b6efb1fdd9 Make FFT easier to use. right click on a range selection or a region and
in the range/region submenu you should find a "Analyze range/region"
entry.


git-svn-id: svn://localhost/trunk/ardour2@385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 22:35:39 +00:00
Sampo Savolainen
22502823aa Forgotten header from previous commit
git-svn-id: svn://localhost/trunk/ardour2@384 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 22:06:41 +00:00
Taybin Rutkin
1e668dfaf2 ExternalSource refactoring.
git-svn-id: svn://localhost/trunk/ardour2@373 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-10 17:09:59 +00:00
673642c8d5 further travels down the road toward true route group bliss
git-svn-id: svn://localhost/trunk/ardour2@368 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-10 04:05:11 +00:00
8ca43d57fe new mix group interface, not yet finished and still to propagate to edit_group
git-svn-id: svn://localhost/trunk/ardour2@366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-09 23:44:39 +00:00
06ee54887d add/remove edit groups via buttons (still a bit of work left to do)
git-svn-id: svn://localhost/trunk/ardour2@364 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-08 23:26:28 +00:00
Taybin Rutkin
123ec9cb30 Removed direct libsndfile usage.
git-svn-id: svn://localhost/trunk/ardour2@362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-08 22:24:51 +00:00
0d2c8771a7 fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc
git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-08 02:50:53 +00:00
5a39bf595c export range markers patch (revisited), change selection model, copy-drag tempo+meter marker patch
git-svn-id: svn://localhost/trunk/ardour2@349 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-05 19:39:16 +00:00
Nick Mainsbridge
69c9f3d7ce select all in time range, show object selection while in range mode, trim range ends by a frame when selecting, make things semantically a bit better.
git-svn-id: svn://localhost/trunk/ardour2@329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-15 12:15:29 +00:00
517d411bb0 new color management design starts to take shape (canvas color only for now)
git-svn-id: svn://localhost/trunk/ardour2@326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-14 17:19:58 +00:00
Nick Mainsbridge
a88fd62a70 add undo to keymouse set sync position.. possibly the hard way
git-svn-id: svn://localhost/trunk/ardour2@291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-23 20:39:58 +00:00
Nick Mainsbridge
dfcd837d67 select all, musical (fuzzy) loop/punch/range region selections, soundtouch patch for gcc 4.1, needs 's' key to not clear selection.
git-svn-id: svn://localhost/trunk/ardour2@289 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-23 16:02:48 +00:00
Nick Mainsbridge
048e756240 new keymouse action mute/unmute region (m)
git-svn-id: svn://localhost/trunk/ardour2@287 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-22 15:46:30 +00:00
Nick Mainsbridge
b0686e9056 new keymouse binding 'set region sync point'
git-svn-id: svn://localhost/trunk/ardour2@286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-22 13:29:08 +00:00
e1ad4e0a53 F11 now toggles maximal editor space
git-svn-id: svn://localhost/trunk/ardour2@280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-19 18:05:31 +00:00
Nick Mainsbridge
fc67efb64d more gcc 4.1 complaints, route_list is a ListStore
git-svn-id: svn://localhost/trunk/ardour2@256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-10 15:09:38 +00:00
Nick Mainsbridge
0a86aba6fa move range labels, attempt to make them look nicer, gcc 4.1 complaint
git-svn-id: svn://localhost/trunk/ardour2@255 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-10 12:33:26 +00:00
a9e38032a3 route list + edit group list now pretty much functional, plus preparations for ardour2.0-alpha1
git-svn-id: svn://localhost/trunk/ardour2@253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-10 04:25:47 +00:00
b5e4144156 fix control layout size allocation (nearly done) and make duplicate region even more useful for multiple selected regions
git-svn-id: svn://localhost/trunk/ardour2@250 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-08 14:50:41 +00:00
a20f41ab39 a metric ton of changes
git-svn-id: svn://localhost/trunk/ardour2@246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-08 02:56:49 +00:00
2fcdf14e2b lots of small fixes for various irritations, return of snapshots, region list hiding stuff, etc etc etc
git-svn-id: svn://localhost/trunk/ardour2@241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-05 03:18:44 +00:00
b75112adea make show all option on region list context menu work
git-svn-id: svn://localhost/trunk/ardour2@236 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 04:10:08 +00:00
Doug McLain
8073c4da5e add ability to specify row colors for region treeview
git-svn-id: svn://localhost/trunk/ardour2@220 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-01 15:31:59 +00:00
c1b2177d27 many options moved to menus, region list context menu sort of operational
git-svn-id: svn://localhost/trunk/ardour2@219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-31 18:20:42 +00:00
9d44c3b971 drag-n-drop to canvas from region list works
git-svn-id: svn://localhost/trunk/ardour2@218 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-30 20:38:41 +00:00
d43cc4e7b5 many changes, read the diffs
git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-30 00:34:21 +00:00
45addca9eb various changes to controls_layout size management
git-svn-id: svn://localhost/trunk/ardour2@205 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-24 02:17:47 +00:00