Commit graph

636 commits

Author SHA1 Message Date
Paul Davis
dbf8431d07 adjust MackieControl support to use new CrossThreadChannel API 2014-11-26 18:12:50 +02:00
Paul Davis
10776d498a remove port_sources management from MackieControl
This was necessary due to a bug/design issue between Glibmm and Glib (see https://bugzilla.gnome.org/show_bug.cgi?id=561885)
but the problem needs to be managed by the *creator* of the IOSource and that has now moved inside CrossThreadChannel.
2014-11-24 19:38:35 +02:00
Paul Davis
7715fe3918 remove use of CrossThreadChannel::selectable() to allow cross-platform implementation of CrossThreadChannel via Glib::IOSource 2014-11-23 17:53:18 +02:00
Paul Davis
3fb8f9e0ac compile before committing ... add extra cast required to silence compiler 2014-09-29 16:44:19 -04:00
Paul Davis
f2a48b93a3 fix const cast warning from compiler 2014-09-29 16:36:51 -04:00
Robin Gareus
e7da659104 fix CPI window handling:
Move control-surface editor-window management to the control surface.
The Preferences-Dialog is not aware of session specific or surface
specific actions and cannot properly manage the window.
2014-09-17 07:06:05 -04:00
John Emmas
77b4f4646e Modify our VC project files to work with msvc32-fixup.pl 2014-08-18 14:22:32 -04:00
John Emmas
16432f0d2f Add the MSVC project file for building libs/surfaces/osc 2014-08-18 12:44:50 -04:00
John Emmas
db3e315513 Changes needed for building surfaces/osc (control surface protocol) with MSVC
(for testing on the non-Windows platforms)
2014-08-18 12:42:09 -04:00
David Robillard
b00b75de3d Update vcproj files for changed LILV config define.
Conflicts:
	libs/audiographer/MSVCaudiographer/audiographer.vcproj
	libs/clearlooks-newer/MSVCclearlooks/clearlooks.vcproj
	libs/evoral/MSVCevoral/evoral.vcproj
	libs/gtkmm2ext/MSVCgtkmm2ext/gtkmm2ext.vcproj
	libs/libltc/MSVCltc/ltc.vcproj
	libs/midi++2/MSVCmidi++/midi++.vcproj
	libs/panners/MSVCpanners/panner_1in2out.vcproj
	libs/panners/MSVCpanners/panner_2in2out.vcproj
	libs/panners/MSVCpanners/panner_vbap.vcproj
	libs/qm-dsp/MSVCqm-dsp/qm-dsp.vcproj
	libs/surfaces/control_protocol/MSVCardour_cp/ardour_cp.vcproj
	libs/surfaces/generic_midi/MSVCardour_genericmidi/ardour_genericmidi.vcproj
	libs/surfaces/mackie/MSVCardour_mackie/ardour_mackie.vcproj
2014-08-18 12:30:01 -04:00
Tim Mayberry
dbcc1f1d39 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.

Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/session_dialog.cc
	libs/pbd/system_exec.cc
2014-08-17 18:36:02 -04:00
Tim Mayberry
c126e8cc45 Change PBD::find_files_matching_regex and PBD::find_files_matching_filter to take a Searchpath 2014-08-17 18:12:19 -04:00
Tim Mayberry
10a6fe553e Replace all use of PathScanner with equivalent functions from pbd/file_utils.h 2014-08-17 15:32:42 -04:00
Tim Mayberry
ae22d60a42 Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks
Conflicts:
	gtk2_ardour/session_dialog.cc
2014-08-17 15:31:49 -04:00
Robin Gareus
632e23de2c fix pathscanner / stl_vector related memory leaks
Conflicts:
	gtk2_ardour/session_dialog.cc
2014-08-17 15:27:45 -04:00
Robin Gareus
7e9cc0caa7 more gettimeofday() -> g_get_monotonic_time() 2014-08-16 16:49:28 -04:00
Robin Gareus
c31c15eeaa and one more gettimeofday() transition (mackie timers) 2014-08-16 16:49:23 -04:00
Paul Davis
1c84289254 remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR'] 2014-08-16 16:10:30 -04:00
Paul Davis
937c0764be finish unfinished work at basing all install paths on the program name
Conflicts:
	libs/backends/jack/wscript
	libs/backends/wavesaudio/wscript
	libs/canvas/wscript
	wscript
2014-08-16 16:10:15 -04:00
Valeriy Kamyshniy
0e5ffd5784 eliminating dependency on JACK
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 452245]
2014-04-10 09:50:18 -05:00
Paul Davis
495c0de4ac fix up waf build in wake of search path changes earlier today 2014-03-10 17:30:12 -04:00
Robin Gareus
912f07b919 mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64) 2014-03-04 15:25:58 +01:00
Paul Davis
e6c3cece64 remove recently added conflation of mingw64 and msvc with respect to symbol export 2014-03-02 14:59:08 -05:00
Paul Davis
03fd396286 fix a related-to-last-commit problem in build script for OSC support
This would have had the effect of hiding -DPACKAGE="ardour_osc" but since there is no i18n stuff in our OSC support,
it really had no effect.
2014-03-01 16:58:22 -05:00
Paul Davis
19395ac258 when mingw is mingw64, it appears that we need to use __declspec() and not __attribute__((visibility)) for export control 2014-03-01 15:16:39 -05:00
Paul Davis
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
Paul Davis
79b7fb82f3 try to get export/visibility and build conditionals right for surfaces/, once more 2014-01-25 13:57:28 -05:00
Paul Davis
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
Paul Davis
d16edb530e fix up obj.defines for generic MIDI wscript 2014-01-23 13:38:45 -05:00
Paul Davis
9d01082243 mackie code does not use poll(2) and so does not need poll.h 2014-01-23 13:38:23 -05:00
Paul Davis
8eed05be54 use correct export/visibility macros 2014-01-23 13:37:28 -05:00
Paul Davis
37b1f5017e merge with master 2014-01-14 21:13:21 -05:00
Robin Gareus
35c170937d NOOP, semantic update, don't pannable's panner for direct access. 2014-01-15 02:51:53 +01:00
Paul Davis
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
Paul Davis
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
John Emmas
897fbdc652 Small patch to see if Ben's build problem gets fixed 2014-01-05 15:08:38 +00:00
Paul Davis
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
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