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
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
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
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
c31c15eeaa
and one more gettimeofday() transition (mackie timers)
2014-08-16 16:49:23 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Paul Davis
a435e6357f
use visibility macros to control visibility in control surface DLL/DSO's
2013-09-03 08:33:51 -04:00
Paul Davis
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
Paul Davis
e711dfae12
remove misleading + incorrect documentation
2013-08-14 12:44:59 -04:00
Paul Davis
1ab61b8564
major redesign of MIDI port heirarchy and management (part 2)
2013-08-07 22:22:11 -04:00
Paul Davis
9ac6bb9bef
part-way through getting the audioengine changes to compile
2013-07-24 19:29:45 -04:00
Paul Davis
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
Julien de Kozak
27d77b8719
Fix some compilation warnings
2013-03-30 18:09:40 +01:00