13
0
Commit Graph

62 Commits

Author SHA1 Message Date
a907d3455e break out ALSA related functions into libardouralsautil 2014-06-04 19:16:37 +02:00
8e9b02cfa2 ALSA backend (based on Dummy backend and zita-alsa-pcmi) 2014-06-02 19:23:07 +02:00
8c9749e42f merge with master and fix 4 conflicts by hand 2014-06-02 11:32:13 -04:00
9907d25ea5 skeleton dummy audio-engine 2014-04-28 21:29:35 +02:00
Sakari Bergen
8bd6de3f4e export ARDOUR_TEST_PATH for artest
We should probably remove the old test running stuff from libs/ardour.
Does someone still need it?
2014-04-07 21:36:58 +03:00
6ee44cf377 fix inadvertent breakage in ardev and friends caused by extension to LD_LIBRARY_PATH as pat of backend additions 2014-02-24 17:05:00 -05:00
0a6af1420f changes to ardev and friend to find audio engine backends 2014-02-24 14:49:13 -05:00
d15fda6d75 fix merge errors with master 2014-01-10 14:53:03 -05:00
21ca6a10a9 rework panning -- Squashed commit of the following:
commit 6f4f4f161b00cb36252727f67ecc4913eb944fd7
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 22:13:09 2014 +0100

    fix panner plugin discovery (prev commit)

commit 26e514f4a80af9192cae3cbd62fde0ae95474dfc
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 18:56:59 2014 +0100

    update panner plugin discovery

    * recurse dirs in 'PANNER_PATH' and 'panner_dir_name' up to 1 level.
    * don't look in ardour_dll_directory() -- no panners are supposed to be in there
    * use .dylib on OSX exclusively.

commit a514c3f1c425dccf3d42eee9d2b183b44fd26a03
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 16:48:34 2014 +0100

    remove debug/devel printf()s

commit d863742ddc69af493ee6a8817bc778968d9b0800
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 16:17:13 2014 +0100

    panner-type: session backward/forward compatibility

commit 25d5e4c663ada34129451b0f9045ab047d6cc2f0
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 16:09:07 2014 +0100

    update URIs -> URLs

commit 00a606a43d9456cfbaf43cae4fb598549326ba71
Merge: 0f1cec1 382eb0f
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 03:29:45 2014 +0100

    Merge branch 'master' into panning

commit 0f1cec19babae538c9697eed4be5d6ddc851b013
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 02:41:15 2014 +0100

    switch panner ID to URI

commit 575282b412c3ae1cd8219cf75f00a1a4239e2813
Author: Robin Gareus <robin@gareus.org>
Date:   Wed Jan 8 00:50:15 2014 +0100

    prepare API for panner URI

commit ea62cd049308859782a7bb16e4f18169d8638b46
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 19:57:06 2014 +0100

    update development doc relating to panner selection

commit 586d7de2392e26b9d7f597b1a00b98dfaa42ecdc
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 19:56:24 2014 +0100

    clean up PanShell::set_user_selected_panner_type() API

commit 99077886a5a1cacece908d87c29c3be12903027e
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 04:46:22 2014 +0100

    panner bypass: visualize & [in]sensitivity

commit 46d688d216f0e67d672376a607157af02b359fb2
Merge: 4e67573 c4cdf61
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 02:18:54 2014 +0100

    Merge branch 'master' into panning

commit 4e67573517b3d60ddf65729783687b16cfb2adb7
Author: Robin Gareus <robin@gareus.org>
Date:   Tue Jan 7 01:05:17 2014 +0100

    don't call configure_io() for merely swapping panners

commit d32a4c51f6967f48f7680554866f1f7b311ccde1
Merge: a3226d4 cec3116
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 23:49:55 2014 +0100

    Merge branch 'master' into panning

commit a3226d46b598afae54a65ac69320eca84669f347
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 17:52:38 2014 +0100

    add notes about panner re-design

commit d1ae2366024605f22b05572a81ee249e6fdbcd2f
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 15:06:40 2014 +0100

    add simple stereo-balance panner for testing

commit e0ddd256ff2288b8d8cfad3ad485a916964ce5b5
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 17:02:52 2014 +0100

    add frontend/GUI for panner selection

commit 2cb8f846755eb5aea8a2620d31ea981c446c4041
Author: Robin Gareus <robin@gareus.org>
Date:   Mon Jan 6 17:02:20 2014 +0100

    prepare backend for panner selection
2014-01-09 00:18:45 +01:00
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
f4cf283f26 move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work) 2013-09-07 11:03:57 -04:00
7218bd91de start work on the changes to EngineControl (dialog) to integrate with new backend design, and add "requires-driver" concept to AudioBackend to handle JACK specifically 2013-08-04 14:03:19 -04:00
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
5c2f568102 fix ardvst and ardourvst (use variable or version number) 2013-06-23 18:59:47 +02:00
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