ardour/livetrax
13
0
Fork 0
Code
13,309 Commits 1 Branch 1 Tag 197 MiB
d5fa80e01d
Commit Graph

625 Commits

Author SHA1 Message Date
Robin Gareus
bdf91de8b7 more OSC socket fcntl() close-on-exec 2013-06-07 18:02:47 +02:00
Robin Gareus
6b19f5a444 OSC bail out if server cannot be started 2013-06-07 18:02:04 +02:00
Robin Gareus
024e556cb2 close network sockets on fork 
fixes problem with external apps (ie. video-server) inheriting them.
 2013-06-07 16:54:47 +02:00
Robin Gareus
7d8def38f4 fix compiler warnings 2013-06-06 21:00:34 +02:00
Paul Davis
36359a7d8f correct previous premature commit re: OSC and send gain 2013-06-06 11:19:23 -04:00
Paul Davis
addb33bc63 implement OSC /ardour/route/send/gainabs and /ardour/route/send/gainDB 2013-06-06 11:14:31 -04:00
Paul Davis
ce8731b32d Merge branch 'master' into cairocanvas 2013-06-06 09:52:21 -04:00
Paul Davis
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
Paul Davis
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
Paul Davis
30968b8542 merge with master, including manual merge conflict resolution 2013-04-06 16:12:15 -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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
2c3dc9861e missing part of the midi map fix 2013-03-18 13:59:12 -04:00
Paul Davis
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
Robin Gareus
b0fa3896f5 remove cruft (old cvsignore files) 2013-03-17 23:08:27 +01:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Tim Mayberry
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
Tim Mayberry
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
Tim Mayberry
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
Tim Mayberry
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
Tim Mayberry
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
Paul Davis
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
Carl Hetherington
2492b43b56 Fix crash when MackieControlProtocol has gone away. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12634 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-09 21:06:22 +00:00
Paul Davis
71427323ec MCP: latest patch from Rodrigo: 
* fixes Master Fader Touch button in the Mackie;
    * implements a MasterFaderTouch global button;
    * removes unused MackieControlProtocol::_transport_previously_rolling property;
    * implements DeviceInfo::get_global_button() method;
    * creates GlobalButtonsInfo and StripButtonsInfo types in DeviceInfo;
    * implements Surface::_last_master_gain_written property to help master fader feedback;
    * makes Surface respect _mcp.device_info().strip_cnt() to create master fader and when connecting signals for strips and master fader instead of using hardcoded 8;
    * removed a few unnecessary updates in Surface::turn_it_on();
    * included master_gain_changed() in Surface::periodic();
    * implemented MackieControlProtocol::master_fader_touch_press and
    * MackieControlProtocol::master_fader_touch_release;



git-svn-id: svn://localhost/ardour2/branches/3.0@12631 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-09 19:06:52 +00:00
Paul Davis
a56ab30261 MCP: latest patch from Rodrigo: 
* delays Mackie's led initialization until the Mackie is actually ready to receive messages;
    * at the button X function mapping customization interface in Preferences:
          o show specific device names instead of global ones;
          o mark the buttons that are actually available in the device with a *;
          o included a bottom text explaining what the * means;
    * created a DeviceInfo::get_global_button_name(Button::ID) method;
    * included several DEBUG_TRACE in mackies code;
    * renamed device buttons and groups according to the following logic: Mackie buttons are named exactly like a actual (mine) Mackie names them on the interface itself. Logic Control buttons are named exactly like they appear at Logic Pro 7.2.1 Dedicated Control Surface Support manual;
    * improved timecode display (new format);


git-svn-id: svn://localhost/ardour2/branches/3.0@12582 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-06 12:20:57 +00:00
Paul Davis
6d46299df3 MCP: another patch from rodrigo: 
* setting a (arbitraty) limit to zoom out to prevent segfaults because out of memory condition;
    * setting initial update of master fader, and read, play and stop leds on the Mackie;
    * changed the timecode display char selection for update algorithm as chars are sent one by one and not all right most;
    * implemented method of showing timecode at the mackie to better deal with the differences between Ardour's foramts and Mackie's, i.e, use spaces in place of the zeros that had no meaning;
    * preventing timecode display updates when the surface isn't yet active.


git-svn-id: svn://localhost/ardour2/branches/3.0@12541 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-02 14:51:53 +00:00
Paul Davis
bbcfffc2da revert part of earlier MCP patch from rodrigo 
git-svn-id: svn://localhost/ardour2/branches/3.0@12534 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-01 21:25:12 +00:00
Paul Davis
ba5e71b50f MCP: Patch from Rodrigo that: 
* implements Metering on/off through Button::Read as per Seablade's suggestion. I choose this button as it's the "Show meters" button in Traktion;
    * removes redundant code from Meter::update_transport_rolling();
    * renames Meter::update_transport_rolling() to Meter::notify_metering_state_changed();
    * renamed Surface::notify_transport_state_changed() to Surface::notify_metering_state_changed();
    * renamed Strip::notify_transport_state_changed() to Strip::notify_metering_state_changed();
    * created MackieControlProtocol::notify_metering_state_changed() and made MackieControlProtocol::notify_transport_state_changed() use it;
    * implemented turning off of timecode display and two char display in Surface::zero_all ();
    * implemented master fader zeroing in Surface::zero_all ();
    * calling Surfaces->zero_all() at MackieControlProtocol destructor;
    * implemented restore of 2nd LCD line content after metering being active.



git-svn-id: svn://localhost/ardour2/branches/3.0@12520 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-01 12:56:20 +00:00
Paul Davis
28e3bc3ac7 MCP: metering changes from rodrigo, makes metering work correctly on the MC Pro (also checked on the nucleus) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12489 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-30 14:32:27 +00:00
Paul Davis
cd58caa93b MCP: remove misleading and confusing and out of date comment 
git-svn-id: svn://localhost/ardour2/branches/3.0@12485 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-30 00:01:15 +00:00
Paul Davis
28aed9e0d1 MCP: correct display of timecode 
git-svn-id: svn://localhost/ardour2/branches/3.0@12484 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 23:44:34 +00:00
Paul Davis
1491787cfb MCP: fix assigment of outbound sysex messages, and don't drain port->selectable() for ipMIDI devices, since this throws away all incoming data, which arrives on the same fd as port->selectable() (unlike JACK MIDI) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12483 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 23:30:13 +00:00
Paul Davis
40ef762db4 fix missing negation from previous MCP commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12482 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 20:34:19 +00:00
Paul Davis
1d5bade8a1 patch from rodrigo severo to make mackie timecode display work 
git-svn-id: svn://localhost/ardour2/branches/3.0@12480 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 20:18:43 +00:00
Paul Davis
d7a32eb85e MCP: remember to drain the x-thread FIFO that tells us that JACK MIDI data has been received 
git-svn-id: svn://localhost/ardour2/branches/3.0@12453 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-27 10:57:36 +00:00
Paul Davis
8d41955b3d missing method for MCP 
git-svn-id: svn://localhost/ardour2/branches/3.0@12449 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-25 17:56:26 +00:00
Paul Davis
7d252412c3 add support for <HasMeters value=XX/> stanza in MCP device info file 
git-svn-id: svn://localhost/ardour2/branches/3.0@12440 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-24 19:27:29 +00:00
David Robillard
27a1cf2cf7 Compile cleanly with clang. 
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-24 02:54:10 +00:00
Paul Davis
ccfeb90bdc MCP: pay attention to listen changes as well as solo changes, and reflect listen state with solo button, just like solo 
git-svn-id: svn://localhost/ardour2/branches/3.0@12385 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-22 21:38:03 +00:00
Paul Davis
8c73a62ee0 split apart mackie meter messages when we have to send two, one to turn on/off the overload indicator and one to set the level. this avoids MIDI bridge issues with non-canonical MIDI messages 
git-svn-id: svn://localhost/ardour2/branches/3.0@12367 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-21 19:02:44 +00:00
Paul Davis
d52012f398 remove Tranzport configure option, since the code will not work 
git-svn-id: svn://localhost/ardour2/branches/3.0@12353 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-21 09:30:00 +00:00
Paul Davis
813c5f0af9 major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things. 
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)

