summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_strip.cc
AgeCommit message (Collapse)Author
2006-06-26Large nasty commit in the form of a 5000 line patch chock-full of completelyDavid Robillard
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-21Merged with trunkDavid Robillard
git-svn-id: svn://localhost/ardour2/branches/midi@628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15Merged with trunk revision 600David Robillard
git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-08Committed filthy mess of a working copy solely for moving between machines.David Robillard
Nothing to see here, move along now... git-svn-id: svn://localhost/trunk/ardour2midi@575 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-21Mixer strip layout, emsure correct column expands on treeviews, 'Manual' ↵Nick Mainsbridge
automation mode labels. git-svn-id: svn://localhost/trunk/ardour2@519 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-20Fix bus rec enable bug introduced in last commitNick Mainsbridge
git-svn-id: svn://localhost/trunk/ardour2@518 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-19Mixer strip & ui layout changesNick Mainsbridge
git-svn-id: svn://localhost/trunk/ardour2@514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-17Remove CannotRecordNoInput signal (allowing recording without input ↵Nick Mainsbridge
connections), provide visual indication of phase reverse, change e.g. 'gain automation' to 'fader automation', enforce mouse button 1 use in mixer strip, make button labels more consistent in mixer strip, disable io change/record enable when disconnected from jack on mixer strip, remove duplicated signal connections and typo in audio_time_axis.cc. git-svn-id: svn://localhost/trunk/ardour2@505 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-14Mixer strip uses button 1 where possible, make mouse click behaviour more ↵Nick Mainsbridge
consistent wrt popup menus. git-svn-id: svn://localhost/trunk/ardour2@504 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-14Don't show comments editor on the taskbar, position & resize it more ↵Nick Mainsbridge
sensibly and use word wrap. git-svn-id: svn://localhost/trunk/ardour2@503 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25All included libraries now link dynamically instead of statically.Taybin Rutkin
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-22Set button labels sanely.Nick Mainsbridge
git-svn-id: svn://localhost/trunk/ardour2@464 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-21Fixup for comments editor blocking presses to its buttonNick Mainsbridge
git-svn-id: svn://localhost/trunk/ardour2@462 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-20Comments button now indicates when comments are present, more dialog work ↵Nick Mainsbridge
(ask about saving, comments box etc.), code cleanups in mixer_strip.cc. git-svn-id: svn://localhost/trunk/ardour2@461 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-10a) moved metering and meter falloff code into libardourPaul Davis
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-03-30a) remove polarity button, add polarity menu item, move functionality into ↵Paul Davis
RouteUI b) correct switcheroo in function of active/visible columns for edit groups git-svn-id: svn://localhost/trunk/ardour2@431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-30fix color/style issue for mixer strip name buttonPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@430 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-30Oops! that mixer button code was broke, another one of these unrealized ↵Doug McLain
widget situations. back to normal for now... git-svn-id: svn://localhost/trunk/ardour2@429 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-30rc changes to fix invisible checkboxes in export dialog for some themes. ↵Doug McLain
Fixed the cut off text in the track name button at the top of each mixer strip (the colored button). The theme engine style is still lost at the moment. I'm still working on that, and thats why the commented code additions. git-svn-id: svn://localhost/trunk/ardour2@428 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-29a) fix special button press handling for solo+mute buttonsPaul Davis
b) buttons for "restore pending state" dialog had reversed semantics c) logic for checking a pending source file header was wrong d) fixed file unlink from within real-time context git-svn-id: svn://localhost/trunk/ardour2@424 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12remove varispeed control; shuttle controller now has a context menu with max ↵Paul Davis
speed options; rearrange and optimize meter metric displays git-svn-id: svn://localhost/trunk/ardour2@382 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12create xpm files from hard coded pixmaps, added function get_xpm() to make ↵Doug McLain
sure any xpm only gets load from disk once git-svn-id: svn://localhost/trunk/ardour2@379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-10Example code to load the x and <-> xpms for the mixer strip from files ↵Doug McLain
instead of from hard coded xpm data. git-svn-id: svn://localhost/trunk/ardour2@370 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-10further travels down the road toward true route group blissPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@368 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-09new mix group interface, not yet finished and still to propagate to edit_groupPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-08fix for erroneous use of a menu group; remove lots of cerr cruft; no ↵Paul Davis
playlist ops for destructive tracks git-svn-id: svn://localhost/trunk/ardour2@359 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-05export range markers patch (revisited), change selection model, copy-drag ↵Paul Davis
tempo+meter marker patch git-svn-id: svn://localhost/trunk/ardour2@349 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-14new color management design starts to take shape (canvas color only for now)Paul Davis
git-svn-id: svn://localhost/trunk/ardour2@326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-12mixer track list now uses checks and reordering properlyPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-08a metric ton of changesPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-18Don't resize the editor_mixer when changing tracks, gcc 4.1 fix, reorder ↵Nick Mainsbridge
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-14return functionality to mixerstrip buttonsDoug McLain
git-svn-id: svn://localhost/trunk/ardour2@190 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-14undo forgotten debug codeDoug McLain
git-svn-id: svn://localhost/trunk/ardour2@189 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-14trivial editor Combobox tweaksDoug McLain
git-svn-id: svn://localhost/trunk/ardour2@188 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-06un-triple-buffer fastmeter (not finished), fix mixer strip name button, ↵Paul Davis
comment editor, +++ git-svn-id: svn://localhost/trunk/ardour2@175 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-24advance compiling to the p*.cc pointPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@109 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-23strip keyboard.cc of noxious focus handling stuff, and cleanupPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@106 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-13some C++-ification of GnomeCanvasBlahNick Mainsbridge
git-svn-id: svn://localhost/trunk/ardour2@82 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-12incomplete changes based on karsten's megapatchPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@81 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-29nothing much.. a few more image from pixmapsNick Mainsbridge
git-svn-id: svn://localhost/trunk/ardour2@75 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-09"finalmunge" patch from nick, plus work on editor region list and actions ↵Paul Davis
infrastructure from me git-svn-id: svn://localhost/trunk/ardour2@52 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-06fix compose mess, and a number of 64 bit printf specsPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26continuing fixes to get this shibboleth to compilePaul Davis
git-svn-id: svn://localhost/trunk/ardour2@43 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26rename all GTK signalsPaul Davis
git-svn-id: svn://localhost/trunk/ardour2@42 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25replaced slot() with mem_fun() and ptr_fun().Taybin Rutkin
git-svn-id: svn://localhost/trunk/ardour2@29 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25Fly my pretties!Taybin Rutkin
git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25Initial import of gtk2_ardour.Taybin Rutkin
git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf