ardour/livetrax
13
0
Fork 0
Code
24,765 Commits 1 Branch 1 Tag 194 MiB
11b4da078a
Commit Graph

341 Commits

Author SHA1 Message Date
Paul Davis
50f179b33e ipMIDI: credit where credit is due 
git-svn-id: svn://localhost/ardour2/branches/3.0@12074 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 03:19:10 +00:00
Paul Davis
33140f3267 add support for IP MIDI (multicast MIDI over IP UDP sockets) to ardour and use it if requested inside MCP code. required renaming the pre-existing MIDI::Port as MIDI:JackMIDIPort - MIDI::Port becomes the base type for both JackMIDIPort and IPMIDIPort 
git-svn-id: svn://localhost/ardour2/branches/3.0@12069 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 02:28:51 +00:00
Paul Davis
6ca4b88d5a libmidi++: fix a bunch of issues with previous commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12065 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-23 16:23:48 +00:00
Paul Davis
1660f00ff3 libmidi++: split apart "base-y" aspects of MIDI::Port into MIDI::PortBase and make MIDI::Port derive from it. This actually makes MIDI::Port effectively into MIDI::JackPort, but i'm not interested in the name changing at that level at this moment in time 
git-svn-id: svn://localhost/ardour2/branches/3.0@12064 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-23 15:29:45 +00:00
Carl Hetherington
4b63b88e35 Remove some unused parameters. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11917 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 20:21:00 +00:00
Paul Davis
893b468858 add "centrally-parsed" property to MIDI::Port so that we can avoid the MidiUI loop from handling input for *all* MIDI ports created 
git-svn-id: svn://localhost/ardour2/branches/3.0@11871 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-10 16:27:01 +00:00
Paul Davis
8f4e126c72 a lot of tweaking and fixing for the MIDNAM parsing code so that it correctly handles all 44 sample files from digicake.com/midnams. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11734 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-20 18:01:59 +00:00
Paul Davis
009c7a9e44 attempt to stop sending MMC/MTC while exporting or freewheeling for any reason 
git-svn-id: svn://localhost/ardour2/branches/3.0@11457 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-06 17:09:53 +00:00
Paul Davis
f4f2a9a111 fix bug in MidiClock that sent MIDI Clock messages with negative offsets after a loop point 
git-svn-id: svn://localhost/ardour2/branches/3.0@11456 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-06 15:05:18 +00:00
Carl Hetherington
084cd5ffda Add basic test of playlist layering. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11011 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-15 14:33:20 +00:00
Paul Davis
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger 
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-30 17:55:14 +00:00
David Robillard
c1ef7b14a3 Remove use of waf compat15 tool. 
Always load waf tools first (prevent smashing of --debug, DATADIR, etc).


