Commit Graph

6532 Commits

Author SHA1 Message Date
Tim Mayberry
ee95f05fee Use test_search_path to find test data files for automation test 2013-10-11 22:36:19 +10:00
Tim Mayberry
1eed53c4a8 Update test to use correct SourceFactory::createWritable API 2013-10-11 22:36:19 +10:00
Tim Mayberry
e53bf08b10 Delete test_globals.h/cc now that the contents has moved to test_common.h/cc 2013-10-11 22:36:19 +10:00
Tim Mayberry
d30fa04013 Add get_test_sample_rate to common test functions in libardour tests 2013-10-11 22:36:19 +10:00
Tim Mayberry
ac8ec14347 Fix script used to run libardour tests 2013-10-11 22:36:19 +10:00
Paul Davis
cf3d8d15f0 some slightly hackish changes to make it possible to use the new internal ALSA midi client (soon to become a driver, however) 2013-10-10 16:54:46 -04:00
Paul Davis
c96108c2e1 add API to get current MIDI option from an audio/MIDI backend 2013-10-10 16:18:00 -04:00
Paul Davis
25ca45f395 add API to get current MIDI option from an audio/MIDI backend 2013-10-10 16:17:46 -04:00
Paul Davis
b5f36f5788 fix up parsing of send gain MIDI bindings so that they actually work 2013-10-10 16:16:59 -04:00
Paul Davis
1bd04f8bf3 add JACK backend support for MIDI option discovery 2013-10-10 12:59:11 -04:00
Paul Davis
2308291e59 add API to AudioBackend to allow discovery of possible MIDI I/O options 2013-10-10 12:58:38 -04:00
Paul Davis
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
Paul Davis
465b800d8b when looking for backends, search for *.dll as well as *.so and *.dylib 2013-10-09 13:57:00 -04:00
Paul Davis
927ebe3b5f reduce version requirement for JACK 2013-10-08 17:12:20 -04:00
Paul Davis
af8a1c146d move JACK configuration test(s) down to where they belong (in libs/backend/jack) 2013-10-08 16:13:39 -04:00
Paul Davis
645350815c remove link-time use of JACK, since it is now dlopen'ed by the chosen backend 2013-10-08 14:16:13 -04:00
Paul Davis
c98abed37f restore jack timebase master and jack session callback functionality (moved into the JACK backend) 2013-10-08 14:02:03 -04:00
Paul Davis
7e077bdeba -arestore jack timebase master and jack session callback functionality (moved into the JACK backend) 2013-10-08 14:01:43 -04:00
Paul Davis
1085866f47 updated DE translation from edgar aichinger 2013-10-08 12:22:08 -04:00
Paul Davis
da7d3afc87 use AudioEngine destructor to do necessary stuff when shutting it down, and remove unused Config stuff in AudioEngine 2013-10-07 20:30:06 -04:00
Paul Davis
f1b2674d9b change return type on ARDOUR::cleanup() since nobody cares what it returns 2013-10-07 20:29:05 -04:00
Paul Davis
5265ceec51 change tortured GtkUI startup process into something just a little more sane, and remove "stopping" code since that belongs in a destructor 2013-10-07 20:27:04 -04:00
John Emmas
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
Paul Davis
2d5e605bf1 Merge branch 'audiothreads' of https://github.com/mojofunk/ardour 2013-10-04 14:00:20 -04:00
Paul Davis
3aee160b19 provide PBD::demangle() even on platforms without HAVE_EXECINFO 2013-10-04 12:22:00 -04:00
Tim Mayberry
f3a22fb880 Implement JACKAudioBackend::in_process_thread 2013-10-04 18:54:54 +10:00
Tim Mayberry
53ad2d187f Move processing thread list from ARDOUR::Graph into AudioBackend implementation 2013-10-04 18:53:37 +10:00
Tim Mayberry
df363a4fb3 Add AudioBackendThread class to support different thread type on windows 2013-10-04 18:51:47 +10:00
Paul Davis
82f0f3a9a7 fix up crash caused by changes in object creation order and setting the state of the click IO object 2013-10-02 16:17:22 -04:00
Paul Davis
c736d88a5f don't ping JACK server 4 times to see if it is already up when ardour starts 2013-09-25 22:56:28 -04:00
Paul Davis
d6274d5c3e fix up enum mess caused by switching from JACK to Engine as the name for jack-related transport sync
This will allow older versions of Ardour to continue to startup when the user sync preference is "JACK",
because the string used by enum_2_string() will still be "JACK".

Versions of ardour3 from git after the enum change until this commit will leave ardour.rc unloaded by old
versions of Ardour ***if*** the user sync choice was "JACK".
2013-09-25 18:24:32 -04:00
Paul Davis
e43a8dac1c make information extraction from session file options list robust against some old badly formatted session files
Fixes crash experienced by GillesM, where a rogue XML entry caused a segfault
2013-09-25 17:59:10 -04:00
John Emmas
17ad0a0b61 Merge branch 'cairocanvas' into windows+cc 2013-09-25 15:52:11 +01:00
Paul Davis
18850253e9 only generate some current canvas debug output when CANVAS_DEBUG is defined, to quieten things down 2013-09-25 10:38:04 -04:00
Paul Davis
67bb9a732a add casting for MSVC sqrt 2013-09-25 10:36:42 -04:00
Paul Davis
3ba0ef7192 fix a typo in canvas-debug.h 2013-09-25 10:36:21 -04:00
Paul Davis
f5cd838afc start explicitly linking against libtimecode (this needs to happen elsewhere too) 2013-09-24 22:22:43 -04:00
Paul Davis
4209e8a834 add new static functions to get SR and disk sample format from session XML 2013-09-23 21:35:51 -04:00
Paul Davis
20f28c82ec make session creation from a template work again 2013-09-22 11:19:34 -04:00
Paul Davis
f7586f3a0d likely fix for creating new sessions from templates 2013-09-21 12:50:45 -04:00
John Emmas
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
Paul Davis
3e5c1e3fc1 Revert "actually load new state after creating a session."
This reverts commit 914ba475de.

Unclear why I applied this or what it was supposed to do. A new session has no
state.
2013-09-20 16:16:30 -04:00
Paul Davis
eb3cc04eff Merge branch 'master' of https://github.com/nmains/ardour 2013-09-20 15:21:14 -04:00
Paul Davis
b188033bf7 rather hacky fix for the change of the SyncSource > JACK enum to SyncSource > Engine
This is needed in order to get ardour started if ardour.rc names "JACK" as the sync source
2013-09-20 14:30:50 -04:00
Paul Davis
960a47330a switch from JACK_Slave to Engine_Slave 2013-09-19 17:34:23 -04:00
Paul Davis
66aa6dfc8e remove file (this moved to libs/backends/jack as part of the audioengine changes) 2013-09-19 16:27:03 -04:00
Paul Davis
7b96fab60e move configure-time dependency on PortAudio out of libs/ardour and into libs/backends/jack
PortAudio is currently used to get a list of device names for use with JACK on Windows.
We should find a better way to do this that avoids this kind of dependency.
2013-09-19 16:24:51 -04:00
Paul Davis
57d24608e7 show a different audio/MIDI option screen if JACK is already running. try to fix problem with using AudioBackend::<property-value>() functions before anything has been set. 2013-09-19 15:03:20 -04:00
John Emmas
cb18f914bd 'libs/ardour' - Further compiler specific changes 2013-09-18 12:28:08 +01:00
John Emmas
4f8c30de02 'libs/ardour' - Further platform specific changes 2013-09-18 12:27:39 +01:00