Commit graph

649 commits

Author SHA1 Message Date
Paul Davis
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
Paul Davis
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
Paul Davis
e9c47051f7 conform to new CP API 2013-12-21 15:31:28 -05:00
Paul Davis
91e2b5f88a conform to new CP API 2013-12-21 15:31:28 -05:00
Paul Davis
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
Paul Davis
644ead06b4 remove debug output 2013-12-21 15:31:28 -05:00
Paul Davis
5ebc8de6cc conform to new CP API design 2013-12-21 15:31:28 -05:00
Paul Davis
ea5fde0787 conform to new CP API design 2013-12-21 15:31:28 -05:00
Paul Davis
b0a10da783 clean up aspects of ControlProtocol API 2013-12-21 15:31:28 -05:00
Paul Davis
8a005319b8 clean up aspects of ControlProtocol API 2013-12-21 15:31:28 -05:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
a17bafa964 remove some unused code from mackie support 2013-12-13 16:04:34 -05:00
Tim Mayberry
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
Paul Davis
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
Paul Davis
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
John Emmas
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
Paul Davis
5b2a5d77b8 add -fvisibility=hidden to libardour_cp (control protocol) 2013-10-17 15:09:28 -04:00
Paul Davis
61c1956ef9 add -fvisibility=hidden to evoral, and make things work 2013-10-17 15:02:20 -04:00
Paul Davis
2fab8182cc add -fvisibility=hidden to libgtkmm2ext, and make things work 2013-10-17 14:36:41 -04:00
Paul Davis
98c93ee53e tweak up DLL=1 defs for control surfaces 2013-10-17 13:30:18 -04:00
Paul Davis
5896d773e4 add export control to control protocol library 2013-10-17 13:15:24 -04:00
Paul Davis
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
John Emmas
75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc 2013-10-16 15:55:59 +01:00
Paul Davis
58e8f43052 reduce default height of mackie control GUI, as per #5713 2013-10-15 13:28:01 -04:00
John Emmas
97c68cc2b1 Merge branch 'windows' into windows+cc
Conflicts (hopefully resolved):
	libs/pbd/stacktrace.cc
2013-10-15 17:38:08 +01:00
Paul Davis
69a8fc43e2 Merge branch 'master' into windows 2013-10-15 11:17:12 -04:00
Paul Davis
f6ba1d2271 fix signed/unsigned issue pointed out by old apple gcc 2013-10-15 10:58:46 -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
5e0e41e068 Merge branch 'master' into cairocanvas 2013-09-16 22:11:50 -04:00
Paul Davis
fb45fdc052 fix conflicts and merge with master 2013-09-16 22:11:06 -04:00
Paul Davis
7cc451d81d fix language issue 2013-09-16 10:07:52 -04:00
Paul Davis
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
Paul Davis
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
Paul Davis
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
Paul Davis
79fed95c1b tighten up error handling a little bit during various setup functions for Mackie Control 2013-09-06 10:39:14 -04:00
Tim Mayberry
1e7ca12f16 Use correct define when building ControlProtocol to export symbols 2013-09-06 14:32:01 +10:00
Tim Mayberry
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
Paul Davis
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
John Emmas
f225eaa919 'surfaces/mackie' - Platform specific changes 2013-09-05 10:04:18 +01:00
John Emmas
447e986a0a 'surfaces/mackie' - Other minor changes needed for building with MSVC 2013-09-05 10:03:07 +01:00
John Emmas
a7ab40e8ae 'surfaces/mackie' - Comment out some structure field names which MSVC didn't like 2013-09-05 10:02:11 +01:00
John Emmas
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
John Emmas
5abea78d40 'surfaces/generic_midi' - Comment out some structure field names which MSVC didn't like 2013-09-05 09:49:10 +01:00
John Emmas
ee7cc091b3 'surfaces/generic_midi' - Minor modification to prevent MSVC from complaining about a malformed comment 2013-09-05 09:47:37 +01:00
John Emmas
5c8306f148 'libs/surfaces' - Add an additional visibility specifier (ARDOURCP_API as well as ARDOURSURFACE_API) 2013-09-04 15:54:35 +01:00
Paul Davis
d074bc586e Merge branch 'master' into audioengine 2013-09-03 17:41:49 -04:00
Paul Davis
a6e0b60ae1 Merge branch 'master' into windows 2013-09-03 08:50:38 -04:00
Paul Davis
9261d5908d fix error introduced during recent changes to Mackie control support, involving ambiguous enum usage 2013-09-03 08:48:11 -04:00