git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-18 17:24:06 +00:00
Paul Davis
b14c75172b remove inclusion of boost/signasl2.hpp 
git-svn-id: svn://localhost/ardour2/branches/3.0@12267 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-14 17:46:03 +00:00
Paul Davis
37969d837e remove virtual inheritance of sigc::trackable by Receiver and AbstractUI<T>, done by changing Gtkmm2ext::UI to use composition (HAS-A) rather than inheritance (IS-A) for Receiver; use correct synchronization when starting up a BseUI event loop thread so that tests that start/stop quickly do not encounter a race condition 
git-svn-id: svn://localhost/ardour2/branches/3.0@12264 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-14 17:07:53 +00:00
Paul Davis
60904be8ef fully tear down Mackie GUI when disabling mackie 
git-svn-id: svn://localhost/ardour2/branches/3.0@12258 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-12 14:12:51 +00:00
Paul Davis
4d780bdcd0 provide some support for mackie devices like Steinberg's CMCs that do not do the normal Mackie spec handshaking 
git-svn-id: svn://localhost/ardour2/branches/3.0@12252 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-11 16:04:09 +00:00
Paul Davis
7b903febf9 remove debug output 
git-svn-id: svn://localhost/ardour2/branches/3.0@12229 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-09 18:15:58 +00:00
Paul Davis
5a7a89e068 add a (potentially temporary) discover button for mackie devices 
git-svn-id: svn://localhost/ardour2/branches/3.0@12228 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-09 16:44:06 +00:00
Paul Davis
962cb31294 tweak MCP search paths 
git-svn-id: svn://localhost/ardour2/branches/3.0@12195 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-05 20:29:46 +00:00
Paul Davis
d8627637a5 change detection system for liblo to use pkgconfig and test in only one place 
git-svn-id: svn://localhost/ardour2/branches/3.0@12194 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-05 20:04:30 +00:00
Paul Davis
4235e9a1a2 a variety of mostly unused parameter errors from OS X Lion's compiler 
git-svn-id: svn://localhost/ardour2/branches/3.0@12148 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-02 20:29:46 +00:00
Paul Davis
eaa7cc5a73 fix up some const-ness issues starting from Evoral::Event::set(), and intersect with removing Mackie..MidiByteArray::bytes() method which made a copy of the data every time we wrote it 
git-svn-id: svn://localhost/ardour2/branches/3.0@12124 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-30 15:54:13 +00:00
Paul Davis
edad92a944 control surfaces: make it possible to keep display of current GUI/selection state as we bank through tracks/bussses. note careful use of weak_ptr<Route> to avoid messing with Route lifetimes. this scheme may change 
git-svn-id: svn://localhost/ardour2/branches/3.0@12115 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-28 01:43:38 +00:00
Paul Davis
d1af0b89a8 MCP: failure to rebank for cases where num_routes < num_strips but we're not on bank 0 
git-svn-id: svn://localhost/ardour2/branches/3.0@12112 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-27 20:35:45 +00:00
Paul Davis
ae2e8c6765 MCP: ctrl-select toggle selections status, analogous to GUI op 
git-svn-id: svn://localhost/ardour2/branches/3.0@12102 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 22:10:32 +00:00
Paul Davis
cafbc632fb MCP: more sensible version of previous commit, and better behaviour for play button after ffwd or rewind 
git-svn-id: svn://localhost/ardour2/branches/3.0@12101 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 21:57:47 +00:00
Paul Davis
ab8ebe97bb MCP: fix handling of vpot presses 
git-svn-id: svn://localhost/ardour2/branches/3.0@12100 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 21:22:36 +00:00
Paul Davis
834f94c60a fix initialization of control protocols so that brand new sessions get working control protocols if the user's ardour.rc file indicates to do so; fix MCP bank scrolling 
git-svn-id: svn://localhost/ardour2/branches/3.0@12096 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 16:18:03 +00:00
Paul Davis
3b7e2f7d67 MCP: properly (?) handle bank/channel scrolling with locked strips 
git-svn-id: svn://localhost/ardour2/branches/3.0@12095 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 14:28:41 +00:00
Paul Davis
ec97b8e58d MCP: lots of good stuff - recenable bug fixed, cursor keys for vertical scroll work, loop button lights/unlightspan pots don't adjust if there is no panner, etc. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12093 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 03:46:18 +00:00
Paul Davis
2bae75fa0b MCP: dynamic ipMIDI ports, more default key bindings, various minor fixes 
git-svn-id: svn://localhost/ardour2/branches/3.0@12092 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-25 21:21:36 +00:00
Paul Davis
ec1ef5d6b5 remove the apparently unnecessary "ui_bind()" macro from entire source base 
git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-25 12:58:19 +00:00
Paul Davis
eac10ca71c MCP: quick build fix 
git-svn-id: svn://localhost/ardour2/branches/3.0@12087 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-25 12:57:37 +00:00
Paul Davis
b31400207e MCP: various fixes, plus removal of ui_bind() (just for mackie code) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12086 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-25 04:42:01 +00:00
Paul Davis
72678cc230 revert previous commit (it should work, but did not); minor tweaks elsewhere 
git-svn-id: svn://localhost/ardour2/branches/3.0@12084 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 20:27:13 +00:00
Paul Davis
2171bba037 make generic MIDI support handle SendFeedback() in process()-context, not in the MIDIControlUI event loop 
git-svn-id: svn://localhost/ardour2/branches/3.0@12083 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 19:25:57 +00:00
Paul Davis
4e9173ff62 likely fix for various odd problems with cross-thread callbacks 
git-svn-id: svn://localhost/ardour2/branches/3.0@12082 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 19:19:39 +00:00
Paul Davis
d5e14b3d91 eventloop and abstractui debugging, lots more commenting on abstractui/eventloop implementation; minor tweaks elsewhere 
git-svn-id: svn://localhost/ardour2/branches/3.0@12076 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 16:45:38 +00:00
Paul Davis
0c026a6dc5 MCP: remove debug output 
git-svn-id: svn://localhost/ardour2/branches/3.0@12073 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 03:18:16 +00:00
Paul Davis
954b022e19 MCP: remove debugging related to selection that turned out to be about some JACK/IP MIDI layer 
git-svn-id: svn://localhost/ardour2/branches/3.0@12071 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 02:41:07 +00:00
Paul Davis
a9d77d1a70 remove various debugging output 
git-svn-id: svn://localhost/ardour2/branches/3.0@12070 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 02:35:33 +00:00
Paul Davis
33140f3267 add support for IP MIDI (multicast MIDI over IP UDP sockets) to ardour and use it if requested inside MCP code. required renaming the pre-existing MIDI::Port as MIDI:JackMIDIPort - MIDI::Port becomes the base type for both JackMIDIPort and IPMIDIPort 
git-svn-id: svn://localhost/ardour2/branches/3.0@12069 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 02:28:51 +00:00
Paul Davis
4bfdcc18bd ControlProtocol doesn't actually need any record of an event loop and doesn't need to connect to any signals itself 
git-svn-id: svn://localhost/ardour2/branches/3.0@12063 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-23 10:54:34 +00:00
Paul Davis
ac1b2a6647 MCP: another bevy of changes, including working jog wheel 
git-svn-id: svn://localhost/ardour2/branches/3.0@12056 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-22 17:37:52 +00:00
Paul Davis
82c867bf2a MCP: a fistful of improvements. probably best to just try it and see what it broken. KNOWN: pressing vpots without a bank/channel shift will crash ardour 
git-svn-id: svn://localhost/ardour2/branches/3.0@12053 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-22 02:15:24 +00:00
Carl Hetherington
9befa88deb Fix some warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12048 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-20 23:34:15 +00:00
Paul Davis
95f5c3cc80 MCP: some button handling fixes 
git-svn-id: svn://localhost/ardour2/branches/3.0@12019 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 21:34:15 +00:00
Paul Davis
260db68a69 update timecode/position display where appropriate 
git-svn-id: svn://localhost/ardour2/branches/3.0@12015 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 18:27:06 +00:00
Paul Davis
c7c9c1bd26 MCP: next try at vpot mode for pan width 
git-svn-id: svn://localhost/ardour2/branches/3.0@12013 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 17:34:31 +00:00
Paul Davis
e9dcd14bb4 MCP: bettetr vpot mode for pan width 
git-svn-id: svn://localhost/ardour2/branches/3.0@12012 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 17:05:13 +00:00
Paul Davis
028727e85c MCP: space for % 
git-svn-id: svn://localhost/ardour2/branches/3.0@12011 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 17:03:21 +00:00
Paul Davis
3cc358bc87 MCP: missing break 
git-svn-id: svn://localhost/ardour2/branches/3.0@12010 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 17:01:02 +00:00
Paul Davis
e06620280b MCP: maybe fix vpot display behavior for pan width 
git-svn-id: svn://localhost/ardour2/branches/3.0@12009 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 16:52:38 +00:00
Paul Davis
adbfd1b262 MCP: maybe fix vpot behaviour as seen with pan width 
git-svn-id: svn://localhost/ardour2/branches/3.0@12008 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 16:26:43 +00:00
Paul Davis
d53364f2cf MCP: gui stuff 
git-svn-id: svn://localhost/ardour2/branches/3.0@12007 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 16:21:16 +00:00
Paul Davis
7a2c0b9d9a MCP: maybe really fix fader dB display 
git-svn-id: svn://localhost/ardour2/branches/3.0@12006 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 14:48:37 +00:00
Paul Davis
3620530e62 MCP: maybe fix fader dB display 
git-svn-id: svn://localhost/ardour2/branches/3.0@12005 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 14:24:00 +00:00
Paul Davis
b253f464a5 MCP: more fader debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@12004 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 13:36:26 +00:00
Paul Davis
d5db31f1e4 MCP: fader debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@12003 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 13:13:42 +00:00
Paul Davis
56281ba906 MCP: gui changes; more debugging for button bnding lookup 
git-svn-id: svn://localhost/ardour2/branches/3.0@12002 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 12:20:28 +00:00
Paul Davis
40750ba0bb MCP:maybe functioning button binding stuff, plus save-to-disk-on-change (still needs naming interaction for new profile) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12000 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 03:24:59 +00:00
Paul Davis
6bd6f58dee MCP: somewhat functional (?) full keybinding GUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@11999 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-17 21:36:48 +00:00
Paul Davis
b9ff443085 MCP: various work on the button binding GUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@11997 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-17 20:41:31 +00:00
Paul Davis
0078582a5f MCP: work on rec-enable 
git-svn-id: svn://localhost/ardour2/branches/3.0@11993 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 22:33:09 +00:00
Paul Davis
b5276aa4ab MCP: work on vpots 
git-svn-id: svn://localhost/ardour2/branches/3.0@11992 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 22:30:38 +00:00
Paul Davis
e3d353715a MCP: bit more debugging for vpot press 
git-svn-id: svn://localhost/ardour2/branches/3.0@11991 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 21:01:59 +00:00
Paul Davis
bf107f93e1 MCP: no fake touch for anything, actually 
git-svn-id: svn://localhost/ardour2/branches/3.0@11989 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 19:08:22 +00:00
Paul Davis
4da123458e MCP: no fake touch for vpot 
git-svn-id: svn://localhost/ardour2/branches/3.0@11988 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 19:07:37 +00:00
Paul Davis
72d17d326e MCP: a fistful of changes 
git-svn-id: svn://localhost/ardour2/branches/3.0@11987 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 19:05:27 +00:00
Paul Davis
02c498a8fa MCP: make v-pot press work; work ongoing on general keybindings 
git-svn-id: svn://localhost/ardour2/branches/3.0@11985 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 13:06:39 +00:00
Carl Hetherington
23973bae24 A few tweaks to make Ardour build in GCC -std=c++0x mode. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11983 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 19:28:44 +00:00
Paul Davis
bef36b6f65 cmd-press on vpot should lock strip; shift-press resets pot param to default 
git-svn-id: svn://localhost/ardour2/branches/3.0@11980 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 15:43:25 +00:00
Paul Davis
97c2832d35 MCP: probably fix issues with vpots not working 
git-svn-id: svn://localhost/ardour2/branches/3.0@11979 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 14:30:03 +00:00
Paul Davis
2926372b75 add mapping from button ID to name for new button IDs 
git-svn-id: svn://localhost/ardour2/branches/3.0@11978 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 13:50:43 +00:00
Paul Davis
d314490797 share buttons IDs where feasible 
git-svn-id: svn://localhost/ardour2/branches/3.0@11977 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 13:41:20 +00:00
Paul Davis
65fe4f9edf new button IDs, one for MCP one for LCP, plus methods associated with them; SSL Nucleus now declares itself to be using Logic Control 
git-svn-id: svn://localhost/ardour2/branches/3.0@11976 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 13:28:45 +00:00
Paul Davis
24377e9fb2 MCP: the return of the master fader 
git-svn-id: svn://localhost/ardour2/branches/3.0@11973 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-14 20:38:42 +00:00
Paul Davis
2ed2b61224 MCP: redesign to allow device-specific button IDs, since we know that at least one device (nucleus) does not honor mackie's specification document 
git-svn-id: svn://localhost/ardour2/branches/3.0@11972 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-14 19:02:54 +00:00
Paul Davis
32766ce215 MCP: hack test for ssl nucleus fader touch 
git-svn-id: svn://localhost/ardour2/branches/3.0@11970 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-14 11:39:25 +00:00
Paul Davis
3789e7cdef MCP: hack #2 for Nucleus fader touch messages 
git-svn-id: svn://localhost/ardour2/branches/3.0@11969 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-14 01:02:40 +00:00
Paul Davis
e240fb16bd MCP: hack for Nucleus fader touch messages 
git-svn-id: svn://localhost/ardour2/branches/3.0@11968 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-13 22:49:58 +00:00
Paul Davis
e36aa889eb MCP: off by one error 
git-svn-id: svn://localhost/ardour2/branches/3.0@11967 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-13 22:10:41 +00:00
Paul Davis
69830c477e MCP: catch noteOff to see note-on+velocity=zero messages; more GUI tweaks 
git-svn-id: svn://localhost/ardour2/branches/3.0@11966 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-13 21:46:26 +00:00