5ec69e2374
move inadvertently moved jack_slave.cc back to its rightful spot
2013-09-07 13:39:36 -04:00
f96652e12a
other changes for separated jack backend
2013-09-07 11:13:07 -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
e435f22793
add input/output channel counts and reorganize table somewhat
2013-09-06 21:00:01 -04:00
ad8d83289f
add support in JACK backend for specifying number of input and output channels to use
2013-09-06 17:21:23 -04:00
0467231d6e
save/restore I/O latency values in audio/midi setup
2013-09-06 16:43:02 -04:00
4729bbde5f
fix merge conflicts with audioengine
2013-09-06 13:39:26 -04:00
0456788663
fix JACK backend setup so that we know about graph, port changes etc.
2013-09-06 13:06:44 -04:00
8c5cff6091
Merge branch 'master' into windows
2013-09-06 10:56:36 -04:00
8216eac044
fix for unconditional use of #include <malloc.h> which doesn't work on OS X
...
alloca() is defined in stdlib on most *nix systems
2013-09-06 10:55:35 -04:00
79fed95c1b
tighten up error handling a little bit during various setup functions for Mackie Control
2013-09-06 10:39:14 -04:00
018465f739
exit early from AsyncMIDIPort::drain() if it will never be used in a process callback again
2013-09-06 10:38:49 -04:00
1e7ca12f16
Use correct define when building ControlProtocol to export symbols
2013-09-06 14:32:01 +10:00
808ee5d139
Only define certain debug flags when dist_target is auto
...
Fixes issue when cross compiling using MinGW
2013-09-06 14:31:49 +10:00
d76efc97a3
Use Glib::usleep for portability
2013-09-06 14:31:31 +10:00
8ddd12a60d
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.
2013-09-06 14:31:11 +10:00
e6c7ecf0e3
Ifdef some non-portable code for MinGW
...
jack_native_thread_t is HANDLE for MinGW builds of jack so using pthread API
cannot work.
2013-09-06 14:30:54 +10:00
87a440553f
Fix for isnan using MinGW compiler
2013-09-06 14:30:45 +10:00
dadc9f63e7
Add test for writing a jack config file
2013-09-06 14:30:38 +10:00
ee00dce911
Remove windows specific quoting now that jack autostart works on windows
...
This allows jack2 to autostart using the .jackdrc we write
2013-09-06 14:30:30 +10:00
538a1e79c4
Remove ARDOUR::start_jack_server now that jack autostart works on windows
2013-09-06 14:30:19 +10:00
94efddd240
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.
2013-09-05 21:39:43 -04:00
bc1cc154dc
always save/keep audio/MIDI setup states so that they are available for use *after* instances where JACK was already running
2013-09-05 14:21:25 -04:00
1c49138e00
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
2013-09-05 13:22:34 -04:00
fee626c386
shorten tab labels on audio/midi setup notebook
2013-09-05 13:21:13 -04:00
d9994c10b4
'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)
2013-09-05 10:10:45 +01:00
a64f7fe28c
'libs/ardour' - Minor changes to prevent MSVC from complaining about malformed comments
2013-09-05 10:07:57 +01:00
f225eaa919
'surfaces/mackie' - Platform specific changes
2013-09-05 10:04:18 +01:00
447e986a0a
'surfaces/mackie' - Other minor changes needed for building with MSVC
2013-09-05 10:03:07 +01:00
a7ab40e8ae
'surfaces/mackie' - Comment out some structure field names which MSVC didn't like
2013-09-05 10:02:11 +01:00
7b5d72eabd
'surfaces/generic_midi' - Specify 'MIDI::byte' instead of 'byte' so the compiler knows which one we mean
2013-09-05 09:50:58 +01:00
5abea78d40
'surfaces/generic_midi' - Comment out some structure field names which MSVC didn't like
2013-09-05 09:49:10 +01:00
ee7cc091b3
'surfaces/generic_midi' - Minor modification to prevent MSVC from complaining about a malformed comment
2013-09-05 09:47:37 +01:00
6daeba047e
'libs/audiographer' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC
2013-09-05 09:21:30 +01:00
e14966e778
'libs/audiographer' - Use 'alloca()' for a stack based array whose size is unknown (required to be buildable with MSVC)
2013-09-05 09:18:30 +01:00
5a3cf3363b
save and restore the selected engine state at startup
2013-09-04 22:58:56 -04:00
0cc4ee7b79
fix up restoration of saved state from disk, still incomplete
2013-09-04 22:22:18 -04:00
418f2ff20a
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
2013-09-04 19:34:43 -04:00
58dd0198e6
save and restore settings for different backend/driver/device combinations
...
So far, this is only internal - never saved to disk
2013-09-04 15:45:54 -04:00
8060198f75
change names of actions groups that include "jack"
2013-09-04 12:49:52 -04:00
35cc3245db
rename interface_ stuff in the engine dialog to device_, since that feels a bit clearer terminology
2013-09-04 12:37:44 -04:00
5c8306f148
'libs/surfaces' - Add an additional visibility specifier (ARDOURCP_API as well as ARDOURSURFACE_API)
2013-09-04 15:54:35 +01:00
2f3c62c5da
'libs/gtkmm2ext' - Minor modification to prevent MSVC from complaining about a malformed comment
2013-09-04 15:46:14 +01:00
e99a85ac92
'libs/gtkmm2ext' - Add the file 'gtkapplication_win32.c' to complement gtkapplication_x11 and gtkapplication_quartz
2013-09-04 15:43:35 +01:00
4a135c82fb
squash another compiler warning
2013-09-04 01:37:15 +02:00
a6b66f1594
vtl: fix small issue with video source file on export
2013-09-04 01:36:46 +02:00
d074bc586e
Merge branch 'master' into audioengine
2013-09-03 17:41:49 -04:00
ff9e1dfe60
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
2013-09-03 15:58:58 +01:00
6f1cd7b04a
'libs/panners' - Remove the temporary export specifiers that were only used for testing
2013-09-03 15:53:24 +01:00
f43dcd2d91
'libs/panners' - Disable a compiler-specific warning
2013-09-03 14:50:56 +01:00
