13
0
Commit Graph

57 Commits

Author SHA1 Message Date
490e18d80a Merged with trunk R1736.
git-svn-id: svn://localhost/ardour2/branches/midi@1737 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-22 18:01:10 +00:00
959a7909c1 Merged with trunk R1705.
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).


git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-12 23:20:37 +00:00
0e705129fd Merged with trunk R1622.
git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 07:07:38 +00:00
99904735e0 Merged with trunk R1612.
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-18 06:07:08 +00:00
f9f5ec85fb Merged with trunk R1393.
git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 17:44:13 +00:00
532f6aad4a Merged with trunk R1283.
NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 23:24:54 +00:00
fedf3d34f3 Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).


git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-21 19:01:50 +00:00
017e16c530 Merged with trunk R879
git-svn-id: svn://localhost/ardour2/branches/midi@880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-31 19:17:00 +00:00
25d1670a61 Merged with trunk R846
Removed some overly verbose debug printing


git-svn-id: svn://localhost/ardour2/branches/midi@847 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-24 07:37:17 +00:00
e51e31dca2 Merged from trunk R743
git-svn-id: svn://localhost/ardour2/branches/midi@744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-02 00:22:16 +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
216b012e0b A couple GUI tweaks - minor toolbar reorganization, trying to get the width down below 1024 (and make things more organized and easier to use in general). Not quite there yet....
git-svn-id: svn://localhost/ardour2/branches/midi@648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-28 07:08:10 +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
6a1f2919f2 Preliminary MMC sending
git-svn-id: svn://localhost/ardour2/branches/midi@614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-16 02:28:41 +00:00
e13e84677a Merged with trunk revision 610
git-svn-id: svn://localhost/ardour2/branches/midi@611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 22:31:13 +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
2fba6d0925 breakout control protocol code into LGPL library; fix panner buttons even more than nick did, plus some other bits and pieces
git-svn-id: svn://localhost/trunk/ardour2@522 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-23 19:54:52 +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
982d639d44 "The In-Flight Hack, 2006"
a) measure lines extend the full height of the canvas
b) region name color bars and text positioning now adjusted to match
     font size for different display resolutions
c) vertical scrollbar limited to cover visible tracks only


git-svn-id: svn://localhost/trunk/ardour2@486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-27 09:04:24 +00:00
028e1ebc4a a) completely refactor abstract UI code
b) single-thread Tranzport implementation
c) implement BasicUI to share functionality across multiple
     controllers
d) various minor fixes here and there


git-svn-id: svn://localhost/trunk/ardour2@468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-24 22:45:19 +00:00
a157537898 a) moved metering and meter falloff code into libardour
b) added initial "big meter" mode for tranzport
c) fixed some lock issues in ARDOUR::IO objects
d) generic_midi control surface module now compiles and loads


git-svn-id: svn://localhost/trunk/ardour2@450 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-10 03:54:00 +00:00
f7c82c6911 a) start at creating ControlProtocol objects
b) basic support for Frontier Design Tranzport
c) probably broke some aspect of existing generic MIDI feedback


git-svn-id: svn://localhost/trunk/ardour2@441 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-04 03:26:08 +00:00
9643eb4b23 a) persist whether the end marker should move at first capture in the session file
b) prevent transport motion if stop-at-session-end is true
c) ensure that (more) menu items that provide control over Configuration object options are in the correct state at startup
d) Configuration options removed from "have a session" sensitivity toggling
e) removed functionally empty default_keys.cc


git-svn-id: svn://localhost/trunk/ardour2@433 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-31 15:51:03 +00:00
e27ac3278b a) fix problems with multichannel tape tracks
b) separate data format and header format for native audio files
 c) expose data/header selections in GUI
 d) fix error in file naming for multichannel tape tracks
 e) remove blocks on GTK rc files during startup


git-svn-id: svn://localhost/trunk/ardour2@423 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-28 19:22:29 +00:00
ddfc8d2185 start marker implemented, along with GotoZero command for old behaviour; R binding for global rec-enable now works (menu item added)
git-svn-id: svn://localhost/trunk/ardour2@376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-11 16:01:06 +00:00
Doug McLain
58bd9bff8d Fixed newline typos
git-svn-id: svn://localhost/trunk/ardour2@369 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-10 04:37:30 +00:00
Jesse Chappell
1511423e4e capitalized menus. minor header fix
git-svn-id: svn://localhost/trunk/ardour2@365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-09 16:28:07 +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
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
da093c7939 restore many keybindings from ardour 0.99
git-svn-id: svn://localhost/trunk/ardour2@313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-07 13:58:33 +00:00
3caed4762b fix stupid gtk design quirk and bad documentation...oh and rebinding accels at runtime should work
git-svn-id: svn://localhost/trunk/ardour2@299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-27 10:17:34 +00:00
Nick Mainsbridge
ad2ee02728 a nice excuse for some keybindings, make some markers larger vertically
git-svn-id: svn://localhost/trunk/ardour2@282 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-20 12:36:24 +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
6ef5c8da56 add GUI support to create tape/destructive tracks
git-svn-id: svn://localhost/trunk/ardour2@278 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-19 05:01:43 +00:00
cd87dceb0f latched rec-enable
git-svn-id: svn://localhost/trunk/ardour2@277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-19 00:03:55 +00:00
Sampo Savolainen
cf70254127 "Run plugins while recording" -> "Do not run plugins while recording"
git-svn-id: svn://localhost/trunk/ardour2@251 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-09 17:40:00 +00:00
d20534e846 add destructive outlines, more action usage and state fixups in GUI
git-svn-id: svn://localhost/trunk/ardour2@247 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-08 05:19:38 +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
Taybin Rutkin
fd20404daa Updates for set_type_hint() and the sfdb_ui.
git-svn-id: svn://localhost/trunk/ardour2@239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 05:53:51 +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
541ff63201 button hacks and more
git-svn-id: svn://localhost/trunk/ardour2@200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-21 21:37:18 +00:00
32664137bd more fixes
git-svn-id: svn://localhost/trunk/ardour2@172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-06 06:23:50 +00:00
7d1f1eeb20 stock icons, transport controls as proxies, make ActionManager::get_action() work
git-svn-id: svn://localhost/trunk/ardour2@165 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-05 04:11:08 +00:00
4a19b4732f cleanup leftover problems from my commit yesterday; return of the windows
git-svn-id: svn://localhost/trunk/ardour2@149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-29 17:27:58 +00:00
3594285753 menu and action update
git-svn-id: svn://localhost/trunk/ardour2@143 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-29 03:53:24 +00:00
2b49b2433b mega commit to remove gtk_object cruft, and much other stuff
git-svn-id: svn://localhost/trunk/ardour2@139 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-28 22:36:26 +00:00
d6a27c9537 come up and stay up
git-svn-id: svn://localhost/trunk/ardour2@138 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-28 15:29:49 +00:00
f69abbff90 compiles and runs, but crashes ... duh
git-svn-id: svn://localhost/trunk/ardour2@113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-26 00:06:46 +00:00
fb45ffea71 strip keyboard.cc of noxious focus handling stuff, and cleanup
git-svn-id: svn://localhost/trunk/ardour2@106 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-23 04:13:32 +00:00
cdc2d055f1 more fixes on the long road to compiling
git-svn-id: svn://localhost/trunk/ardour2@103 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-17 21:31:37 +00:00