596d699b95
fix up dark theme to work with older versions of clearlooks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4316 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 22:55:53 +00:00
51625b2474
"merge" (i.e. wholesale import) 2.0-ongoing Mackie code and then fix to compile in 3.0 context
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4315 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 22:55:03 +00:00
Hans Baier
f03a87a132
* Prepared CanvasFlag (and thus ChanvasProgramChange) to be able to receive Scroll wheel events
...
* made changes in editor_canvas_events.cc to forward events to CanvasFlag (against pauls advice), but IMHO it doesnt add complexity to it since it only adds a few trivial lines which do the same which has already been done for CanvasNote and thus shouldnt complicate the merge in any way
git-svn-id: svn://localhost/ardour2/branches/3.0@4314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 22:04:22 +00:00
bc89fe0147
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 14:43:24 +00:00
Hans Baier
30daaebaa2
* fixed memory allocation bugs
...
* commented out a crash line in ardour_ui2.cc (added a warning message).
(I thought, it may be fairly efficient to keep issues as code instead of putting
them in the tracker where hardly ever one would notice the needle in the haystack)
* forgot to clear two other collections on MidiPatchManager::refresh()
git-svn-id: svn://localhost/ardour2/branches/3.0@4312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 06:57:38 +00:00
Hans Baier
6c1f365515
* reenabled assertions after irc-ing with drobilla
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 05:21:06 +00:00
Hans Baier
2c017baa4a
* fixed memory management bugs for midi patchname handling
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4310 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 05:17:53 +00:00
Hans Baier
ddbd296698
* converted two especially obnoxious assertions into warnings since they hinder my work and nobody seems to care about those issues anyway
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4309 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 03:34:36 +00:00
Hans Baier
971b8bf7cf
*typo
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-11 08:28:53 +00:00
Hans Baier
e009016b03
* added myself to about.cc
...
* created ArdourCanvas::CanvasFlag as a base class for flags
* removed obsolete cruft from midi_model
* made MidiTimeAxisView and MidiRegionView work together to display program changes as
names by means of MidiPatchManager
git-svn-id: svn://localhost/ardour2/branches/3.0@4307 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-11 08:06:27 +00:00
Hans Baier
dfed4965b7
* make patch selection appear only when there are patches loaded
...
* add combobox to select CustomDeviceMode
* add code to resolve patch names by their msb, lsb and program change number
git-svn-id: svn://localhost/ardour2/branches/3.0@4306 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-10 10:54:45 +00:00
Hans Baier
f8480d6392
* moved /midi_patch_manager.* to libs/ardour
...
* GUI improvement: do away with the midi channel expander
git-svn-id: svn://localhost/ardour2/branches/3.0@4305 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-09 08:35:02 +00:00
Hans Baier
457f06855e
* first working prototype of selecting instruments in the MIDI track header
...
* parsing patchfiles works
git-svn-id: svn://localhost/ardour2/branches/3.0@4304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-09 07:42:19 +00:00
42db44c193
merge 3870-3890 from 2.0-ongoing into 3.X (compiles, runs, no other promises
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 18:16:12 +00:00
752d8d4b6f
revert the only real change in that last commit,which was based on a bogus merge
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 17:20:02 +00:00
23294003f0
merge 3170-3180 of 2.X into 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4301 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 17:09:57 +00:00
3be16e8afb
partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 16:07:28 +00:00
Hans Baier
a9bb336fc4
* first primitive implementation of MidiPatchManager
...
* some cosmetic changes
* added midi_patch_path() to libs/ardour/ardour/session_directory.h
git-svn-id: svn://localhost/ardour2/branches/3.0@4299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 09:50:19 +00:00
Sakari Bergen
6974dbdcd2
Improve svn revision handling and make srctar "work". (The tarball is created, but it doesn't build...)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 09:03:36 +00:00
Hans Baier
72f55cd8b6
* completed MIDI::Name::MIDINameDocument and implemented its set_state-Method, added constructor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 05:00:20 +00:00
Hans Baier
c61283d35e
* changed all lists in midnam_patch.h to std::list
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4294 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 04:43:11 +00:00
Hans Baier
fc73f748b5
* completed MIDI::Name::MasterDeviceNames and implemented its set_state-Method
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 04:38:44 +00:00
Hans Baier
110170db95
* Added MIDI::Name::Note
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 00:07:07 +00:00
Hans Baier
4f185b3f36
* made MidiClockTicker Singleton
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-04 09:09:50 +00:00
Sakari Bergen
ed28f2e714
Fix thinko in export preset selector code
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-03 12:50:08 +00:00
Hans Baier
fbc248d70c
* minor cleanup
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-01 03:51:17 +00:00
Hans Baier
4c1aa58846
* reduced debugging output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4276 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-01 03:49:50 +00:00
Hans Baier
a1c1199713
* Sending MIDI Clock while looping works now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-01 03:07:11 +00:00
Sakari Bergen
a8cc30be5f
First revision with working track import
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-29 20:16:16 +00:00
Hans Baier
4af523ca38
* fixed potential crash
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-29 06:37:06 +00:00
Hans Baier
d746b78319
* sending MIDI clock works, hooray\!
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-29 05:40:17 +00:00
Hans Baier
5ed141cd14
* added Menu for sending midi clock
...
* hooked up MidiClockTicker to the session
git-svn-id: svn://localhost/ardour2/branches/3.0@4267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-26 23:32:55 +00:00
Sakari Bergen
38382b7921
More work on track import and some cleaning up of ElementImporter interface
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-26 17:13:50 +00:00
Hans Baier
95a86871c0
* the very humble beginnings of sending MIDI clock
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4263 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-26 09:50:29 +00:00
Sakari Bergen
23b1ff94b9
A bit more of track import done...
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-24 22:25:57 +00:00
Hans Baier
94537a47a1
* Added support for ChannelNameSetAssignments (midnam_patch.(cc|h)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4238 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-23 19:42:09 +00:00
Hans Baier
2f07b77503
* added XML deserialisation for control and program changes
...
* added pointer checks
* fixed typos in comments
git-svn-id: svn://localhost/ardour2/branches/3.0@4234 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-22 15:40:19 +00:00
Sakari Bergen
5de817c250
* Clean up (fix?) ExportStatus signal handling
...
* Fix problem in export dialog error reporting
* Sart implementing audio track importer (nothing very functional yet...)
git-svn-id: svn://localhost/ardour2/branches/3.0@4231 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-21 18:17:36 +00:00
7f66b71539
Apply LV2 changes from 2.0.
...
Completely and utterly untested.
git-svn-id: svn://localhost/ardour2/branches/3.0@4178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-14 22:14:15 +00:00
Hans Baier
146d60214c
* Enabled debugging output for start/stop messages on MidiClockSlave
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4107 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-07 20:37:27 +00:00
Hans Baier
6abd152d17
* removed unnecessary method calls (preparse/postparse) in JACK_MidiPort
...
* Changed calculation of current speed and transport position to double to avoid accumulating rounding errors
git-svn-id: svn://localhost/ardour2/branches/3.0@4106 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-07 20:31:05 +00:00
Hans Baier
72f286e10e
* removed obsolete MenuItem UseMIDIClock from ardour.menus
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4105 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-07 20:14:27 +00:00
Sakari Bergen
641dbfcaa2
* Fix problem with JACK being left in freewheeling after export
...
* Add quotes to cuefile filename entries
git-svn-id: svn://localhost/ardour2/branches/3.0@4098 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-06 20:22:48 +00:00
1d4b3c2f05
fix nasty bug in evaluation of final step of interpolated Curve values
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4085 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-03 07:41:53 +00:00
b12bedfe8a
initialize jack timeout parameter correctly (not doing this breaks JackOSX, maybe JACK too)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4077 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-01 12:26:53 +00:00
Hans Baier
13952beb51
*disabled debugging output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4033 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-30 06:28:21 +00:00
Hans Baier
4c90724d2d
* got MIDI clock working really smoothly (29 frames until sync, ardour transport jitter 1 frame)
...
* removed debugging output
git-svn-id: svn://localhost/ardour2/branches/3.0@4032 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-30 06:07:00 +00:00
Hans Baier
08470b7ed7
* disabled one line of debugging output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-29 08:19:38 +00:00
Hans Baier
0c72237f13
* fixed bug in Session::follow_slave: average_slave_delta wrapped around to huge positive values when slave lags behind master (ie deltas become negative)
...
* enabled some debugging output in Session::follow_slave (session_process.cc), beware!
git-svn-id: svn://localhost/ardour2/branches/3.0@4027 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-29 08:15:57 +00:00
Hans Baier
75e9180800
* added documentaion to libs/ardour/slave.h
...
* first roughly working midi clock slave
git-svn-id: svn://localhost/ardour2/branches/3.0@4025 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-29 07:17:07 +00:00