Commit graph

33 commits

Author SHA1 Message Date
David Robillard
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
David Robillard
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
Nick Mainsbridge
1242d9595c Mixer strip uses button 1 where possible, make mouse click behaviour more consistent wrt popup menus.
git-svn-id: svn://localhost/trunk/ardour2@504 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-14 19:02:14 +00:00
Jesse Chappell
c091b877cf brought the track/bus inspector back to life
git-svn-id: svn://localhost/trunk/ardour2@493 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-06 21:01:18 +00:00
Paul Davis
e22a48723e more tranzport lowlevel fixes and rebinding
git-svn-id: svn://localhost/trunk/ardour2@488 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-29 15:40:52 +00:00
Taybin Rutkin
49ab3aa0b3 All included libraries now link dynamically instead of statically.
Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.


git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25 20:23:50 +00:00
Nick Mainsbridge
dcd4c89f34 Prompter now prevents blank strings or unaltered names & now has a horizontal orientation. Rename marker now uses the ArdourPrompter.
git-svn-id: svn://localhost/trunk/ardour2@463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-22 15:28:59 +00:00
Nick Mainsbridge
d7e728476a Add a stock question image to the choices dialog, other general dialog love.. Forgot to mention that in the last commit the default snapshot name has been modified for slightly better alphabetical sorting goodness (year is now first, weekday last).
git-svn-id: svn://localhost/trunk/ardour2@459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-20 11:41:45 +00:00
Nick Mainsbridge
8ca561f8d3 Change ArdourPrompter to not have an OK button by default, clean up new track/bus dialog and change 'affirmative' button on ArdourPrompter dialogs, make 'jack isn't running' dialog a MessageDialog, standardise some capitalisation, add stock buttons to plugin selector, fix layout of presets in plugin_ui. Fix 'rename range' dialog.
git-svn-id: svn://localhost/trunk/ardour2@458 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-19 20:42:17 +00:00
Paul Davis
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
Paul Davis
004a49b0c7 Gtkmm2ext::Choice now inherits from Gtk::Dialog; embed/import rate mismatch dialog no longer hangs in recursive Main::run() call
git-svn-id: svn://localhost/trunk/ardour2@414 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-21 21:08:24 +00:00
Doug McLain
202fa5bb78 fix for another broken prompter
git-svn-id: svn://localhost/trunk/ardour2@402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-17 07:41:21 +00:00
Doug McLain
58375e9dfb set a smaller minimum RedirectBox height, allowing the mixer window height to be resized to a smaller size than was allowed, for us widescreen (aka shortscreen) laptop users :)
git-svn-id: svn://localhost/trunk/ardour2@400 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-16 08:22:59 +00:00
Paul Davis
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
Doug McLain
b62c348c88 another get_vbox() fix, this time for PortSelectorWindow
git-svn-id: svn://localhost/trunk/ardour2@346 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-05 10:24:31 +00:00
Paul Davis
2e582e03e4 a metric boatload of changes; plugin UIs work, adding tracks work, redirect list is useful again, and more
git-svn-id: svn://localhost/trunk/ardour2@273 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-17 16:40:57 +00:00
Nick Mainsbridge
f42c69103b Don't resize the editor_mixer when changing tracks, gcc 4.1 fix, reorder editor notepad slightly, don't use show () when constructing a mixer strip (it's shown later always)
git-svn-id: svn://localhost/trunk/ardour2@197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-18 13:19:02 +00:00
Doug McLain
03872f0916 Set fixed width for RedirectBox
git-svn-id: svn://localhost/trunk/ardour2@179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-07 22:52:58 +00:00
Paul Davis
3436df6eab the usual blob of fixes. note the requirement for ComboBoxText::set_active_text()
git-svn-id: svn://localhost/trunk/ardour2@160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-02 19:18:26 +00:00
Paul Davis
b1a99f89da remove <gtkmm/gtkmm.h> from all files, plus a small fix related to map/realize handling
git-svn-id: svn://localhost/trunk/ardour2@145 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-29 04:41:15 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
1f16781c75 slowly fixing up ArdourDialog nonsense
git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 21:17:41 +00:00
Paul Davis
c74f6577e2 ripping, tearing, shredding
git-svn-id: svn://localhost/trunk/ardour2@130 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 17:59:03 +00:00
Paul Davis
e48a9b49d6 more fixes for gobject stuff plus doug's patch for redirect box menus, minus ardour-menus.xml
git-svn-id: svn://localhost/trunk/ardour2@116 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-26 03:14:16 +00:00
Paul Davis
1ca802c4e8 io_selector.cc done, connection_editor in progress but skipped
git-svn-id: svn://localhost/trunk/ardour2@76 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-01 00:56:09 +00:00
Paul Davis
c38fdbc64c "finalmunge" patch from nick, plus work on editor region list and actions infrastructure from me
git-svn-id: svn://localhost/trunk/ardour2@52 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-09 05:03:29 +00:00
Paul Davis
4c50965622 fix compose mess, and a number of 64 bit printf specs
git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-06 19:10:57 +00:00
Paul Davis
4b23361226 continuing fixes to get this shibboleth to compile
git-svn-id: svn://localhost/trunk/ardour2@43 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26 18:24:59 +00:00
Paul Davis
08d33fcb0d rename all GTK signals
git-svn-id: svn://localhost/trunk/ardour2@42 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26 15:00:36 +00:00
Taybin Rutkin
d38e2213d7 replaced slot() with mem_fun() and ptr_fun().
git-svn-id: svn://localhost/trunk/ardour2@29 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 21:19:23 +00:00
Taybin Rutkin
e493b2b7c4 Fly my pretties!
git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 20:33:00 +00:00
Taybin Rutkin
209d967b1b Initial import of gtk2_ardour.
git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 18:42:24 +00:00