Paul Davis [Fri, 13 Sep 2013 15:55:56 +0000 (11:55 -0400)]
Merge branch 'master' into windows
Paul Davis [Fri, 13 Sep 2013 15:21:43 +0000 (11:21 -0400)]
update JACK backend to use new inheritance structure for AudioBackend
Paul Davis [Fri, 13 Sep 2013 15:21:15 +0000 (11:21 -0400)]
change inheritance so that an AudioBackend IS-A PortEngine
This allows a derived (concrete) implementation to share information (e.g. sample rate, buffer size)
between the audio backend side of things and the port management side of things.
Paul Davis [Fri, 13 Sep 2013 14:19:01 +0000 (10:19 -0400)]
explanatory comment
Paul Davis [Thu, 12 Sep 2013 21:24:45 +0000 (17:24 -0400)]
remove some debug output messages
Paul Davis [Thu, 12 Sep 2013 21:06:21 +0000 (17:06 -0400)]
don't stop metering thread when session is removed; move engine-setup code into its own method. sorry, ardour build-from-source folk :)
Robin Gareus [Thu, 12 Sep 2013 20:46:11 +0000 (22:46 +0200)]
vtl: export selected range
Robin Gareus [Wed, 11 Sep 2013 16:32:39 +0000 (18:32 +0200)]
tweak narrow-mixer-strip meters: nettings vs the_CLA. Round 3.
Paul Davis [Thu, 12 Sep 2013 20:28:51 +0000 (16:28 -0400)]
lots of changes to auto-start (and stop) the backend for latency measurements, and continuing work on the session construction/engine configuration flow
Paul Davis [Thu, 12 Sep 2013 20:27:58 +0000 (16:27 -0400)]
reinstate unblocking-of-connections in session setup, accidentally dropped in reorganization work
Paul Davis [Thu, 12 Sep 2013 18:39:17 +0000 (14:39 -0400)]
prevent key press in pre-main-window dialog(s) from crashing the program because there is no editor window to forward key presses to
Paul Davis [Thu, 12 Sep 2013 16:26:59 +0000 (12:26 -0400)]
change names, add comment, improve return type to avoid extra call to get EngineControl::State*
Paul Davis [Thu, 12 Sep 2013 15:40:56 +0000 (11:40 -0400)]
merge with master and fix Searchpath conflict
Paul Davis [Thu, 12 Sep 2013 15:32:09 +0000 (11:32 -0400)]
merge with master
Paul Davis [Thu, 12 Sep 2013 15:29:47 +0000 (11:29 -0400)]
add AudioBackendNativeThread to serve the same role as jack_native_thread_t
Paul Davis [Thu, 12 Sep 2013 15:28:50 +0000 (11:28 -0400)]
incomplete merge of master into windows (requires upcoming changes to master to be complete)
Paul Davis [Thu, 12 Sep 2013 01:00:21 +0000 (21:00 -0400)]
always add a timeout value of 200msec to jack, just like qjackctl does.
THIS IS A HACK. LONG TERM GOAL: understand why ardour gets zombified on the way up.
Paul Davis [Wed, 11 Sep 2013 20:33:40 +0000 (16:33 -0400)]
*maybe* fix issues with zombification during session loading
Paul Davis [Wed, 11 Sep 2013 17:02:32 +0000 (13:02 -0400)]
make use of measured latency values to set dialog controls, and use actual port latency to compute extra delay
Paul Davis [Wed, 11 Sep 2013 16:44:21 +0000 (12:44 -0400)]
remove some configure time tests from libs/ardour regarding JACK which are no longer relevant
Paul Davis [Wed, 11 Sep 2013 16:05:51 +0000 (12:05 -0400)]
remove unused members and code from EngineControl dialog (related to different devices for input+output)
Paul Davis [Wed, 11 Sep 2013 14:06:02 +0000 (10:06 -0400)]
make quit work even when latency measurement is in progress
Paul Davis [Wed, 11 Sep 2013 13:59:56 +0000 (09:59 -0400)]
fix handling of new session
defer save state till after everything done in post_engine_init() is complete.
Paul Davis [Wed, 11 Sep 2013 03:25:15 +0000 (23:25 -0400)]
more tweaks to latency measurement
don't open ports till absolutely necessary (store names for future use).
tidy up parts of the dialog (tab)
Paul Davis [Wed, 11 Sep 2013 02:58:33 +0000 (22:58 -0400)]
basic functionality for hardware latency measurement
Paul Davis [Tue, 10 Sep 2013 19:41:19 +0000 (15:41 -0400)]
many changes relating to session construction and audioengine interaction
every session member is now initialized using C++ constructor syntax
session construction reordered to clarify the split(s) between work
where the engine is not relevant and work where is it is. this
split is still not 100% obvious, but is enormously clearer than
previously.
if engine/backend are not running as session is created, and the SR
of the sample rate is known, attempt to force backend to that value.
Paul Davis [Tue, 10 Sep 2013 12:51:06 +0000 (08:51 -0400)]
new generic MIDI binding map for Novation Impulse 61 from Alexandre Prokoudine
Paul Davis [Tue, 10 Sep 2013 02:40:54 +0000 (22:40 -0400)]
start reordering of Session initialization
the goal is to allow a clear demarcation of where we need
the audioengine and have existing data parameters (e.g. sample rate)
for the session so that we can coerce the engine (if possible)
to match to session values.
also, to rationalize construction even more and use C++
constructor syntax as much as possible.
Paul Davis [Tue, 10 Sep 2013 01:35:47 +0000 (21:35 -0400)]
fix name of control app for Delta1010
Paul Davis [Tue, 10 Sep 2013 01:23:12 +0000 (21:23 -0400)]
move control app launching back into audio backend to allow ASIO/CoreAudio model to work; push initial state of AMS dialog to backend
Issues remain with the basic model of the AMS dialog - when is
newly chosen state pushed into the backend (which can then
modify the control app button sensitivity. This is a special
problem for this button because APIs like ASIO and CoreAudio
probably don't allow us to launch a control app for an arbitrary
device, but only one actually in use. In this sense it is
different from properties like available buffer size etc, where
we can typically query without actually using the device.
Paul Davis [Mon, 9 Sep 2013 22:06:44 +0000 (18:06 -0400)]
fix control app breakage
Paul Davis [Mon, 9 Sep 2013 21:10:58 +0000 (17:10 -0400)]
fix crash when unconditionally using null env var; tweak packing of control app button
Paul Davis [Mon, 9 Sep 2013 21:10:33 +0000 (17:10 -0400)]
add envy24 control app name
Paul Davis [Mon, 9 Sep 2013 20:48:27 +0000 (16:48 -0400)]
launching control app is now responsibility of ardour GUI, not audio backend; use ARDOUR_DEVICE_CONTROL_APP if set in the environment
Paul Davis [Mon, 9 Sep 2013 19:17:29 +0000 (15:17 -0400)]
initial work on adding access to h/w control apps when ardour starts JACK
Paul Davis [Mon, 9 Sep 2013 17:27:48 +0000 (13:27 -0400)]
add can_change_{sample_rate,buffer_size}_while_running() methods to an AudioBackend
Allows the GUI and other stuff to know whether or not changing the SR/bufsize is possible while running, which is about to become useful
Paul Davis [Mon, 9 Sep 2013 17:17:53 +0000 (13:17 -0400)]
move engine dialog from a widget to an actual dialog; emit Session::AudioEngineSetupRequired when loading a session if it is necessary
Robin Gareus [Mon, 9 Sep 2013 17:33:30 +0000 (19:33 +0200)]
hide tick-marks on narrow mixer-meters
Robin Gareus [Mon, 9 Sep 2013 16:31:50 +0000 (18:31 +0200)]
widen narrow mixer-meters,hide metric display instead
Robin Gareus [Mon, 9 Sep 2013 15:32:04 +0000 (17:32 +0200)]
meterbridge: don't display metrics of invisible tracks
Robin Gareus [Sun, 8 Sep 2013 16:26:02 +0000 (18:26 +0200)]
vtl: update to ffmpeg v1.2.1 [lib]x264 option.
Paul Davis [Sat, 7 Sep 2013 17:39:36 +0000 (13:39 -0400)]
move inadvertently moved jack_slave.cc back to its rightful spot
Paul Davis [Sat, 7 Sep 2013 15:13:07 +0000 (11:13 -0400)]
other changes for separated jack backend
Paul Davis [Sat, 7 Sep 2013 15:03:57 +0000 (11:03 -0400)]
move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work)
Paul Davis [Sat, 7 Sep 2013 01:00:01 +0000 (21:00 -0400)]
add input/output channel counts and reorganize table somewhat
Paul Davis [Fri, 6 Sep 2013 21:21:23 +0000 (17:21 -0400)]
add support in JACK backend for specifying number of input and output channels to use
Paul Davis [Fri, 6 Sep 2013 20:43:02 +0000 (16:43 -0400)]
save/restore I/O latency values in audio/midi setup
Paul Davis [Fri, 6 Sep 2013 17:39:26 +0000 (13:39 -0400)]
fix merge conflicts with audioengine
Paul Davis [Fri, 6 Sep 2013 17:06:44 +0000 (13:06 -0400)]
fix JACK backend setup so that we know about graph, port changes etc.
Paul Davis [Fri, 6 Sep 2013 14:56:36 +0000 (10:56 -0400)]
Merge branch 'master' into windows
Paul Davis [Fri, 6 Sep 2013 14:55:35 +0000 (10:55 -0400)]
fix for unconditional use of #include <malloc.h> which doesn't work on OS X
alloca() is defined in stdlib on most *nix systems
Paul Davis [Fri, 6 Sep 2013 14:39:14 +0000 (10:39 -0400)]
tighten up error handling a little bit during various setup functions for Mackie Control
Paul Davis [Fri, 6 Sep 2013 14:38:49 +0000 (10:38 -0400)]
exit early from AsyncMIDIPort::drain() if it will never be used in a process callback again
Tim Mayberry [Fri, 6 Sep 2013 00:46:20 +0000 (10:46 +1000)]
Use correct define when building ControlProtocol to export symbols
Tim Mayberry [Wed, 4 Sep 2013 09:56:14 +0000 (19:56 +1000)]
Only define certain debug flags when dist_target is auto
Fixes issue when cross compiling using MinGW
Tim Mayberry [Thu, 29 Aug 2013 23:43:44 +0000 (09:43 +1000)]
Use Glib::usleep for portability
Tim Mayberry [Thu, 15 Aug 2013 10:04:08 +0000 (20:04 +1000)]
Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
Tim Mayberry [Wed, 7 Aug 2013 11:16:27 +0000 (21:16 +1000)]
Ifdef some non-portable code for MinGW
jack_native_thread_t is HANDLE for MinGW builds of jack so using pthread API
cannot work.
Tim Mayberry [Fri, 2 Aug 2013 08:50:11 +0000 (18:50 +1000)]
Fix for isnan using MinGW compiler
Tim Mayberry [Thu, 25 Jul 2013 05:10:49 +0000 (15:10 +1000)]
Add test for writing a jack config file
Tim Mayberry [Thu, 25 Jul 2013 05:03:32 +0000 (15:03 +1000)]
Remove windows specific quoting now that jack autostart works on windows
This allows jack2 to autostart using the .jackdrc we write
Tim Mayberry [Thu, 25 Jul 2013 05:06:49 +0000 (15:06 +1000)]
Remove ARDOUR::start_jack_server now that jack autostart works on windows
Paul Davis [Fri, 6 Sep 2013 01:39:43 +0000 (21:39 -0400)]
fix a problem creating and displaying connected status for ports not owned by ardour (e.g. system:....)
This was caused by using jack_port_get_connections() which will
not return the correct status for ports owned by another JACK
client. Because of the potential for deadlock by calling
jack_port_get_all_connections(), an extra argument was added
to several PortEngine:: API calls to specify whether the call
is in a process-callback context, which defaults to true.
The only place where false is passed is within the GlobalPortMatrix
when we need to determine whether two non-ardour ports are
connected.
Paul Davis [Thu, 5 Sep 2013 18:21:25 +0000 (14:21 -0400)]
always save/keep audio/MIDI setup states so that they are available for use *after* instances where JACK was already running
Paul Davis [Thu, 5 Sep 2013 17:22:34 +0000 (13:22 -0400)]
move MidiPortManager from AudioEngine to Session
This makes the responsibilities and ownership of non-Route related MIDI ports
more clear, and removes a few wierd bits of code. It also ensures that open/close/open
on the same session will retain connections for those MIDI ports
Paul Davis [Thu, 5 Sep 2013 17:21:13 +0000 (13:21 -0400)]
shorten tab labels on audio/midi setup notebook
John Emmas [Thu, 5 Sep 2013 09:10:45 +0000 (10:10 +0100)]
'libs/ardour' - Revert 'std::llabs' to 'llabs' until we find a platform-neutral solution (MOTE - 'llabs' and '::llabs' are being used successfully in other parts of Ardour)
John Emmas [Thu, 5 Sep 2013 09:07:57 +0000 (10:07 +0100)]
'libs/ardour' - Minor changes to prevent MSVC from complaining about malformed comments
John Emmas [Thu, 5 Sep 2013 09:04:18 +0000 (10:04 +0100)]
'surfaces/mackie' - Platform specific changes
John Emmas [Thu, 5 Sep 2013 09:03:07 +0000 (10:03 +0100)]
'surfaces/mackie' - Other minor changes needed for building with MSVC
John Emmas [Thu, 5 Sep 2013 09:02:11 +0000 (10:02 +0100)]
'surfaces/mackie' - Comment out some structure field names which MSVC didn't like
John Emmas [Thu, 5 Sep 2013 08:50:58 +0000 (09:50 +0100)]
'surfaces/generic_midi' - Specify 'MIDI::byte' instead of 'byte' so the compiler knows which one we mean
John Emmas [Thu, 5 Sep 2013 08:49:10 +0000 (09:49 +0100)]
'surfaces/generic_midi' - Comment out some structure field names which MSVC didn't like
John Emmas [Thu, 5 Sep 2013 08:47:37 +0000 (09:47 +0100)]
'surfaces/generic_midi' - Minor modification to prevent MSVC from complaining about a malformed comment
John Emmas [Thu, 5 Sep 2013 08:21:30 +0000 (09:21 +0100)]
'libs/audiographer' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC
John Emmas [Thu, 5 Sep 2013 08:18:30 +0000 (09:18 +0100)]
'libs/audiographer' - Use 'alloca()' for a stack based array whose size is unknown (required to be buildable with MSVC)
Paul Davis [Thu, 5 Sep 2013 02:58:56 +0000 (22:58 -0400)]
save and restore the selected engine state at startup
Paul Davis [Thu, 5 Sep 2013 02:22:18 +0000 (22:22 -0400)]
fix up restoration of saved state from disk, still incomplete
Paul Davis [Wed, 4 Sep 2013 23:34:43 +0000 (19:34 -0400)]
save and restore audio/MIDI setup states to disk (in ardour.rc)
Not finished because the buffer size value will not always stick during restore
Paul Davis [Wed, 4 Sep 2013 19:45:54 +0000 (15:45 -0400)]
save and restore settings for different backend/driver/device combinations
So far, this is only internal - never saved to disk
Paul Davis [Wed, 4 Sep 2013 16:49:52 +0000 (12:49 -0400)]
change names of actions groups that include "jack"
Paul Davis [Wed, 4 Sep 2013 16:37:44 +0000 (12:37 -0400)]
rename interface_ stuff in the engine dialog to device_, since that feels a bit clearer terminology
John Emmas [Wed, 4 Sep 2013 14:54:35 +0000 (15:54 +0100)]
'libs/surfaces' - Add an additional visibility specifier (ARDOURCP_API as well as ARDOURSURFACE_API)
John Emmas [Wed, 4 Sep 2013 14:46:14 +0000 (15:46 +0100)]
'libs/gtkmm2ext' - Minor modification to prevent MSVC from complaining about a malformed comment
John Emmas [Wed, 4 Sep 2013 14:43:35 +0000 (15:43 +0100)]
'libs/gtkmm2ext' - Add the file 'gtkapplication_win32.c' to complement gtkapplication_x11 and gtkapplication_quartz
Robin Gareus [Tue, 3 Sep 2013 23:37:15 +0000 (01:37 +0200)]
squash another compiler warning
Robin Gareus [Tue, 3 Sep 2013 23:36:46 +0000 (01:36 +0200)]
vtl: fix small issue with video source file on export
Paul Davis [Tue, 3 Sep 2013 21:41:49 +0000 (17:41 -0400)]
Merge branch 'master' into audioengine
John Emmas [Tue, 3 Sep 2013 14:58:58 +0000 (15:58 +0100)]
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
John Emmas [Tue, 3 Sep 2013 14:53:24 +0000 (15:53 +0100)]
'libs/panners' - Remove the temporary export specifiers that were only used for testing
John Emmas [Tue, 3 Sep 2013 13:50:56 +0000 (14:50 +0100)]
'libs/panners' - Disable a compiler-specific warning
John Emmas [Tue, 3 Sep 2013 13:49:49 +0000 (14:49 +0100)]
'libs/panners' - Fix a typo in 'vbap/vbap.cc'
John Emmas [Tue, 3 Sep 2013 13:47:46 +0000 (14:47 +0100)]
'libs/panners' - Use 'std::vector' to implement arrays whose size is unknown (required to be buildable with MSVC)
John Emmas [Tue, 3 Sep 2013 13:46:01 +0000 (14:46 +0100)]
'libs/panners' - Use 'alloca()' for a stack based array whose size is unknown (required to be buildable with MSVC)
Paul Davis [Tue, 3 Sep 2013 13:08:18 +0000 (09:08 -0400)]
bump to 3.4
Paul Davis [Tue, 3 Sep 2013 12:50:38 +0000 (08:50 -0400)]
Merge branch 'master' into windows
Paul Davis [Tue, 3 Sep 2013 12:48:11 +0000 (08:48 -0400)]
fix error introduced during recent changes to Mackie control support, involving ambiguous enum usage
Paul Davis [Tue, 3 Sep 2013 12:46:57 +0000 (08:46 -0400)]
fix a few minor compilation warnings
Paul Davis [Tue, 3 Sep 2013 12:34:27 +0000 (08:34 -0400)]
Merge branch 'master' into windows
Paul Davis [Tue, 3 Sep 2013 12:33:51 +0000 (08:33 -0400)]
use visibility macros to control visibility in control surface DLL/DSO's