8d4cbc4cc1
fix Dummy DSP load on win32 & low-pass filter load
...
g_get_monotonic_time() has millisecond granularity,
use performance Counter if available
2014-10-31 22:51:47 +01:00
973d40e3ac
Add support for USE_CAIRO_IMAGE_SURFACE when building with MSVC
...
(new preprocessor directive - greatly improves CPU loading)
2014-10-29 17:36:30 +00:00
a6ceff61dd
proper solution for variable-args jack_client_open()
2014-10-25 17:28:13 +02:00
85eda0a5f3
Add some newly introduced source files to our MSVC project (jack_audiobackend)
2014-10-24 18:45:52 +01:00
3d39689769
Some minor bits of casting to keep MSVC happy when building 'backends/jack/weak_libjack.c'
2014-10-24 18:45:51 +01:00
b52304661f
fix screwup in prev commit-diff
2014-10-24 17:19:28 +02:00
5e7f935a27
add explicit construction (for MSVC) and some debug messages
2014-10-24 17:15:03 +02:00
25a6aa57a3
fix jack transport return value
2014-10-24 16:19:44 +02:00
e025cc008c
use x-macros to simplify weak-jack implementation
2014-10-24 15:18:38 +02:00
ad09be8c78
fix libjack names
2014-10-24 14:36:04 +02:00
1e357b5109
fix 64bit compile with old gcc
2014-10-23 20:42:02 +02:00
d991bb10ca
add 'available' interface to the AudioBackendInfo
...
If a backend can be loaded, it does not mean that it can be used;
e.g. weak-linked jack-backend if libjack is not available.
2014-10-23 16:53:14 +02:00
f3ff1b9669
weak/runtime jack linking: load libjack dynamically at runtime
2014-10-23 16:53:13 +02:00
730e09ce65
another round of compiler warning fixes
2014-10-23 05:31:40 +02:00
c6a3d6bc48
small round of compiler warning fixes
2014-10-23 03:43:04 +02:00
f7211ff8f7
fix jack/mingw compilation
2014-10-22 23:57:55 +02:00
68458cde69
fix all 4 backends' failure to include the main "backend" thread when computing ::in_process_thread()
2014-10-22 17:07:11 -04:00
76edbdf5dc
make backend selection by product name more explicit
2014-10-14 16:58:11 -04:00
8525a0b258
add a Dummy Backend Loopback mode:
2014-10-11 14:47:35 +02:00
b4cf5e279b
fix dup free in waves/midi:
...
The PortMidi queue just holds a pointer to the midi events.
The same Midi events are free()d during WavesMidiBuffer::clear()
which is called at cycle start for every buffer and in the dtor
of the WavesMidiBuffer.
2014-10-09 09:48:54 +02:00
4af4938c25
fix wavesbackend midi timing
2014-10-09 09:43:53 +02:00
2d04ac9796
Add a newly introduced header file to our MSVC project (dummy_audiobackend)
2014-10-08 15:11:25 +01:00
000609901b
add correct copyright statements to all files in Waves backend except those derived from portaudio/portmidi
...
This follows the letter sent from Waves Audio Ltd. to Paul Davis dated February 20th 2014 agreeing to release this code
under the GNU Public License, version 2, with copyright owned by Waves Audio Ltd
2014-10-07 16:17:34 -04:00
0af091edf3
fix ming32 build&install for asio backend
2014-10-03 00:46:34 +02:00
aeda6cbea9
add --with-wavesbackend config option (disabled by default)
2014-10-01 18:28:47 +02:00
3d12a4da82
fix deep obscure problem with loading multiple backends on OS X
...
all backends export a symbol declared as "extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor ()".
dlopen'ing the backend apparently pushes the symbol "descriptor" into the single flat global namespace that we use
to be like other unix-like systems. this means that if a backend calls its OWN function named "descriptor", it
is indeterminate which one it will be, since the symbol will refer to the function first loaded by the runtime
linker. If the backend is not the first one discovered, this call to its own "descriptor" function will invoke
the function defined by another backend, even though these are supposed to have local scope only according
to our arguments to dlopen().
This fix doesn't try to fix the linker or namespace - it just makes sure that the WavesAudio backend doesn't
invoke its own descriptor() function, which it never really needed to do anyway.
2014-09-30 22:57:05 -04:00
cd60fd9dfe
untested fix for compiling waves audiobackend on case-sensitive FS with mingw.
2014-10-01 04:02:30 +02:00
32e05fa640
update backends for API change in 8d59afb048
2014-10-01 03:24:54 +02:00
a927b79c26
Implement the new pthread macros (for the Waves audio backend)
2014-09-30 21:00:35 -04:00
3033c1cc54
Re-introduce our pthread macros (after fixing an earlier typo)
...
these are so we can differentiate between 'libpthread' and 'libpthread-win32' (whose implementation is subtlely - though annoyingly! - different)
2014-09-30 21:00:35 -04:00
8d59afb048
copy over current Waves version of their backend, along with minor changes in libs/ardour and libs/backend/jack to fit with API changes
2014-09-30 21:00:34 -04:00
38e975d6b1
tweak backends wscript for cross-compiling with mingw
2014-09-30 21:00:34 -04:00
8e01b411b2
copy over current Waves version of their backend, along with minor changes in libs/ardour and libs/backend/jack to fit with API changes-a
2014-09-30 20:23:45 -04:00
186493687b
DummyBackend: symmetric freq sweep: up/down
2014-09-24 18:46:54 +02:00
6dfb8c5c8a
DummyBackend: add sine-sweep generators
2014-09-24 17:24:25 +02:00
86672a5c5c
fix some double promotion
2014-09-24 17:18:20 +02:00
3f9e916fe2
DummyBackend: two more audio-signal generators (useful for waveform check)
2014-09-24 01:26:51 +02:00
b355f01aa5
DummyBackend: MIDI Event Generators
2014-09-24 01:26:51 +02:00
99a484f193
ALSA backend: initial device selection
2014-09-24 01:26:51 +02:00
076bb0b488
change dummy backend to default to _("Silence").
2014-09-13 22:51:42 +02:00
16b25a3028
Implement the new pthread macros (for the Waves audio backend)
2014-09-09 12:05:14 +01:00
61e0705a94
Re-introduce our pthread macros (after fixing an earlier typo)
...
these are so we can differentiate between 'libpthread' and 'libpthread-win32' (whose implementation is subtlely - though annoyingly! - different)
2014-09-09 12:03:52 +01:00
83b6825bd0
Revert "Add a couple of pthread helper macros"
...
This reverts commit 8d0ec2403f
.
2014-09-09 08:26:26 +01:00
b1da9af8de
ALSA|Dummy: ignore port unregistration when engine is stopped
...
When changing Engine parameters, ardour first stops
the engine and only later when re-etablishing ports
unregisters/re-registers them.
ALSA: silently ignore port unregs and silently accept registrations
Dummy: print a PBD::info message,
2014-09-08 01:25:56 +02:00
dc318e6e74
ALSA|Dummy Backend: do as jack does:
...
when the backend is closed, unregister all ports.
2014-09-07 22:50:57 +02:00
6408d90258
fix waf thinko in backends wscript
2014-09-03 18:44:34 -04:00
65715dd298
Make sure all our VC projects agree that the product is called 'Mixbus3' (as opposed to just 'Mixbus')
...
It'd be nice if we could use 'ARDOUR::config_dir_name' for this purpose (or perhaps 'PROGRAM_VERSION'). However, neither is implemented widely enough at present to make this practical. Keep an eye on them though, as possible future strategies.
2014-08-28 07:57:20 +01:00
126d6d3aae
fix new backends wscript to work correctly in the Ardour case
2014-08-08 11:00:30 -04:00
16e37d975f
use some structured code to decide which backends to build (should have cherry picked from waves' code but ...)
2014-08-08 10:57:20 -04:00
45afed5e9a
Modify our VC project files to work with msvc32-fixup.pl
2014-08-04 09:02:17 +01:00
928881b24a
Update vcproj files for changed LILV config define.
2014-07-15 15:50:12 -04:00
4af088c251
DummyBackend: add Uniform White Noise Generator.
2014-07-11 18:05:59 +02:00
2d63489196
Dummy Backend: optimize random-number implementation
2014-07-08 18:40:51 +02:00
941701574e
fix and optimize DummyBackend generators
...
* use Wavetable for sine
* lock generator (concurrency issue)
* always initialize variables
2014-07-08 18:40:51 +02:00
185f06e7f7
add signal generator modules to Dummy Backend.
2014-07-07 16:31:58 +02:00
cd12698b9c
Rename PBD::find_file_in_search_path to just PBD::find_file
...
saves a bit of typing and not necessary if you look at how it is used.
2014-06-25 12:40:10 -04:00
8d0cba3384
Use PBD::find_files_matching_pattern instead of other variations
2014-06-25 12:40:10 -04:00
3f776ce7d9
fix incorrect cut-n-paste across synergy
2014-06-25 12:30:57 -04:00
9b7b5fc9bc
wscript fix for wavesaudio backend - use correct name for CoreM[iI][dD][iI] framework on Lion and other versions
2014-06-25 08:29:23 -04:00
07fafac36e
don't let enumerated device list strings go out of scope.
2014-06-23 12:16:35 +02:00
fb51bdb892
statically allocate midi-options
...
fixes possible segfault when the data in the vector
goes out of scope due to RVO.
2014-06-23 11:56:58 +02:00
16ffff10cd
ALSA-backend: dedicated Midi-Buffer n-periods (only use for HW output)
2014-06-22 18:28:24 +02:00
88caf84b81
Rename all 3 backends for the MSVC sln file
2014-06-22 13:29:17 +01:00
436302fd16
Rename dummy backend to match Tim's name
2014-06-22 13:11:59 +01:00
f46a1508d9
Rename jack backend to match Tim's name
2014-06-22 12:53:13 +01:00
07b71fd005
Rename waves backend to match Tim's name
2014-06-22 12:51:43 +01:00
6648074a13
virtual abstraction of Alsa Raw+Seq
2014-06-21 13:51:46 +02:00
5e436fc8fc
prepare ALSA sequencer
2014-06-21 11:51:11 +02:00
bc67e47048
rework raw-midi drain strategy (workaround for sync devices)
2014-06-19 19:44:14 +02:00
e426c603b6
remove debug output
2014-06-16 23:58:52 +02:00
019e987944
more alsa-midi debugging
2014-06-16 22:08:52 +02:00
ff39a42581
ALSA backend: set latencies to zero when measuring latency
2014-06-13 13:51:42 +02:00
ecb92f474f
update ALSA backend, MIDI device config
2014-06-13 12:02:03 +02:00
da912f7ed4
add AudioEngine API to configure individual MIDI devices
2014-06-13 11:47:51 +02:00
266953cb96
add latency callback to dummy backend
2014-06-11 22:01:21 +02:00
8fe593fcca
some misc tweaks to the ALSA Backend
2014-06-08 21:04:30 +02:00
b3a44ea32b
ALSA Backend: align midi output buffer with n_periods (currently 2)
2014-06-08 15:53:15 +02:00
8f17b7c309
ALSA backend: separate systemic audio+midi latency
2014-06-07 17:28:47 +02:00
c452cd9be2
ALSA rt-thread priority fixes
2014-06-07 17:28:46 +02:00
b68d2e25b2
ALSA backend: prevent possible crash destruction of a-r-d
2014-06-07 17:28:46 +02:00
960a5347f0
ALSA & Dummy: implement port [un]registration_callback
2014-06-07 17:28:46 +02:00
6b3e7cf07d
Don't use module versioning with dummy backend when building with mingw
2014-06-07 14:31:32 +10:00
67c43d4b49
Don't use module versioning with jack backend in the mingw build
2014-06-07 14:31:32 +10:00
d7fc573cb8
alsa + dummy backend, proper [re]initialization
2014-06-06 03:43:39 +02:00
1c87f6adec
properly setup port system latency for Dummy & ALSA backend
2014-06-06 00:58:11 +02:00
748c137461
pass ardour's pid to the device reservation script.
...
terminate a-r-d when ardour crashes or exits unexpectedly.
2014-06-05 19:49:23 +02:00
8d6183bff5
ALSA backend: require both in+output.
2014-06-05 03:27:19 +02:00
822c460d15
DBus ALSA device reservation
2014-06-05 02:22:13 +02:00
a907d3455e
break out ALSA related functions into libardouralsautil
2014-06-04 19:16:37 +02:00
40cfe86569
ALSA: tentative hack to request audio-device.
2014-06-04 17:17:15 +02:00
6b781f72f2
ALSA backend: engine.halted_callback if the process thread dies
2014-06-04 17:17:15 +02:00
104adebea6
if the user chooses to stop the jack-backend, mark it as stopped. Don't display the "..was shutdown .. was not fast enough.." message.
2014-06-04 17:17:14 +02:00
aec7ea4613
Revert "Revert "ALSA backend: separate flags for is-running and should-be-running""
...
sorry, c/p error
This reverts commit 9658b77327
.
2014-06-04 02:39:39 +02:00
9658b77327
Revert "ALSA backend: separate flags for is-running and should-be-running"
...
Theoretically one could alter the plugins after a delivery even on a
frozen track. ..or even change settings, the ordering and add/remove
plugins after the frozen part of a track.
We won't go there. Frozen is frozen. this API is not needed after all.
This reverts commit 6d89488d64
.
2014-06-04 02:34:58 +02:00
6d89488d64
ALSA backend: separate flags for is-running and should-be-running
2014-06-04 02:23:41 +02:00
03cb44f814
ALSABackend: elaborate on start-up error cases
2014-06-04 02:19:46 +02:00
daaa59b533
Revert "When writing '.jackdrc' make sure we enclose any device names in
...
quotation marks". This patch is incorrect. The string quoting must be done ONLY
when creating a string to be written to ~/.jackdrc or similar, not when
constructing an argument list.
This reverts commit 5626ea2b1f
.
2014-06-03 20:08:26 -04:00
5626ea2b1f
When writing '.jackdrc' make sure we enclose any device names in quotation marks
...
(in Windows, device names almost always contain whitespace)
2014-06-03 14:04:10 +01:00
01cedf0e05
ALSA backend: tweak midi parser (fix start mid sequence)
2014-06-03 01:00:58 +02:00
b050f91323
ALSA backend: device detection
2014-06-03 00:50:26 +02:00
432f54db24
make ALSA backend optional and disable by default
2014-06-02 20:33:12 +02:00
c79a56a08f
ALSA backend: add raw midi parser
2014-06-02 19:23:07 +02:00
5cd2010c79
ALSA backend: raw midi prototype
2014-06-02 19:23:07 +02:00
8e9b02cfa2
ALSA backend (based on Dummy backend and zita-alsa-pcmi)
2014-06-02 19:23:07 +02:00
f6d29abfc7
DummyBackend: fix midi event mux+sorting
2014-06-02 12:20:40 +02:00
1c60652bd8
fix --with-dummy config option
2014-06-01 18:18:32 +02:00
dc1a7a15fa
Dummy backend, revise small things
2014-06-01 18:18:08 +02:00
b800a01ea6
dummy-backend, fix physical ports in/out convention.
2014-06-01 18:16:15 +02:00
796f4e9711
make building the dummy backend be a configure-time option. defaults to False for the time being
2014-05-28 22:30:06 -04:00
458d4dc6de
(Windows) Add support for finding the bundled version of Jack which comes with Mixbus
...
A few things need to be tested / completed:-
1) The code is currently guarded by #ifdef COMPILER_MSVC. This is just precautionary. If it builds okay with MinGW ,the guard can be removed.
2) Windows Playback and Capture devices almost always have different names. This needs to get accommodated in our Backend dialog (as in Mixbus)
3) Windows Playback and Capture devices will almost always contain spaces. We need to accommodate this when writing to .jackdrc (surround them in quote marks)
2014-05-27 14:48:44 +01:00
5b4cb15dfc
Remove an unnecessary #define
2014-05-27 13:24:51 +01:00
e2cecadd01
Use PLATFORM_WINDOWS (in preference to WIN32) for consistency with the other libraries
2014-05-27 09:51:39 +01:00
c022f32bcd
allow to switch from/to dummy-backend
...
partos of this may become unnecessary once
libardour handles backend changes properly^Wdifferently.
2014-05-25 00:23:14 +02:00
2b9fa31241
DummyBackend: implement port connect_callback()
2014-05-25 00:21:44 +02:00
43b4577212
waves_backend (MSVC project) - Adapt for using Waves's (customized) portaudio_x86 library (Windows)
2014-05-21 12:50:31 +01:00
e36a8df16e
jack_backend (MSVC project) - Adapt for using portaudio_x86 library (Windows)
2014-05-21 12:49:24 +01:00
10a52f1d19
enforce style-guide #3 , #26 and #27
2014-05-21 02:25:45 +02:00
9d6cfd67c3
CoreMidi is also needed on OSX.6
2014-05-21 02:17:35 +02:00
81d8eaa216
fix type typo
2014-05-21 00:19:15 +02:00
0de7c8920b
Merge branch 'mingw-updates' of https://github.com/mojofunk/ardour into cairocanvas
2014-05-19 17:19:43 -04:00
827388ffdd
outline portable implementation to replace clock_gettime()
2014-05-16 18:19:41 +02:00
4ece16be8e
replace gettimeofday() with g_get_monotonic_time()
2014-05-16 18:13:08 +02:00
51d0792f14
DummyAudioBackend: configurable number of MIDI ports
2014-05-16 00:41:35 +02:00
cf8399c1c1
DummyAudioBackend: prepare configurable number of midi ports
2014-05-15 01:18:16 +02:00
6bf8249b4b
Use Glib::usleep in DummyAudioBackend rather than ::usleep
2014-05-14 09:48:43 +10:00
b565357bf4
Remove incorrect code for mingw in DummyAudioBackend::in_process_thread
...
I'm assuming this section was copied from the JackAudioBackend where the
thread type is not pthread_t for mingw, but in the DummyAudioBackend it
is.
2014-05-14 09:48:33 +10:00
ad40a9008b
Add some more missing #includes
2014-05-06 17:00:35 +01:00
18245b06d0
'atomic_ops' to use glib, rather than Waves's inbuilt atomic operations
...
Note that the following source files can be removed once we know this works on all platforms:-
backends/wavesaudio/wavesapi/akupara/threading/atomic_ops.hpp
backends/wavesaudio/wavesapi/akupara/threading/atomic_ops_gcc_x96.hpp
backends/wavesaudio/wavesapi/akupara/basics.hpp
backends/wavesaudio/wavesapi/akupara/compiletime_functions.hpp
2014-05-06 09:41:40 +01:00
b9fab9ea28
Add a return value to 'WCMRPortAudioDeviceManager::getDeviceAvailableSampleRates()'
...
(whilst technically, it doesn't report any encountered errors, it should nevertheless be returning some kind of error status)
2014-05-06 09:33:54 +01:00
8d0ec2403f
Add a couple of pthread helper macros
...
(to accommodate the fact that in ptw-win32, 'pthread_t' is subtlely different from its non-Windows counterparts)
2014-05-06 09:31:11 +01:00
1a1a05fa1c
Add 'waves_backend.vcproj'
2014-05-06 09:26:59 +01:00
41fe637e80
Add the 'porttime' source file for Windows
2014-05-06 09:25:27 +01:00
051ceffc5d
Add some type guards to 'wstdint.h' (in case we previously #included some headers which already define those types)
2014-05-06 09:23:00 +01:00
9cf2cf55f5
Add some casting and namespace specifiers to keep MSVC happy
2014-05-06 09:20:03 +01:00
0277c8c8d1
Add a couple of missing header files (needed for cin /cout etc)
2014-05-06 09:16:59 +01:00
cd00429672
fix install path for ./waf install of waves backend
2014-05-01 10:18:30 -04:00
fa139421b9
second part of windows/osx macro change - forgot *.cpp files
2014-05-01 09:39:11 -04:00
49423427a6
alter platform-dependent preprocessor macros to use the same names as the rest of the ardour codebase
2014-05-01 09:32:18 -04:00
49ad78659b
fix compile for waves backend, after recent API change
2014-05-01 09:22:59 -04:00
66559cd795
Add AudioBackend::info() method to retrieve AudioBackendInfo object
...
Goal is to be able to call AudioBackendInfo::already_configured() from the right place.
2014-05-01 09:14:25 -04:00
ca08e4c7c7
more previously applied changes required to build Waves audio/midi backend
2014-04-30 14:24:32 -04:00
c90fef1b4c
second part of (previously applied) change to be able to use -fms-extensions with C compiler
2014-04-30 13:48:25 -04:00
19d21045af
2nd attempt at updated Waves audio backend, with added -fms-extensions as previously applied (but not updated in Waves' repo) to allow anonymous unions, as used by PortMidi
2014-04-30 13:46:41 -04:00
8a6762f189
Revert "update wavesaudio backend, now supports Windows (ASIO) as well as OS X (CoreAudio)"
...
This reverts commit f374ce69a6
.
The code does not compile on OS X, and includes changes to ARDOUR::AudioEngine
that have not landed in git.
2014-04-29 16:30:56 -04:00
f374ce69a6
update wavesaudio backend, now supports Windows (ASIO) as well as OS X (CoreAudio)
2014-04-29 16:06:39 -04:00
1f70e9472a
DummyAudioBackend: fix freewheelin' typo
2014-04-29 13:32:13 +02:00
eaafc3394a
DummyAudioBackend: implement /fake/ system ports
2014-04-29 13:32:13 +02:00
19e0383c3b
DummyAudioBackend: NOOP, white-space, clarify variable name & casts
2014-04-29 13:32:13 +02:00
058986f77b
finish unfinished work at basing all install paths on the program name
2014-04-28 21:11:08 -04:00
b945cda558
DummyAudioBackend: port-engine, midi-buffers and the rest of it
2014-04-28 23:00:40 +02:00
2fccbe1a6c
DummyAudioBackend: basic process threads and support structure
2014-04-28 22:59:19 +02:00
9907d25ea5
skeleton dummy audio-engine
2014-04-28 21:29:35 +02:00
077a194430
Add the main VC project files for building Ardour3 with Microsoft Visual Studio
...
Note that there's no 'VS Solution' file at present and some targets haven't been built yet (e.g. 'fst')
2014-04-08 09:49:35 +01:00
e6b56f3447
fix undefined value, support netjack2
2014-03-23 02:26:37 +01:00
1c402f943f
remove unnecessary files from native audio backend
2014-02-24 21:19:17 -05:00
a17f797c52
add waves audio backend when building on apple
2014-02-24 15:17:18 -05:00
6666599e7b
add -fms-extensions to allow earlier apple gcc to support anonymous union, as used by PortMidi
2014-02-24 15:16:46 -05:00
dd55b7894e
remove SampleFormat code from waves audio backend
2014-02-24 14:49:14 -05:00
1de00ab6bb
new audio engine backend for native CoreAudio audio I/O, and PortMIDI for MIDI.
...
Code builds, runs and functions. Full code review still pending, and some possibly changes to organization of code within the backend is possible
2014-02-24 14:49:13 -05:00
57ffd6c404
changes to wscript to build new audio engine backend
2014-02-24 14:49:13 -05:00
9dbdac2a19
remove unused and unimplementable audio engine sample format code
2014-02-24 14:46:19 -05:00
658bb3ccd4
finished merge of cairocanvas with windows and windows+cc branches
2014-01-10 17:11:10 -05:00
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
36c233fe6c
Merge branch 'master' into cairocanvas
2014-01-07 21:37:48 -05:00
2163467d31
add M-Audio 2496 as a recognized card for the mudita24 control panel/app.
...
(Yes, this hard coding thing is awful)
2014-01-06 11:35:57 -05:00
1676789907
fix merge conflicts from master
2013-12-12 10:06:59 -05:00
Nils Philippsen
a86b66181a
ignore "unofficial" states in jack_sync_callback()
2013-12-09 17:56:06 +01:00
59da788793
Merge branch 'master' into cairocanvas
2013-12-05 17:50:28 -05:00
2ba2a50dec
Merge branch 'master' into windows
2013-12-04 11:50:36 -05:00
ce7bfb489c
change "cpu" in cpu load backend functions
2013-12-04 11:48:31 -05:00
0258f2958b
switch from using Sleep/usleep to Glib::usleep()
2013-12-03 10:24:05 -05:00
a420328354
Reinstate call to package config for JACK backend
...
Not sure how this got lost, merge perhaps.
2013-12-03 20:28:17 +10:00
0f6a65e405
Use Sleep instead of usleep on windows in JACK backend
2013-12-03 20:28:10 +10:00
f74521b0cd
Remove command line string quoting when forming jack command line on windows
...
This used to be necessary when we started the JACK server but now that we
write a .jackdrc it only causes problems.
I have fixed this before in some branch, must have been lost in a merge.
2013-12-02 21:28:19 +10:00
a9fc076d2e
Waf options are not valid during build stage so use environment variable
2013-12-02 21:26:28 +10:00
18a59dd7fa
Include pbd/localtime_r.h in session_jack.cc for MinGW
2013-12-02 21:22:14 +10:00
3c98de9ce4
fix merge with master
2013-11-29 22:31:29 -05:00
15cee60021
merge and resolve conflict with master
2013-11-29 22:29:25 -05:00
1190f1d0e0
make JACK backend return the right set of values when asked for buffer sizes or sample rate of a device other than the one in use
2013-11-27 17:41:54 -05:00
680c64246e
Merge branch 'master' into cairocanvas
2013-11-27 16:19:01 -05:00
d63e8ba0e8
Merge branch 'master' into windows
2013-11-27 16:18:22 -05:00
611d93830a
add 0.5 second sleep after closing JACK connection so that next startup/connect is likely to work (allowing JACK time to shutdown). Ugh
2013-11-27 15:25:10 -05:00
56716a1f28
add error check to call to PortManager::reestablish_ports
2013-11-27 15:24:24 -05:00
dc4a984cd6
move AudioBackend::_start() into protected, and expand a bit on documenting ::start() vs ::_start()
2013-11-27 14:27:27 -05:00
08371ae2cf
resolve merge with master (?)
2013-11-26 10:24:51 -05:00
0cca272431
try to fix various warnings from gcc when optimization flags are enabled
2013-11-04 21:32:41 -05:00
ea1ccb869a
fix merge with master
2013-10-31 13:16:51 -04:00
7fec991077
fix thinko in declaration of ARDOUR::PortEngine::get_port_by_name()
2013-10-28 09:46:59 -04:00
a18db90264
Report an error to stderr if creation of jack command line fails.
...
Output a simple message to stderr if get_jack_command_line_string() still
fails for any reason.
2013-10-23 19:32:54 +01:00
70f0cfdb3b
Don't ever pass -d for device name to dummy jackd driver
2013-10-23 19:32:54 +01:00
903d728b9c
Fix setting playback & capture channel counts for jackd dummy backend.
...
Unlike all the other jack backends which allow setting the number of inputs and
outputs with -i & -o, the dummy backend uses -P & -C for this. Make the jackd
command line use these options when the dummy backend is requested with a
specified input or output channel count.
2013-10-23 19:29:57 +01:00
ac81ea642e
Don't fail jackd command line creation for jack dummy backend.
...
The dummy jackd backend doesn't require a device to be specified, so much
of the error checking in get_jack_command_line_string() is irrelevant, if
not actively wrong, when the dummy backend is specified.
Only perform the checks if the chosen jack backend is not the dummy.
2013-10-23 19:27:09 +01:00
d135c4dc3a
fix merge conflicts with master
2013-10-23 08:47:57 -04:00
664e715a00
merge from master
2013-10-22 15:29:44 -04:00
cfe42bc4ea
fix issues with recording while synced to JACK (non-pure-virtual method added to AudioBackend) and remove pause() from AudioEngine/AudioBackend APIs
2013-10-21 16:24:24 -04:00
b855e5f322
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
61c1956ef9
add -fvisibility=hidden to evoral, and make things work
2013-10-17 15:02:20 -04:00
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -04:00
75b933eadb
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
2013-10-16 15:55:59 +01:00