80d83fd238
add a hack to deal with device discovery race, in which the devices were not actually known to be ready before the last update_surfaces() call (which is where binding between strips and routes occurs) ; add support for Mackie Control touch on/off messages
2014-02-19 23:25:08 -05:00
29b3c299a1
add a hack to deal with device discovery race, in which the devices were not actually known to be ready before the last update_surfaces() call (which is where binding between strips and routes occurs) ; add support for Mackie Control touch on/off messages
2014-02-19 13:22:52 -05:00
79b7fb82f3
try to get export/visibility and build conditionals right for surfaces/, once more
2014-01-25 13:57:28 -05:00
065e1e6334
alter surfaces build wscript to use "children" idea (like top level wscript)
...
Still not clear why this file requires the global keyword to make children global, but the toplevel wscript does not.
2014-01-23 13:39:43 -05:00
d16edb530e
fix up obj.defines for generic MIDI wscript
2014-01-23 13:38:45 -05:00
9d01082243
mackie code does not use poll(2) and so does not need poll.h
2014-01-23 13:38:23 -05:00
8eed05be54
use correct export/visibility macros
2014-01-23 13:37:28 -05:00
37b1f5017e
merge with master
2014-01-14 21:13:21 -05:00
35c170937d
NOOP, semantic update, don't pannable's panner for direct access.
2014-01-15 02:51:53 +01:00
5062a00c7d
move -fvisibility=hidden to the top of the source tree, and remove its internal use; use libtimecode as a shared lib again
2014-01-12 15:40:47 -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
897fbdc652
Small patch to see if Ben's build problem gets fixed
2014-01-05 15:08:38 +00:00
b0e4f81eb3
merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
...
Still need to add API export/visibility macros for the canvas library.
2013-12-27 14:29:06 -05:00
84f55440a3
fix redrawing of canvas with an optimized build
...
Best guess right now is that optimization does something bad when ceil() is called twice on a very large dbl-precision number,
which results in a zero (empty) redraw area. Without the removal of the redundant ceil & floor functions, no expose events
would be delivered to the canvas in an optimized build during drags (and maybe more).
2013-12-23 15:35:49 -05:00
2065a2a2ac
fix up OSC support to conform to new CP API and pay attention to feedback setting, even though feedback does nothing right now
2013-12-21 15:31:28 -05:00
e9c47051f7
conform to new CP API
2013-12-21 15:31:28 -05:00
91e2b5f88a
conform to new CP API
2013-12-21 15:31:28 -05:00
362769e967
new CP API and fix several egregious bugs with port handling when switching devices, setting state etc.
2013-12-21 15:31:28 -05:00
644ead06b4
remove debug output
2013-12-21 15:31:28 -05:00
5ebc8de6cc
conform to new CP API design
2013-12-21 15:31:28 -05:00
ea5fde0787
conform to new CP API design
2013-12-21 15:31:28 -05:00
b0a10da783
clean up aspects of ControlProtocol API
2013-12-21 15:31:28 -05:00
8a005319b8
clean up aspects of ControlProtocol API
2013-12-21 15:31:28 -05:00
f6c9fa4d89
fix a crash caused by not checking if MackieControlProtocol::_surfaces_state exists
...
I forgot to add this check when i changed the member variable to a pointer.
2013-12-14 11:10:54 -05:00
afabc09fbf
change Generic MIDI control so that it handles a SendFeedback request synchronously within a process callback
2013-12-13 16:56:34 -05:00
85cd647226
Mackie Control support now saves & restores port connections for devices not using ipMIDI (not required for ipMIDI anyway)
2013-12-13 16:04:34 -05:00
a17bafa964
remove some unused code from mackie support
2013-12-13 16:04:34 -05:00
3a885d6177
Only use __declspec(dllimport/dllexport) for MSVC compiler
...
Use the gcc visibility attributes when building with the MinGW compiler(gcc).
GCC also supports the __declspec syntax but it will not compile at the moment
until the issues(which may not even be exactly the same issues as with MSVC)
are resolved.
2013-12-05 21:11:18 +10:00
f85c67501c
reverse the visibility.h files assumptions that we don't build shared libs by default
...
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.
Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
2013-10-18 11:50:44 -04:00
683496c501
use libltc and libtimecode as static libs, and upgrade to waf 1.7
...
This is slightly awkward. It is important that we only link once to the static lib. Doing this at executable link time did not
work, possibly because waf insisted on putting the two static libraries at the front of the link list. So instead libardour
is now the point where linkage to these libraries occurs (and nowhere else). This should never be changed unless the change
just moves the linkage point to another location.
Also fix a bug with the libardour version tha was picked up by waf 1.7
2013-10-18 11:11:59 -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
5b2a5d77b8
add -fvisibility=hidden to libardour_cp (control protocol)
2013-10-17 15:09:28 -04:00
61c1956ef9
add -fvisibility=hidden to evoral, and make things work
2013-10-17 15:02:20 -04:00
2fab8182cc
add -fvisibility=hidden to libgtkmm2ext, and make things work
2013-10-17 14:36:41 -04:00
98c93ee53e
tweak up DLL=1 defs for control surfaces
2013-10-17 13:30:18 -04:00
5896d773e4
add export control to control protocol library
2013-10-17 13:15:24 -04:00
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
75b933eadb
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
2013-10-16 15:55:59 +01:00
58e8f43052
reduce default height of mackie control GUI, as per #5713
2013-10-15 13:28:01 -04:00
97c68cc2b1
Merge branch 'windows' into windows+cc
...
Conflicts (hopefully resolved):
libs/pbd/stacktrace.cc
2013-10-15 17:38:08 +01:00
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
f6ba1d2271
fix signed/unsigned issue pointed out by old apple gcc
2013-10-15 10:58:46 -04:00
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
5e0e41e068
Merge branch 'master' into cairocanvas
2013-09-16 22:11:50 -04:00
fb45fdc052
fix conflicts and merge with master
2013-09-16 22:11:06 -04:00
7cc451d81d
fix language issue
2013-09-16 10:07:52 -04:00
7c8f3adc75
allow waf to handle inconsistent case where cwiid.h is present but not the pkg-config file
2013-09-16 10:07:27 -04:00
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -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
1e7ca12f16
Use correct define when building ControlProtocol to export symbols
2013-09-06 14:32:01 +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
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
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
5c8306f148
'libs/surfaces' - Add an additional visibility specifier (ARDOURCP_API as well as ARDOURSURFACE_API)
2013-09-04 15:54:35 +01:00
d074bc586e
Merge branch 'master' into audioengine
2013-09-03 17:41:49 -04:00
a6e0b60ae1
Merge branch 'master' into windows
2013-09-03 08:50:38 -04:00
9261d5908d
fix error introduced during recent changes to Mackie control support, involving ambiguous enum usage
2013-09-03 08:48:11 -04:00
a435e6357f
use visibility macros to control visibility in control surface DLL/DSO's
2013-09-03 08:33:51 -04:00
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
41f6f5574b
fix confusion about whether flip_mode in the Mackie support code is a bool or an enum
2013-08-24 11:46:44 -04:00
e711dfae12
remove misleading + incorrect documentation
2013-08-14 12:44:59 -04:00
59a3b797d7
fix compiler warnings.
2013-08-08 15:26:16 -04:00
b5da0c852f
Revert "C++11 Building - Use new style struct field inititializing" (this code
...
change breaks gcc on several platforms).
This reverts commit bf153e58a5
2013-08-08 15:23:10 -04:00
Michael R. Fisher
0c23314e3f
C++11 Building - Use new style struct field inititializing
...
- clang with std=c++11 enabled was failing here
2013-08-08 15:23:09 -04:00
1ab61b8564
major redesign of MIDI port heirarchy and management (part 2)
2013-08-07 22:22:11 -04:00
616f2a0370
fix conflicts after merge with master
2013-08-05 14:22:32 -04:00
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
cd28d62b26
fix compiler warnings.
2013-07-28 20:32:52 +02:00
9ac6bb9bef
part-way through getting the audioengine changes to compile
2013-07-24 19:29:45 -04:00
d3850612b4
Disable building all surface plugins on MinGW build
2013-07-22 13:41:14 +10:00
1b97f147eb
Revert "C++11 Building - Use new style struct field inititializing" (this code
...
change breaks gcc on several platforms).
This reverts commit bf153e58a5
2013-07-16 14:52:52 -04:00
Michael R. Fisher
bf153e58a5
C++11 Building - Use new style struct field inititializing
...
- clang with std=c++11 enabled was failing here
2013-07-15 22:57:34 -05:00
15be154515
use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files
2013-07-15 14:29:00 -04:00
00ae5492f4
(reapply with fixes) Build system changes to support mingw build target
2013-07-15 13:43:17 -04:00
96ea407d1a
Revert "Build system changes to support mingw build target"
...
This reverts commit 94145732f3
2013-07-15 13:21:22 -04:00
94145732f3
Build system changes to support mingw build target
2013-07-15 13:16:09 -04:00
62cfd6a752
Only call configure in surface subdirectories if the required deps are available
...
I think these checks should probably be in the surface build files so they
are self contained...
2013-07-11 12:23:05 -04:00
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
298da23619
save and restore Generic MIDI threshold/smoothing value
2013-06-10 12:37:09 -04:00
4cb31ef74e
Revert all close-on-exec changes from earlier today
...
with b26cc125
2013-06-07 21:07:41 +02:00
31d234b48c
Merge branch 'master' into cairocanvas
2013-06-07 13:18:48 -04:00
bdf91de8b7
more OSC socket fcntl() close-on-exec
2013-06-07 18:02:47 +02:00
6b19f5a444
OSC bail out if server cannot be started
2013-06-07 18:02:04 +02:00
024e556cb2
close network sockets on fork
...
fixes problem with external apps (ie. video-server) inheriting them.
2013-06-07 16:54:47 +02:00
7d8def38f4
fix compiler warnings
2013-06-06 21:00:34 +02:00
36359a7d8f
correct previous premature commit re: OSC and send gain
2013-06-06 11:19:23 -04:00
addb33bc63
implement OSC /ardour/route/send/gainabs and /ardour/route/send/gainDB
2013-06-06 11:14:31 -04:00
ce8731b32d
Merge branch 'master' into cairocanvas
2013-06-06 09:52:21 -04:00
8bfaa2d3d9
move control surface prefs onto their own tab in the user prefs; for Generic MIDI GUI, rename "Threshold" to "Smoothing" and add a tooltip to describe it; fix misuse of S_() in prefs editor
2013-06-06 08:31:46 -04:00
e2f0c5f91e
merge resolution with master
2013-05-02 20:21:54 -04:00
Adrian Knoth
55e07a7243
Drop obsolete powermate code from libs/surface
2013-04-22 19:33:19 +02:00
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
cd6cbba299
rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit
2013-04-06 16:04:02 -04:00
6e485c0fc1
fix reload of Generic MIDI binding state when the target state involves just a binding map, with no specific controller bindings at all (should fix #5210 )
2013-04-06 09:13:39 -04:00