git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-29 19:58:05 +00:00
David Robillard
723ab60b39 Upgrade to waf 1.6.7 and autowaf r52. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-29 19:17:54 +00:00
Carl Hetherington
1f1abd0646 Correct signal handling for previous commit. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10130 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-26 21:03:11 +00:00
Carl Hetherington
a7dc433498 Delete MIDI port objects when the MackieControlProtocol is torn down, so that it can be recreated without attempting to create duplicate JACK port names. Should fix #3886. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10129 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-26 20:35:16 +00:00
Carl Hetherington
d6112f1213 Use RCU for MIDI Manager's port list. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10128 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-26 20:35:09 +00:00
David Robillard
4769db412d Fix Python whitespace (follow PEP8 guidelines, reformatted by Python Reindent) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9409 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-22 22:15:21 +00:00
David Robillard
0906b39918 Fix my name :) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9302 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-06 15:00:16 +00:00
Carl Hetherington
02cfe41bff Update region peak amplitude when the region is trimmed (#3931). 
git-svn-id: svn://localhost/ardour2/branches/3.0@9276 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-04 12:21:26 +00:00
David Robillard
9850407bd9 Indent python files with spaces as per style guide. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9158 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-16 16:32:56 +00:00
David Robillard
4b861e6039 Rename libmusictime libtimecode (consistent with already used namespace "Timecode"). 
Move BBT_Time to libtimecode.


git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-14 18:13:37 +00:00
David Robillard
f6055f2c6f Eliminate circular dependency kludge for control_protocol/smpte.o. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8262 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-13 20:46:07 +00:00
Carl Hetherington
73192bc1a7 Remove all use of nframes_t. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-03 22:26:29 +00:00
Carl Hetherington
ba6d6895f7 assert() which catches one source of crashes on startup when Ardour starts JACK. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7926 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-10-27 21:18:32 +00:00
Paul Davis
aef355525f delete, not comment, for the last commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@7897 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-10-14 13:11:13 +00:00
Paul Davis
58416460ad do not attempt to clear a (JACK) MIDI port buffer after registering the port, this is not a legal access to a JACK port buffer 
git-svn-id: svn://localhost/ardour2/branches/3.0@7896 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-10-14 13:10:42 +00:00
Carl Hetherington
5d8933893c Put MIDI sync ports in the Ardour tab of the port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7527 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-01 10:26:19 +00:00
Carl Hetherington
21fd76ef9a Fix startup of the mackie surface code. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7520 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-29 19:24:25 +00:00
Paul Davis
f2df65db6a part two of: don't crash during startup with no config files when trying to use a non-existent MIDI Manager object 
git-svn-id: svn://localhost/ardour2/branches/3.0@7501 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-26 15:28:59 +00:00
Carl Hetherington
0fb9c79d8d Patch from petem to initialise inbound MMC device ID to 0x7f. Fixes #2853. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7496 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-25 23:55:45 +00:00
Carl Hetherington
648a169d8f Move MIDI control port ownership into the MIDI Manager, since control port state should be Ardour-wide, not per-session. Fix up port connection state management. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7394 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-08 22:55:20 +00:00
Carl Hetherington
4885f29be1 Trim midi++ port code to either do in or out, but not both in the same object. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7391 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-08 01:00:46 +00:00
Carl Hetherington
ea23298f10 Setup fixed ports for MIDI control data; hence remove configuration of those ports. Move MIDI tracer to the Windows menu. Trim some unused code from the midi++ Manager. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7384 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-07 00:40:58 +00:00
Carl Hetherington
d3b422d064 Remove file that should have gone earlier. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7379 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-06 01:18:14 +00:00
Carl Hetherington
ff8ea4d2f2 Remove MMC thread protection which is pointless now that only JACK MIDI ports are used for output, which themselves can cope with multi-threaded access. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7378 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-06 00:27:03 +00:00
Carl Hetherington
91850f0eb4 Remove non-JACK midi++ ports. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7377 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-06 00:16:36 +00:00
Paul Davis
dc1e5d09a2 require jack 0.118.2 for weakjack.h 
git-svn-id: svn://localhost/ardour2/branches/3.0@7375 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-05 16:28:45 +00:00
Carl Hetherington
df2298c846 Reestablish libmidi++ JACK ports on jack reconnection, so that control MIDI can still be sent after a JACK disconnect/reconnect. Fixes remainder of #3301. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7373 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-05 15:41:05 +00:00
Carl Hetherington
839402778f Prevent assertion failure if _jack_output_port is 0, which can happen if JACK is disconnected. Improves #3301. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7371 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-05 01:13:52 +00:00
Carl Hetherington
bde4d3f341 Fix up my previous buggy MMC cleanup. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7363 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-03 00:11:33 +00:00
Paul Davis
d4db53e554 fix gcc4.4 compile warnings 
git-svn-id: svn://localhost/ardour2/branches/3.0@7348 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-01 15:02:54 +00:00
Carl Hetherington
bebeb5abec Fix comment 
git-svn-id: svn://localhost/ardour2/branches/3.0@7326 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-29 19:07:22 +00:00
Carl Hetherington
ce8d79d621 Restore MMC registers. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7325 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-29 14:04:19 +00:00
Carl Hetherington
9469d6b26a Clean up MMC transmission a bit, and make sure that it is all done from one thread. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7324 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-29 13:47:53 +00:00
Paul Davis
1e728e728a basically, fix all kinds of odds and ends with MIDI playback, including missed notes and applying gain 
git-svn-id: svn://localhost/ardour2/branches/3.0@7247 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-09 13:00:54 +00:00
Paul Davis
b12f624890 modified version of a patch from robin gareus to avoid leaving pointers to data buffers owned by Session as the buffer for a JACK MIDI event. Robin - it would be good if you could test and confirm (email?) that my modified version also works 
git-svn-id: svn://localhost/ardour2/branches/3.0@7218 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-03 12:37:32 +00:00
Carl Hetherington
0e0beef90f Fix some excessive search-and-replaces. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7104 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-15 23:57:41 +00:00
Paul Davis
a48742043b remove PBD::Connection (replace use with PBD::ScopedConnection); remove limitation on transport roll after session end 
git-svn-id: svn://localhost/ardour2/branches/3.0@6834 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-02 15:24:53 +00:00
David Robillard
29015dc5df Fix MIDI command names smashed by overzealous sedding. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6703 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-19 21:59:29 +00:00
Paul Davis
ce7a5e1c9f the Properties & 64bit region commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-18 13:59:49 +00:00
Paul Davis
ae1abc4ea6 fix up boost signal return value so that the "edit" signal of MIDI::Parser works properly, and thus allows MIDI Clock etc. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6607 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-01 04:08:49 +00:00
Paul Davis
7941c074f5 remove some non-controllable debugging output from libs/midi++2/mtc.cc 
git-svn-id: svn://localhost/ardour2/branches/3.0@6577 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-27 18:50:24 +00:00
Paul Davis
4dc34d5fd9 something for chris g. to try when he gets up before me 
git-svn-id: svn://localhost/ardour2/branches/3.0@6573 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-27 03:26:41 +00:00
Paul Davis
6236cf7df2 more debug 
git-svn-id: svn://localhost/ardour2/branches/3.0@6563 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-27 00:17:01 +00:00
Paul Davis
40a6c4f1a0 debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@6562 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-26 22:23:15 +00:00
Paul Davis
4abb46a7d5 fix my usual geometric/geographic dyslexia w.r.t jack midi port connection restoration 
git-svn-id: svn://localhost/ardour2/branches/3.0@6443 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-04 18:14:17 +00:00
Paul Davis
59a61c4357 fix crash caused by closing down JACK but not telling JACK_MidiPorts about it 
git-svn-id: svn://localhost/ardour2/branches/3.0@6412 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-30 02:58:57 +00:00
Paul Davis
77cc0f7cc8 editors for control protocols (generalized); editor for Generic MIDI that allows choosing a MIDI binding map (or none); support banking in binding URLs, and other miscellany related to generic MIDI; save+restore JACK_MidiPort connection state (but cause a crash at shutdown time) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6411 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-29 21:31:14 +00:00
Paul Davis
c83389b8ec cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-22 20:21:43 +00:00
Paul Davis
f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-21 18:23:07 +00:00
Paul Davis
738387f9a4 remove a couple of boost::signals2 trouble spots; fix some --strict compile time warnings 
git-svn-id: svn://localhost/ardour2/branches/3.0@6378 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-20 16:50:41 +00:00
Paul Davis
aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters 
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-19 20:26:31 +00:00
Paul Davis
f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash 
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-17 18:24:23 +00:00
Paul Davis
6ab765e8fa add solo isolate indicator in editor route list 
git-svn-id: svn://localhost/ardour2/branches/3.0@6343 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-10 20:51:35 +00:00
Paul Davis
c38e02285f major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI and AbstractUI; solo & mute are both temporarily broken; OSC control up next; may segfault during exit 
git-svn-id: svn://localhost/ardour2/branches/3.0@6328 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-09 03:05:14 +00:00
Taybin Rutkin
52b4b464f9 Merged revisions 6292,6294-6295,6311,6314 via svnmerge from 
svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes

........
  r6292 | trutkin | 2009-12-05 08:31:25 -0500 (Sat, 05 Dec 2009) | 1 line
  
  remove scons build files
........
  r6294 | trutkin | 2009-12-05 09:11:17 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  cairomm
  remove unnecessary vendor libraries as we now rely on the developer to install them
........
  r6295 | trutkin | 2009-12-05 09:12:54 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  soundtouch
  remove unnecessary vendor libraries as we now rely on the developer to install them
........
  r6311 | trutkin | 2009-12-05 23:38:49 -0500 (Sat, 05 Dec 2009) | 2 lines

  glibmm2, gtkmm2, libgnomecanvasmm, sigc++2  
  remove unnecessary vendor libraries as we now rely on the developer to install them
........
  r6314 | trutkin | 2009-12-06 09:15:49 -0500 (Sun, 06 Dec 2009) | 4 lines
  
  remove scons referencing from Makefile
  
  - TODO: should move cscope stuff to waf and get rid of the Makefile
........


git-svn-id: svn://localhost/ardour2/branches/3.0@6315 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-06 14:21:46 +00:00
Taybin Rutkin
3fdcba1859 Merged revisions 6293,6296-6306,6308 via svnmerge from 
svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes

........
  r6293 | trutkin | 2009-12-05 08:49:37 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  fix if-statement in build script
........
  r6296 | trutkin | 2009-12-05 09:30:19 -0500 (Sat, 05 Dec 2009) | 5 lines
  
  rearrange GTKOSX and darwin dependencies
  
  - moved some GTKOSX include paths to generic darwin
  - made GTKOSX dependent on being on darwin anyways
........
  r6297 | trutkin | 2009-12-05 09:35:09 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  move coreaudio and audiounit handling to darwin section
........
  r6298 | trutkin | 2009-12-05 09:53:40 -0500 (Sat, 05 Dec 2009) | 3 lines
  
  use True/False instead of 1/0
  fix another if-statement where it should be an elif-statement
........
  r6299 | trutkin | 2009-12-05 14:11:09 -0500 (Sat, 05 Dec 2009) | 10 lines
  
  fixes to get libardour building
  
  - can't cast away volatile, so copy _transport_frame before emitting it.
  - const_reverse_iterator::operator!=() isn't defined in this version of gcc.
  - removed annoying HERE WE ARE CAAudioFile.h #warning.
  - removed unnecessary include of sndfile.h in session.h.
  - we don't want to set -march=i686 on the mac, so indent this if-statement so
    it's only run on linux.
  - DEBUG_STR() fails in the NDEBUG case, so wrap its use in an #ifndef NDEBUG
........
  r6300 | trutkin | 2009-12-05 15:48:29 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  remove old scons-style CXXFLAGS_FOO in favor of just CXXFLAGS
........
  r6301 | trutkin | 2009-12-05 16:01:10 -0500 (Sat, 05 Dec 2009) | 8 lines
  
  clean up configure flags
  
  - removed useless --aubio and --syslibs flags.  The syslibs value is ignored 
    as we don't bring our own libraries with us anymoreand we use aubio 
    automatically if it's available
  - added ways to turn off fpu_optimization and NLS
  - fixed compiling on the mac without fpu_optimization
........
  r6302 | trutkin | 2009-12-05 18:12:46 -0500 (Sat, 05 Dec 2009) | 5 lines
  
  go back to prior uselib method for COREAUDIO, AUDIOUNIT, and GTKOSX
  
  - fixed compile of CoreAudioSource
  - re-did inclusion of coremidi_midiport.cc to depend on COREAUDIO presence
........
  r6303 | trutkin | 2009-12-05 18:59:02 -0500 (Sat, 05 Dec 2009) | 5 lines
  
  fixed compiler warnings about classes with virtual member functions, but no virtual destructor.
  
  - Changed Metering to not use foo() = 0; to indicate it shouldn't be instantiated, but
    private: Metering(), which is more idiomatic.
........
  r6304 | trutkin | 2009-12-05 19:25:41 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  TOP_MENUBAR isn't used when building ardour.menus.  Removed.
........
  r6305 | trutkin | 2009-12-05 19:46:11 -0500 (Sat, 05 Dec 2009) | 5 lines
  
  fix some AudioUnit compile errors
  
  - update AudioUnit to use ChanCount
  - fix some namespacing issues in audio_unit.h
........
  r6306 | trutkin | 2009-12-05 20:08:48 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  make --extra-warn useful
........
  r6308 | trutkin | 2009-12-05 22:59:42 -0500 (Sat, 05 Dec 2009) | 10 lines
  
  fix compiling/linking with --coreaudio
  
  - rearrange ardour_ui.h header in editor.cc to avoid conflict
  - midi++ depends on OSX as well as COREAUDIO
  - fixed including frameworks
  - tweaked --extra-warn again.  it's kinda redundent with --strict
  - improved indentation in wscript
  - use #ifdef HAVE_COREMIDI, not #if HAVE_COREMIDI.  #if isn't interchangable
    with #ifdef and won't work if HAVE_COREMIDI is defined with no value.
........


git-svn-id: svn://localhost/ardour2/branches/3.0@6310 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-06 04:35:48 +00:00
Paul Davis
28c6305fab fix for first of taybin's 2 problems - do not use uninitialized Port* in check on existing devices 
git-svn-id: svn://localhost/ardour2/branches/3.0@6307 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-06 03:02:45 +00:00
Paul Davis
03c74e45a8 more tweaks to MTC slave code (still not functional), including removing race conditions when resetting slave state; make Session catch on its own saved preferences, which has not been happening; make switching sync sources avoid race conditions 
git-svn-id: svn://localhost/ardour2/branches/3.0@6269 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-03 18:44:06 +00:00
Paul Davis
9dddffcc8f more MTC stuff, including toggleable use of torben's PI controller 
git-svn-id: svn://localhost/ardour2/branches/3.0@6265 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-02 21:26:26 +00:00
Paul Davis
b6d418f3c2 make ALSA MIDI I/O work with timestamps; more MTC debug tracing 
git-svn-id: svn://localhost/ardour2/branches/3.0@6258 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-01 21:28:31 +00:00
Paul Davis
b825b86862 generalize hans' midi_clock_timestamp to be a general timestamp for incoming MIDI data (from JACK); make JACK_MidiPort::read() abort, because it should never ever be called; make JACK_MidiPort::~JackMIDIPort() unregister ports when it is destroyed; pass along the timestamp to MTC qtr and full signals 
git-svn-id: svn://localhost/ardour2/branches/3.0@6254 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-01 18:31:00 +00:00
Paul Davis
50131b3751 continue with MTC debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@6250 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-01 15:46:25 +00:00
Paul Davis
d2426538ad more changes to try to improve MTC handling even in slightly pathological cases 
git-svn-id: svn://localhost/ardour2/branches/3.0@6245 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-01 13:24:08 +00:00
Paul Davis
cbf900d71f show qtr MTC bytes before they are dispatched as a signal, even more 
git-svn-id: svn://localhost/ardour2/branches/3.0@6225 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-30 19:11:04 +00:00
Paul Davis
d1a75f494f show qtr MTC bytes before they are dispatched as a signal 
git-svn-id: svn://localhost/ardour2/branches/3.0@6224 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-30 19:01:13 +00:00
Paul Davis
47c88ff7d1 support for MMC track mute register, in addition to existing track record status register 
git-svn-id: svn://localhost/ardour2/branches/3.0@6156 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-23 17:34:11 +00:00
Paul Davis
67601c6c50 fix stupid MIDI::Manager design to properly handle multiple MIDI ports with the same "device" specification 
git-svn-id: svn://localhost/ardour2/branches/3.0@6079 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-13 19:50:39 +00:00
Paul Davis
498dfebcca 90% done with external sync design changes (GUI now has toggle switch for ext/int sync; source chosen separately, currently in ardour prefs dialog ; fix libmidi++ and compilation scripts to correctly build JACK+ALSA support; minor contiuing tweaks on transport stuff 
git-svn-id: svn://localhost/ardour2/branches/3.0@6048 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-09 20:05:18 +00:00
David Robillard
bc56eb8bd7 Fix unused parameter warnings since GCC apparently doesn't feel like listening to -Wno-unused-parameter 
git-svn-id: svn://localhost/ardour2/branches/3.0@5835 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-21 00:15:42 +00:00
David Robillard
6bef95806e Fix crash with input (not duplex) control MIDI ports. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5829 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-20 22:33:08 +00:00
Paul Davis
8713667ec1 rework Stateful::set_state() patch to avoid default version argument 
git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-15 18:56:11 +00:00
Carl Hetherington
79f91c7a20 Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty. 
LOADING 2.X SESSIONS WITH THIS COMMIT IN PLACE WILL (PROBABLY) CORRUPT THE .ardour FILE,
MAKING THE SESSION UNLOADABLE ON 2.X AND LOSING INFORMATION.

So don't do that unless you make a backup of the session file first.



git-svn-id: svn://localhost/ardour2/branches/3.0@5786 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-15 00:57:55 +00:00
Paul Davis
07be98b341 (1) silence non-process FIFO message (2) move MIDI state tracking down to the MidiPort level (3) forward port the PRIVATE_JACK pointer "fix" from 2.X 
git-svn-id: svn://localhost/ardour2/branches/3.0@5774 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-14 17:35:33 +00:00
Carl Hetherington
127b8a62b7 Normalise names of .cc and .h files. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5664 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-15 16:49:15 +00:00
David Robillard
3804e3bc49 Update autowaf. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5414 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-22 20:51:13 +00:00
Carl Hetherington
b65f8073ba Fix some unused parameter warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-21 15:55:17 +00:00
Paul Davis
88beef2e93 merge pre- and post-fader processor boxes; start removing Placement (not finished) ; add -DWAF_BUILD and use per-directory foobar-config.h to correctly pick up configure-time settings like HAVE_OGG ; check for libgiomm (part of upgrade to newer gtk stack); 32 bit marker reload fix from 2.X; audiounit IO config cache fix from 2.X; multi-add route template fix from 2.X; plugin GUI delete fix from 2.X; solo button labels are A or P for listen mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@5344 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-13 00:26:28 +00:00
Paul Davis
e6eb059576 the big Route structure refactor. !!!! THIS WILL ***NOT LOAD*** PRIOR 3.0 or 2.X SESSIONS !!!! BREAKAGE IS EXPECTED !!!! IF YOU HAVE AND NEED A WORKING 3.0 DO **NOT** UPDATE. !!!! otherwise, update and enjoy the steadily emerging joys of this major reworking of ardour internals 
git-svn-id: svn://localhost/ardour2/branches/3.0@5137 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-06-09 20:21:19 +00:00
Carl Hetherington
01217e64f8 Patch from agorka to add some includes required for building with the GCC shipped with Ubuntu Karmic. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5098 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-18 00:21:17 +00:00
Carl Hetherington
3b89d9eaa0 Remove most using declarations from header files. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-12 17:03:42 +00:00
David Robillard
d3d1e2c286 Strip trailing whitespace from waf scripts. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5045 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-04 22:10:15 +00:00
Carl Hetherington
0ac5ef6fab Fix compile. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4749 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-03-09 18:34:04 +00:00
David Robillard
903c0863d9 Waf: install stuff 
git-svn-id: svn://localhost/ardour2/branches/3.0@4702 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-27 04:40:44 +00:00
David Robillard
76f242cb80 Version file building stuff. 
Ardour should now compile from a fresh svn checkout using only waf.


git-svn-id: svn://localhost/ardour2/branches/3.0@4671 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-26 02:24:16 +00:00
David Robillard
3bc71af0ca Clean up checks. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4667 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-26 00:05:51 +00:00
David Robillard
0c0e689d3c Waf building of gtk2_ardour. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4662 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-25 23:21:49 +00:00
David Robillard
e0aaed6d65 *** NEW CODING POLICY *** 
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-25 18:26:51 +00:00
David Robillard
16d9776646 Move waf up to top level, waf building of pbd, evoral, midi++ 
git-svn-id: svn://localhost/ardour2/branches/3.0@4654 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-25 17:51:42 +00:00
David Robillard
caf103c0af Fix warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4653 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-25 17:39:19 +00:00
David Robillard
1f9c3f34d9 Fix MIDI controller feedback. 
Make control surfaces menu less weird.


git-svn-id: svn://localhost/ardour2/branches/3.0@4625 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-18 20:53:54 +00:00
David Robillard
2463be97f7 Make sure Evoral::MIDIEvent XML stuff is entirely unused in midi++ for now (resolve ticket #0002491). 
Remove empty midi++ README etc files (and ancient nearly-empty midi++ ChangeLog).


git-svn-id: svn://localhost/ardour2/branches/3.0@4621 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-18 18:04:54 +00:00
David Robillard
166ef64e3d Make (MIDI) event time stamp type a template parameter. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4473 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-02 02:36:05 +00:00
David Robillard
e666c8e98f Templateify MidiBuffer iterators (avoid code duplication since they're about to get less trivial). 
Clean up MidiBuffer code.


git-svn-id: svn://localhost/ardour2/branches/3.0@4469 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-01 03:15:31 +00:00
Hans Baier
3705a2d630 * MIDI control lanes: Set Interpolationtype according to Parameter 
git-svn-id: svn://localhost/ardour2/branches/3.0@4452 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-01-28 04:55:31 +00:00
Hans Baier
625507fc1a * extend MIDNAM support (PatchBanks containing the bank select MIDI Commands) 
git-svn-id: svn://localhost/ardour2/branches/3.0@4409 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-01-15 03:13:24 +00:00
Hans Baier
e9a9fe30cf * added comments to midi_region_view.h 
* implemented choosing patches with context menu on the program change flag
* added convenience method and a little refactoring in midi_patch_manager.h

Conflicts:

	.cproject
	build-tmp.sh


git-svn-id: svn://localhost/ardour2/branches/3.0@4338 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-23 06:03:45 +00:00
Carl Hetherington
058e7f2c01 Fix #2478; deref of 0 pointer if jack_port_register fails. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4328 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-17 00:44:08 +00:00
Hans Baier
5e7ae490c1 * first working prototype of changing program changes by scroll wheel (still some automation points issues) 
git-svn-id: svn://localhost/ardour2/branches/3.0@4324 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-15 11:05:41 +00:00
Hans Baier
bf7e792e3e * some refactoring of patch name stuff in preparation for altering program changes events 
git-svn-id: svn://localhost/ardour2/branches/3.0@4323 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-14 22:56:44 +00:00
Paul Davis
493339e969 fix up java-style expression to have correct C++ semantics 
git-svn-id: svn://localhost/ardour2/branches/3.0@4318 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-13 14:02:28 +00:00
Paul Davis
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
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
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
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
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
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
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
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
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
fd824717a7 * fixed jitter problems for midi clock and removed superfluous UI elements 
git-svn-id: svn://localhost/ardour2/branches/3.0@4008 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-10-25 08:28:10 +00:00
David Robillard
a2d2f738cb Move event specific ringbuffer stuff to evoral. 
Sane event type interface between evoral and libardour (no more shared magic numbers).
Cleanup Evoral::Sequence iterator, fix bugs, probably introduce new ones.
Move MIDI specific event functions to Evoral::MIDIEvent (is-a Evoral::Event).


git-svn-id: svn://localhost/ardour2/branches/3.0@3785 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-09-22 16:28:02 +00:00
David Robillard
d357eca668 Factor out sequencing related things into an independant new library: "evoral". 
Anything related to the storage of events/values over a range of time lives in evoral.
This includes MidiModel (Evoral::Sequence) and automation data (AutomationList (Evoral::ControlList),
	Automatable (Evoral::ControlSet), etc).
libs/evoral synced with http://svn.drobilla.net/lad/trunk/evoral r1511.


git-svn-id: svn://localhost/ardour2/branches/3.0@3754 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-09-19 00:47:49 +00:00
Paul Davis
1c299d5a5c merge Sakari's (sbergen) branch back into 3.0, removing libsndfile and adding taglib 
git-svn-id: svn://localhost/ardour2/branches/3.0@3736 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-09-17 08:44:51 +00:00
Paul Davis
68e943265e merge from 2.0-ongoing @ 3581 
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-09-10 15:03:30 +00:00
Hans Baier
8164a0992d * fixed JACK_MidiPort to get the events into the slave 
git-svn-id: svn://localhost/ardour2/branches/3.0@3662 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-08-06 22:22:35 +00:00
Hans Baier
ed990de604 * first implementation of MIDI Clock Slave support 
git-svn-id: svn://localhost/ardour2/branches/3.0@3652 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-08-04 22:37:24 +00:00
Jesse Chappell
01f18f325f fixed pitchbend byte ordering 
git-svn-id: svn://localhost/ardour2/branches/3.0@3608 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-07-15 04:08:49 +00:00
Paul Davis
449aab3c46 rollback to 3428, before the mysterious removal of libs/* at 3431/3432 
git-svn-id: svn://localhost/ardour2/branches/3.0@3435 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-06-02 21:41:35 +00:00
Doug McLain
9c0d7d72d7 remove empty sigc++2 directory 
git-svn-id: svn://localhost/ardour2/branches/3.0@3432 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-06-02 05:02:28 +00:00
Hans Baier
911c5717bc * splitted midi++/event.h in header and implementation 
* added to_string(), to_xml() and from_xml() to MIDI::Event
* added partial support for midnam-Patchfiles (http://www.sonosphere.com/dtds/MIDINameDocument.dtd): midnam_patch.h/.cc
* added validation support to xml++.cc/.h
* added XMLNode::add_property(const char *name, const long value)
* added test to pbd/tests/xpath.cc


git-svn-id: svn://localhost/ardour2/branches/3.0@3412 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-25 23:35:23 +00:00
Hans Baier
4aa9d17ab1 * added midnam test file for xpath 
* added to_string() to MIDI::Event
* added XMLNode::attribute_value for attribute nodes
* debugging output in MidiModel (incorrect rendering of Pitchbender events: Notes lost
* added xpath tests for midnam files


git-svn-id: svn://localhost/ardour2/branches/3.0@3406 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-23 10:36:51 +00:00
David Robillard
54bec37b5a Fix corrupt MIDI file writing when meta events are present (fixes missing first note issue on some imported files). 
Reduce number of buffer allocations on MIDI read/write.


git-svn-id: svn://localhost/ardour2/branches/3.0@3395 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-22 21:36:27 +00:00
David Robillard
96384d65a6 More petty clean ups of MIDI stuff. 
Use more complete header I had laying around for MIDI controller names / depollute Automatable.


git-svn-id: svn://localhost/ardour2/branches/3.0@3378 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-21 18:07:31 +00:00
David Robillard
05801cc3d6 Eliminate excessive allocation (for every event) during MidiModel iteration. 
git-svn-id: svn://localhost/ardour2/branches/3.0@3351 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-15 05:00:28 +00:00
David Robillard
a25be81b5d Fix event allocation issues with MidiModel iteration. 
git-svn-id: svn://localhost/ardour2/branches/3.0@3342 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-13 00:15:26 +00:00
David Robillard
8ca72c4eca Fix various MIDI corruption bugs. 
Re-enable MIDI CC controller bars and other immediate output (hans commented out, tsk tsk).
Write channel mode as textual enumeration instead of magic number.
Better atomic (almost) channel mode switching on MIDI ring buffer (was a possible, if unlikely, source of corruption).
Handle some cases of broken MIDI, and oversized events, more gracefully.


git-svn-id: svn://localhost/ardour2/branches/3.0@3335 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-12 02:40:48 +00:00
Hans Baier
8d44391f4b * adjusted formatting a bit to style guide 
* fixed: velocity value left on canvas
* fixed: end-of-track problem still showed up sometimes
* enabled heaps of debugging output in order to debug MidiModel corruption 


git-svn-id: svn://localhost/ardour2/branches/3.0@3329 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-09 11:28:14 +00:00
Hans Baier
8557d0c69f * bugfix: SMFSource: track footer overwrote the last MIDI event 
git-svn-id: svn://localhost/ardour2/branches/3.0@3319 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-06 09:15:45 +00:00
Hans Baier
0e394fb66b * removed old implementation for Program Changes from MidiModel 
* Added Automation based implementation for Program Changes, Pitch Bender and Channel Aftertouch

git-svn-id: svn://localhost/ardour2/branches/3.0@3304 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-02 19:09:32 +00:00
David Robillard
da45f489dd Fixes for GCC 4.3. 
git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-05-02 18:35:05 +00:00
Hans Baier
f41f334be6 * forgot to commit this last time 
git-svn-id: svn://localhost/ardour2/branches/3.0@3291 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-04-26 09:07:32 +00:00
Hans Baier
f91006d8d2 * added methods for pich bender/pgm change/aftertouch to MidiEvent 
git-svn-id: svn://localhost/ardour2/branches/3.0@3282 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-04-23 02:27:27 +00:00
Hans Baier
c4bdcb82af * fixed bug: crash because of invalidated iterator while removing midi notes from model 
git-svn-id: svn://localhost/ardour2/branches/3.0@3253 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-04-15 23:00:06 +00:00
Hans Baier
1a0044b35d * implemented persistent undo for MidiModel::DeltaCommand. Deserializing works, but weirdly has no effect when undo/redo is applied in the editor 
git-svn-id: svn://localhost/ardour2/branches/3.0@3240 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-04-09 15:33:01 +00:00
Paul Davis
6554200e66 hans' patches for MIDI note resizing++ 
git-svn-id: svn://localhost/ardour2/branches/3.0@3184 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-03-26 11:11:47 +00:00
Paul Davis
022c45361e fix up delivery of MTC & MMC; add zero=last_timestamp semantics to JACK midi port write call; setup parser execution for JACK MIDI ports 
git-svn-id: svn://localhost/ardour2/branches/3.0@3159 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-03-19 21:15:28 +00:00
Paul Davis
4808f7fe8b fix up and re-enable MTC transmission 
git-svn-id: svn://localhost/ardour2/branches/3.0@3158 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-03-19 18:10:51 +00:00
Paul Davis
d9faaed2c1 reduce (from 5k to 512) the number of events that non-process() threads may write into a JACK_MidiPort per process cycle 
git-svn-id: svn://localhost/ardour2/branches/3.0@3157 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-03-19 17:30:42 +00:00
Paul Davis
3a29796405 reinstate Ye Olde MIDI (input) thread; fix up a few startup warnings 
git-svn-id: svn://localhost/ardour2/branches/3.0@3156 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-03-19 17:25:37 +00:00
Paul Davis
eb4a1fdbb8 refactor JACK MIDI port to allow writing from a non-process() thread, and move ARDOUR::MidiEvent into MIDI namespace along with midi_events.h header 
git-svn-id: svn://localhost/ardour2/branches/3.0@3155 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-03-18 03:42:32 +00:00
Paul Davis
d69f4e9e3d band-aid fix for wrong-thread-MIDI-writes 
git-svn-id: svn://localhost/ardour2/branches/3.0@3154 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-03-18 00:58:36 +00:00
David Robillard
4d94305cc9 Fix install path problems (s/ardour2/ardour3). 
Fix finding of keybindings file when running from source tree (via ardev/ardbg).
Fix clashing keybindings for zoom stuff.
Add note tool keybinding and menu entry.


git-svn-id: svn://localhost/ardour2/branches/3.0@3099 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-02-21 19:30:01 +00:00
David Robillard
80c3677c83 Merge with 2.0-ongoing R2988 
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-02-02 17:22:04 +00:00
Paul Davis
f7f9d6fdc4 merge from 2.0-ongoing by hand, minus key binding editor 
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-10-11 22:07:47 +00:00
Paul Davis
b9b6ba8be4 merge changes to libmidi++ API from 2.0-ongoing 
git-svn-id: svn://localhost/ardour2/trunk@2256 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-08-06 14:19:19 +00:00
Taybin Rutkin
91b67c1d98 fix for linking midi++ on MacOSX. 
git-svn-id: svn://localhost/ardour2/trunk@1879 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-05-18 03:01:52 +00:00
Paul Davis
5183f9b772 require new JACK API; fix inheritance bug in AudioRegion::verify_*() 
git-svn-id: svn://localhost/ardour2/branches/midi@1789 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-05-07 03:26:43 +00:00
David Robillard
ebe4fc9d88 Update Jack system port names to reflect new Jack naming scheme. 
git-svn-id: svn://localhost/ardour2/branches/midi@1787 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-05-07 00:06:07 +00:00
David Robillard
7c9db826bc Use Jack trunk MIDI. This needs proper fixing.. 
git-svn-id: svn://localhost/ardour2/branches/midi@1784 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-05-04 23:57:01 +00:00
David Robillard
b8e9b3f071 Real fix for Jack MIDI crash. Maybe! 
git-svn-id: svn://localhost/ardour2/branches/midi@1782 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-05-04 02:50:31 +00:00
David Robillard
acdfe9857a Possible fix for Jack MIDI crash on jack_get_buffer_size some are seeing. 
git-svn-id: svn://localhost/ardour2/branches/midi@1780 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-05-04 01:47:13 +00:00
Paul Davis
0c7b7216ef initial fixes to get build to work without new JACK MIDI, and to get it running with an older session, at least somewhat 
git-svn-id: svn://localhost/ardour2/branches/midi@1773 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-05-01 23:26:14 +00:00
David Robillard
2e8f80e37a Merged with trunk R1719. 
Updated for Jack MIDI SVN branch (required for now).


git-svn-id: svn://localhost/ardour2/branches/midi@1720 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-04-14 18:39:01 +00:00
David Robillard
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
David Robillard
eb270e70a1 Compilation fix. 
git-svn-id: svn://localhost/ardour2/branches/midi@1430 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-02-07 15:19:34 +00:00
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
22c20ab6f2 Merged with trunk, and a few trivial GUI updates etc. 
git-svn-id: svn://localhost/ardour2/branches/midi@664 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-05 19:47:25 +00:00
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
868f557f26 Merged with trunk (painfully) 
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-13 07:27:52 +00:00
David Robillard
2f4392f043 Removed excessive debug printing, added missing files for SMPTE namespace and Jack libmidi++ ports 
git-svn-id: svn://localhost/ardour2/branches/midi@577 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-09 01:48:38 +00:00
David Robillard
74dd5bd706 Committed filthy mess of a working copy solely for moving between machines. 
Nothing to see here, move along now...


git-svn-id: svn://localhost/trunk/ardour2midi@575 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-08 23:46:42 +00:00
David Robillard
0c1b9afc63 - Documentation fixes 
- Fixed boolean return values in libmidi++ to return bool instead of int


git-svn-id: svn://localhost/trunk/ardour2midi@538 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-26 22:30:54 +00:00
Paul Davis
1da9bb0c26 Install ardour as a binary, a script and a set of shared 
libraries. Libraries are discovered via {LD,DYLD}_LIBRARY_PATH


git-svn-id: svn://localhost/trunk/ardour2@481 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-26 00:45:27 +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
Tim Mayberry
7df20e1166 2006-03-04 Tim Mayberry <mojofunk@gmail.com> 
* Remove debug output preventing compilation on x86_64.
	* Build shared libraries for all libs/* when DEVBUILD=1 to fix linking for x86_64/non-x86.
	* Simplify/consolidate the dev scripts a bit.
	* Export ARDOUR_COLORS variable in dev scripts.
	* Remove G_DISABLE_DEPRECATED from glibmm CXXFLAGS to allow compilation with newer versions of glib.
	* Build soundtouch with SYSLIBS=1, hopefully we can link to system soundtouch soon.


git-svn-id: svn://localhost/trunk/ardour2@344 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-04 11:26:25 +00:00
Paul Davis
cf0da62ff0 miscellaneous fixes post-jesse's 24 bit file format changes 
git-svn-id: svn://localhost/trunk/ardour2@317 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-02-11 02:34:03 +00:00
Paul Davis
4e2d99fd21 fix computation of MMC base track for MMC rec enable (Ben Loftis) 
git-svn-id: svn://localhost/trunk/ardour2@301 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-01-28 13:35:31 +00:00
Paul Davis
81ef56fba9 fix (mostly) measure lines and click box text and meter markings 
git-svn-id: svn://localhost/trunk/ardour2@300 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-01-28 13:33:54 +00:00
Paul Davis
a9e38032a3 route list + edit group list now pretty much functional, plus preparations for ardour2.0-alpha1 
git-svn-id: svn://localhost/trunk/ardour2@253 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-01-10 04:25:47 +00:00
Jesse Chappell
bd21c474e5 committed RWlock fixes to libardour. added hw monitoring fixes from nick_m. minor alsa midi fix and update rate settings. 
git-svn-id: svn://localhost/trunk/ardour2@244 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-01-06 04:59:17 +00:00
Taybin Rutkin
d09f6b3016 Initial revision 
git-svn-id: svn://localhost/trunk/ardour2@4 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2005-05-13 20:47:18 +00:00