aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
74a0a1a922
fix setting of LD_LIBRARY_PATH in ardev and cousins
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14170 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-07 14:39:08 +00:00
978366087b
fix up ardev+cousins value of GTK_PATH to reflect new build approach for GTK engines
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14103 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-26 18:54:37 +00:00
bace0cb629
set GTK_PATH correctly (see previous commit) for use in ardev and cousins
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-25 16:03:56 +00:00
424b291e35
add to ARDOUR_DATA_PATH for ardev and cousins, so that in-tree MIDNAMs are located (now searched for via DATA rather than CONFIG paths
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13997 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-25 13:06:28 +00:00
0209267980
reinstate wiimote support, thanks to work by jannis pohlmann
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 18:28:09 +00:00
c9c94ca1c2
merge robin gareus' libltc into ardour source tree for convenience
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13665 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-14 16:18:47 +00:00
a532845e7f
fix ARDOUR_DATA_PATH for ardev and its cousins (finds templates, among other things)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13396 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-08 15:34:22 +00:00
917bf92de6
add export formats path to ardev_common.sh.in so that ./ardev runs find export formats
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13077 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 00:22:30 +00:00
Carl Hetherington
d330dfa2ed
Tweak new path setup.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12333 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-19 16:41:36 +00:00
813c5f0af9
major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
...
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)
git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-18 17:24:06 +00:00
74c6ad4e15
define ARDOUR_{MIDIMAPS,MCP}_PATH for bundles and for ./ardev and its cousins, so that we can find MIDI and Mackie support files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-08 15:25:57 +00:00
b9ff443085
MCP: various work on the button binding GUI
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11997 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-17 20:41:31 +00:00
cd21bc58aa
initial MCP device info file, and fix ./ardev and friends to be able to find it
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11940 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 13:12:41 +00:00
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
459eda7e11
add QMDSP library to ardev file so that its discoverable as we try to load VAMP stuff
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 23:49:44 +00:00
15b5fce904
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 01:31:03 +00:00
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
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
bb592809f1
merge gnomecanvas into ardour tree, so that we can fix our own bugs and not wait for silly gnome release schedules
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8114 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-27 23:16:42 +00:00
03fe5aa56d
safe use of existing env vars
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7856 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-29 01:58:47 +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
Sakari Bergen
dde0848a98
Re-integrate export-optimization branch.
...
Export now happens directly to file (unless normalizing is required), and can be easily optimized even further.
The Session process connection is still broken during export (as it was before this commit also).
git-svn-id: svn://localhost/ardour2/branches/3.0@6401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-27 14:46:23 +00:00
cd1c58e031
search $TOP/build/default/gtk2_ardour BEFORE ../gtk2_ardour when looking for bindings files etc ; make debug tracing show the "debug option" the output relates to as a prefix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-25 20:36:10 +00:00
Carl Hetherington
7f27d69d79
Make the mackie surface work again by initialising control surfaces after MIDI, so that the mcu port exists when the control surface is created. In addition to this patch it is necessary to tweak the wscript to build with ALSA_MIDI.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-07 01:55:32 +00:00
Carl Hetherington
2c7b27d7ae
Fix up ardev etc. scripts so that they can be run from any directory.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4704 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-27 21:16:02 +00:00
9ed81fdd6e
remove silly cd .. in ard* scripts
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4692 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 23:43:10 +00:00
6a0608847a
2nd part of fix for botched shared-fixup of ard* scripts
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 23:31:41 +00:00
76dbfc5670
Fix running with ard*.sh scripts with waf build.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 23:24:50 +00:00
c841bb76dd
unify ard* scripts for both scons & waf builds
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4688 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 22:30:13 +00:00
227eca4054
Fix ardour2 -> ardour3 issues.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 18:32:13 +00:00
Hans Baier
9d33176b49
* Swapped MidiSource to LibSMF
...
* integrated libsmf into scons
git-svn-id: svn://localhost/ardour2/branches/3.0@4539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-12 23:28:32 +00:00
16556bb182
OSC becomes a control protocol object; make ardev_common.sh(.in) look for surfaces in the right place(s)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-15 22:09:23 +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
Nick Mainsbridge
9e4f8633f4
Don't defer Editor::track_canvas_size_allocated () (defer the timebar redrawing instead) + some performance improvements to said function, fix puzzling ineffective thinko wrt region movement, show/hide playhead more sensibly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-20 09:06:49 +00:00
Sakari Bergen
35192c107d
Add taglib to LD_LIBRARY_PATH in ardev_common.sh.in
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3742 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-17 15:12:41 +00:00
8aa9508c82
Merge with 2.0-ongoing R3071.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 22:43:18 +00:00
9f63ab9931
Merge with trunk R2978.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 03:57:35 +00:00
794917fca7
Install everything to *ardour3* instead of *ardour2*.
...
Fix initial display of keys and scroomer on new MIDI tracks.
Remove console barf.
git-svn-id: svn://localhost/ardour2/trunk@2909 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-13 21:34:04 +00:00
bf256c1681
Fix LD_PRELOAD hackery for cairomm.
...
git-svn-id: svn://localhost/ardour2/trunk@2890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-11 00:54:08 +00:00
8a2e30816e
Merge with 2.0-ongoing R2883.
...
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 22:22:29 +00:00
bb457bb960
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
...
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 21:20:59 +00:00
Carl Hetherington
108e924ad5
Add cairomm to LD_LIBRARY_PATH
...
git-svn-id: svn://localhost/ardour2/trunk@2655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-14 16:39:44 +00:00
7af4e87fa9
Remove two directories from ARDOUR_PATH that now longer need to be included explicitly
...
git-svn-id: svn://localhost/ardour2/trunk@2065 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-27 12:12:49 +00:00
0abcfb16ba
Replace code for finding ControlProtocols/Surface plugins with a portable equivalent.
...
Remove Session::control_protocol_path and the supporting non-portable
Session::suffixed_search_path from Session.
Add ARDOUR::control_protocol_search_path which is used in place of
Session::control_protocol_path
Replace ARDOUR::get_system_module_path with ARDOUR::system_module_directory which
is used by ARDOUR::control_protocol_search_path
Export ARDOUR_SURFACES_PATH in gtk2_ardour/ardev_common.sh which is returned
by ARDOUR::control_protocol_search_path if defined. This means the control surfaces
in the libs/surfaces/* directories can now be used without installing them.
Add pbd/file_utils.h/cc containing functions for finding files matching a certain
pattern
Update documentation in SearchPath and add another constructor that takes
a sys::path
git-svn-id: svn://localhost/ardour2/trunk@2049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-27 12:12:18 +00:00
842ade44fb
Move (default) colours from code to rc file.
...
Write/read colours from XML in hex (ie usual RGBA values).
Fix "clipped aveform" typo in canvas vars.
git-svn-id: svn://localhost/ardour2/trunk@1991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-16 17:48:08 +00:00
Sampo Savolainen
64b3e3be80
Make DEBUG=1 default and make ardour.sh, ardev and ardbg dump cores by default
...
git-svn-id: svn://localhost/ardour2/trunk@1843 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 20:42:46 +00:00
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
