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
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
Julien de Kozak
27d77b8719
Fix some compilation warnings
2013-03-30 18:09:40 +01:00
16ce39c230
initial, prototype modifications to permit compilation of local libraries as static libs. required a "fix" to libs/pbd/debug.cc to even get the program up and running, and still does not work due to issues with boost::shared_ptr::enable_shared_from_this. controlled by configure-time --internal-{static,shared}-libs, set to shared by default (as has been the case for years)
2013-03-20 17:18:55 -04:00
2c3dc9861e
missing part of the midi map fix
2013-03-18 13:59:12 -04:00
1847053f66
return the full MIDI map search path from system_midi_map_search_path(), to fix #5379
2013-03-18 11:42:49 -04:00
b0fa3896f5
remove cruft (old cvsignore files)
2013-03-17 23:08:27 +01:00
8f091de64b
for MCP devices that don't handshake, turn them on as soon as we call ::connectivity_established() so that _active == true, and we will actually write to them
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14165 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-06 20:15:28 +00:00
1f9b0a86bd
fix crash when deleting a processor with a controllable ( #5284 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13943 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 13:20:43 +00:00
5adcb61f60
a few small fixes that help pitchbend control of things, notably the shuttle controller. but note that basically, teh shuttle controller is completely and hopelessly broken through excess complexity and incorrect design
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 14:48:17 +00:00
4ecb07aaee
fix up Location::first_location_(after|before) to do the right thing when marks + ranges are interleaved (functions renamed)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13869 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 13:19:16 +00:00
2eb43c8310
add copyright comments
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13859 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:22:15 +00:00
0209267980
reinstate wiimote support, thanks to work by jannis pohlmann
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 18:28:09 +00:00
397729eb18
fix continuing SNAFUs with ::set_state() for control protocols and the parent/child/grandchild relationship for the XML nodes. this corrects problems with MackieControl
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13794 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-06 14:39:27 +00:00
99b94fad77
avoid crash when switching devices in mackie control code, add locks to protect surfaces list (hopefully done without adding any deadlocks - can't test this at present)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13750 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-31 16:04:46 +00:00
104da317ff
avoid crashing in a wierd case (possibly a race) in Mackie support
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13749 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-31 15:27:38 +00:00
37906d067e
feedback for toggled MIDI controls now sends 0 or 127, not various in-between values (should fix #5117 , without any bad side-effects
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13680 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-19 01:28:41 +00:00
844ce9f359
prevent crash when saving learned MIDI binding that is now missing its controllable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-19 01:19:48 +00:00
3d4bbcd65c
save + restore OSC active+feedback state ( #5023 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-24 00:29:11 +00:00
cff8a65db2
forward part the backend part of the generic MIDI control fixes from mb2/a2
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-17 14:36:40 +00:00
3cd8138a41
convert from Glib:: to Glib::Threads for all thread-related API
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 17:48:55 +00:00
b2bbc44eaa
forward-port generic MIDI and transport controllable changes from 2.X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13066 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-23 13:31:51 +00:00
Carl Hetherington
b97a1bfb97
Connect to controllable->Destroyed in all cases; fixes crash on route removal.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12959 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 15:38:07 +00:00
Carl Hetherington
e09e185e3e
Add what I think is a missing lock when reading controllables.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12958 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 15:37:54 +00:00
1708ab55b9
fix MIDI binding stuff when the controllable does actually exist the first time we go looking for it ( #4950 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12957 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 14:44:29 +00:00
266030b79c
some generic midi debugging plus an assert
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12950 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 20:49:52 +00:00
dde521f2c6
fix up some issues introduced by lifecycle tracking of Controllable in Generic MIDI control code
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12947 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 19:10:11 +00:00
a054a74dd2
disconnect from a Controllable when it is destroyed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12938 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 01:55:53 +00:00
Carl Hetherington
0786ff15a0
Patch from royvegard to add a set-bank midi function
...
(#4949 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 19:26:00 +00:00
92469df6ab
add late/lazy binding between generic MIDI bindings and controllable elements in the session. this allows you to load a binding map that refers to elements that have not yet been created in the session, and when they are created, the binding will work
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 12:33:13 +00:00
1f440fbfec
Remove unused or unnecessary header includes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:51 +00:00
4b96a5b34d
Use std::string and Glib instead of pbd/filesystem.h in DeviceProfile
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12902 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:44 +00:00
4522ef26a2
Use Glib instead of pbd/filesystem.h in GenericMidiControlProtocol
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12901 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:42 +00:00
bc205191bf
Use Glib::file_test instead of PBD::sys::exists
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:02 +00:00
105caf23da
Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:06:54 +00:00
Carl Hetherington
3dd8fbdefa
Hush some debug messages.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-19 13:28:13 +00:00
Carl Hetherington
daffec502e
Return silence from read_from_sources() if we try to read a channel that our source does not have (if replicate-missing-region-channels is turned off); should fix #4934 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12741 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-16 18:18:30 +00:00
9429401f11
MCP: patch from seablade to fix pot displays (both absolute value and negative values)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12739 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-16 03:10:26 +00:00
Carl Hetherington
d8f48e6a9d
Fix uninitialised variable.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-14 11:32:12 +00:00
Carl Hetherington
72642335d1
Slightly tweaked patch from royvegard to add optional threshold for catch-up of non motorised controls in generic MIDI surfaces ( #4828 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 21:53:50 +00:00
Carl Hetherington
d341088f13
Fix some uninitialised variable warnings.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12702 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 15:38:15 +00:00
Rodrigo Severo
1bd34a34f7
Small change to Timecode display (SMTPE) in the Mackie.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12694 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 03:09:46 +00:00
Rodrigo Severo
335bf3d21e
Prevents a master fader being created without a control at Surface::setup_master_fader;
...
Several DEBUG_TRACE changes to help identify race conditions;
git-svn-id: svn://localhost/ardour2/branches/3.0@12693 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 03:07:50 +00:00
Rodrigo Severo
0d002fb231
Bogus commit to comment commit 12689:
...
Small patch to fix the "Solo" global button in the transport section of Mackie's.
git-svn-id: svn://localhost/ardour2/branches/3.0@12690 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 21:09:53 +00:00
Rodrigo Severo
32541205dd
git-svn-id: svn://localhost/ardour2/branches/3.0@12689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 21:04:13 +00:00
Carl Hetherington
a715e566d0
Send OSC URL announcement to the info stream.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12640 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09 22:37:05 +00:00
Carl Hetherington
661a0444f4
Fix crash in tests; not sure about the root cause.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12639 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09 22:36:59 +00:00
