13
0
Commit Graph

34 Commits

Author SHA1 Message Date
ef6b25432d Merged with trunk R1141
git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 16:45:16 +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
7bd41538d9 Merged with trunk R920.
git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-19 03:29:16 +00:00
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
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
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
a8640ec0af removed the following environment variables:
ARDOUR_GLADE_PATH
	ARDOUR_RC
	ARDOUR_UI
	ARDOUR_UI_RC
	ARDOUR_BINDINGS
	ARDOUR_COLORS

They have been replaced with just one environment
variable called ARDOUR_PATH which can contain a number
of colon separated paths that are used to find various
configuration and data files. Files located in
ARDOUR_PATH have priority over files in ~/.ardour/ and
in the system path.

Moved two member functions of the Configuration class
into globals.cc as they should of been static and I'm
trying to keep the non-portable code together when it
makes sense.


git-svn-id: svn://localhost/trunk/ardour2@380 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 16:19:03 +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
Sampo Savolainen
60dc0ef48f Edit menu reorganization, abort if problems with ardour.menus.
git-svn-id: svn://localhost/trunk/ardour2@304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-28 23:45:06 +00:00
5a381e9651 a few small things
git-svn-id: svn://localhost/trunk/ardour2@295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-24 12:38:33 +00:00
bf5b28693a renamed menu definition file
git-svn-id: svn://localhost/trunk/ardour2@254 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-10 04:41:09 +00:00
feed0fc333 radio actions now display correctly, region list sorting works
git-svn-id: svn://localhost/trunk/ardour2@227 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-02 18:10:29 +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
Karsten Wiese
af40be3006 Keep ref_count balanced
git-svn-id: svn://localhost/trunk/ardour2@212 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-28 12:32:16 +00:00
Karsten Wiese
f5d49dd7d7 ActionManager::register_action (RefPtr<ActionGroup> group, const char * name, const char * label, slot<void> sl) :
call
	Gtk::ActionGroup::add(const Glib::RefPtr<Action>& action)
only once.
not twice like before through calling
	ActionManager::register_action (RefPtr<ActionGroup> group, const char * name, const char * label)


git-svn-id: svn://localhost/trunk/ardour2@210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-24 21:19:04 +00:00
f69c9ed564 lots and lots of keybindings working again, with lots more menu items
git-svn-id: svn://localhost/trunk/ardour2@209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-24 18:25:26 +00:00
Karsten Wiese
24e9a93968 change foo(string bar) to foo(const char * bar) for foo()s only being called with C-string args.
git-svn-id: svn://localhost/trunk/ardour2@202 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-22 13:01:39 +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
Taybin Rutkin
6039331bea Part one of the sfdb reworking.
git-svn-id: svn://localhost/trunk/ardour2@180 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-07 22:57:47 +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
Taybin Rutkin
f2c09c7a7a Dialogbox checkmarks turn off when dialogs are closed.
git-svn-id: svn://localhost/trunk/ardour2@164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-02 22:12:56 +00:00
ad80285548 more fixes to get things moving along
git-svn-id: svn://localhost/trunk/ardour2@151 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-29 22:48:54 +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
655be077fa action and glade path stuff
git-svn-id: svn://localhost/trunk/ardour2@121 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-26 12:08:33 +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
3ff9964885 advance compiling to the m*.cc point
git-svn-id: svn://localhost/trunk/ardour2@108 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-24 14:59:36 +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
1424e6ca6f add copyright, and test loginfo fix in CVS
git-svn-id: svn://localhost/trunk/ardour2@93 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-14 16:28:45 +00:00
solido
15f82a6428 fixed namespace issue
git-svn-id: svn://localhost/trunk/ardour2@83 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-13 11:47:42 +00:00
1a3a776077 incomplete changes based on karsten's megapatch
git-svn-id: svn://localhost/trunk/ardour2@81 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-12 22:07:07 +00:00
2634aaadc5 added new files
git-svn-id: svn://localhost/trunk/ardour2@61 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-17 15:12:50 +00:00