741ff552a0
push2: start tracking route properties in cue layout
2022-08-27 16:22:07 -06:00
06abdb4c4e
push2: vector, not map
2022-08-27 16:03:01 -06:00
6627d24c2b
push2: add an (x,y) map for pads and use it
2022-08-27 15:53:03 -06:00
a5dd6c1128
push2: lots more clip control functionality and display
2022-08-27 12:55:16 -06:00
b10a99dcad
push2: clip stop ala Live
2022-08-27 08:32:15 -06:00
19db8f9c68
control protocols: fix design of trigger unbang method
2022-08-27 08:32:03 -06:00
3cffca9178
control protocols: add trigger unbang method
2022-08-27 08:26:08 -06:00
8ed8895439
push2: launch clips with pads
2022-08-27 08:15:40 -06:00
26c48aae1b
control protocols: add trigger bang method to BasicUI
2022-08-27 08:15:17 -06:00
092fdb5b46
push2: turn off scene buttons when appropriate
2022-08-26 19:31:15 -06:00
1ecdeb25a7
push2: an ever-growing array of cue-related support
2022-08-26 19:23:43 -06:00
f835fb279a
push2: don't like the clip button since it does nothing
2022-08-26 17:40:41 -06:00
f57669fbde
push2: rename things to match the rest of ardour, and use Session button not Clip
...
the clip button is intended to "look at" a single clip and edit it
2022-08-26 17:40:04 -06:00
17b0764639
push2: clip view actually visible via button on surface
2022-08-26 16:39:36 -06:00
dd2442b0c2
push2: skeleton for new clip view layout
2022-08-26 16:15:32 -06:00
58d262384b
fix error during rebase fixup
2022-08-26 14:49:29 -06:00
7670f87d0a
Push2: Use condensed font to avoid overlap in scale menu
2022-08-26 14:10:40 -06:00
7883695ba9
Push2: Implement special "sequential" mode for in-key note grids
...
This makes "sequential" more or less mean an octave vertical interval,
but only for in-key mode. For chromatic mode, "sequential" is still just a
naive wrap-around layout for every note.
2022-08-26 14:10:40 -06:00
a6cd0a3f6e
Push2: Ensure every pad is set up once when the grid layout changes
...
This juggles the implementation slightly in a way that's more resilient to
mistakes: the representation of pads in the surfaces is always fully reset
before setting up the grid, and a state message is sent for every single pad
once after the scale algorithm sets things up.
This means that scale algorithms don't need to deal with hairy edge cases like
running off the end of the scale or the valid range of MIDI notes.
2022-08-26 14:10:40 -06:00
b6389bf274
Push2: Show both row and column interval explicitly in the same way
...
This hopefully makes the layout clearer to people who aren't familiar with what
all the settings mean.
2022-08-26 14:10:40 -06:00
e4e874bed0
Push2: Add "fixed" and "rooted" note grid option
2022-08-26 14:10:40 -06:00
ecd1a9660b
Push2: Fix Db root button
2022-08-26 14:10:40 -06:00
380a24b837
Push2: Remove debug printing
2022-08-26 14:10:40 -06:00
e93b7e2507
Push2: Add UI for changing the vertical interval
2022-08-26 14:10:40 -06:00
d5ca05edff
Push2: Implement a vertical interval for "tuning" the pads
...
The implementation is generic, but the actual call is hardcoded to 4ths here.
UI to follow.
2022-08-26 14:10:40 -06:00
b35796af75
Push2: Factor out set_pad_note_kind()
...
Factors button details out of the scale algorithm, to make it more clear.
2022-08-26 14:10:40 -06:00
2af9c2180a
Push2: Mostly fix scale menu text rendering ( #8599 )
...
"Mostly" because there are still some issues with horizontal overlap between
entries, but I think that's something that needs to be addressed separately.
Like earlier issues, this was caused by using a screen-derived or default
cairo/pango context. I also tinkered with some constants to make things look
sensible to me, and hopefully everywhere since it should always look the same
with the context fix.
2022-08-26 14:10:40 -06:00
2a31e0721d
Push2: Invert splash screen
...
This looked janky and out of place to me, since everything else is on black and
the LCD doesn't seem to do light backgrounds very well in general.
2022-08-26 14:10:40 -06:00
c4632da2e7
Push2: Drop "using namespace std"
...
No functional changes, just makes some more context explicit like the previous
commit.
2022-08-26 14:10:40 -06:00
61088a1a01
Push2: Use consistent naming convention for private member variables
...
No functional changes, just makes code easier to read.
2022-08-26 14:10:36 -06:00
Mads Kiilerich
3fa64af624
osc: fix warning message
...
Apparently just a missing update from copy-paste.
2022-08-19 10:58:41 -06:00
Mads Kiilerich
1f1565e08b
surface faderport: drop old debug print
...
This showed up in test output, and was introduced 5 years ago in
ecc2348ecc
2022-08-19 10:56:55 -06:00
db8262bd7b
Mackie Control: Use view names from Mackie spec and define them all
2022-08-05 00:50:27 +02:00
de0893cc8d
backport to Ardour: Don't set the MCU Click led state from the button
...
Allow the update process to get the correct state and update the LED.
2022-08-05 00:43:02 +02:00
luz paz
47c525315d
Fix various typos
...
Found via `codespell -q 3 -S *.po,./.git,./share/patchfiles,./libs,./msvc_extra_headers,./share/web_surfaces,*.patch -L ba,buss,busses,discreet,doubleclick,hsi,ontop,ro,scrollin,seh,siz,sord,sur,te,trough,ue`
2022-08-03 12:10:01 -06:00
1f65c66727
MCU: fix mixer-strip buttons (see also 0d9656ef82)
2022-07-15 23:46:28 +02:00
c6566f3933
mackie protocol: add more null checks; remove some debug msgs
2022-06-30 16:47:17 -05:00
198df78cfe
mackie debugging: ugly printouts
2022-06-30 14:04:51 -05:00
66bd195030
mackie protocol: potential crash-fix
2022-06-30 11:30:07 -05:00
0d9656ef82
use new macros to cleanup #ifndef NDEBUG as much as possible (libs edition)
2022-06-22 13:31:08 -06:00
41948821e2
fix optimized unused variable warning
2022-06-22 13:31:08 -06:00
ebb9d3d4dc
fix optimized unused variable warning
2022-06-22 13:31:08 -06:00
26d2c8a7fa
handle compiler stupidity with early return
2022-06-22 13:31:08 -06:00
bb5798ee66
fix may-be-used-unset warning and bizarre brace/indent style
2022-06-22 13:31:08 -06:00
6fd4c01fc9
fix optimized unused variable warning
2022-06-22 13:31:08 -06:00
4878c48386
fix optimized unused variable warning
2022-06-22 13:31:08 -06:00
7a32ff33d4
handle compiler stupidity with early return
2022-06-22 13:31:08 -06:00
f7b91d577b
handle compiler stupidity with early return
2022-06-22 13:31:08 -06:00
9922daf284
handle compiler stupidity with early return
2022-06-22 13:31:08 -06:00
d66bda9f07
mackie send subview: potential fix for send-enable banking (vpot push)
2022-06-16 13:27:30 -05:00
75fe2ce095
generic MIDI: extend select function API and make argument be bank-relative, always
2022-06-05 15:37:04 -06:00
eb4ac77a7b
control protocol: allow protocol implementations to override rid selection API
2022-06-05 15:36:41 -06:00
2e027e5894
generic MIDI: re-enable the "select" function
2022-06-05 15:03:48 -06:00
33b7c38e42
control protocols: add API to control selection by RID
2022-06-05 15:03:48 -06:00
dancesWithBugs
e505407b76
fix boundary check
2022-05-28 19:14:57 +02:00
cc2e6b3cf8
libardour: change API of Session::request_locate() to include "force" argument
...
No behavior should be changed by this modification; the argument has a default value of false, which
matches previous semantics, and every instance where the argument is specified, it is given as false.
2022-05-27 18:49:11 -06:00
9758e6280f
use new event loop callback to ensure that all surface/control protocol threads have tempo map ptr set
2022-05-16 15:24:52 -06:00
2079a150dd
probable fix for Mackie vpot press/release misbehavior in sends (and plugin) subview
...
The accessed control needs to reflect the current subview banking
2022-05-16 15:24:52 -06:00
be90b4e0ca
US2400 - fix crash when no strip is selected
...
first selected could be null, so check that first.
This is untested since I don't have a surface.
2022-05-10 09:17:33 -05:00
44bb8caa65
Use new Route fed-by API (2/2)
2022-05-06 14:02:35 +02:00
3862d13e21
Prepare for GraphNode::feeds () and fed-by API update (2/2)
2022-05-06 14:02:34 +02:00
Caleb Potter
b689d2881e
M: US2400: allows user to bank over sends while in TrackView.
...
Sends only appear on the last 8 vpots, which means sends to matrices 9-12
are unreachable without banking.
2022-05-02 22:41:40 -06:00
Caleb Potter
20fff72370
US2400: Use Bank- and Bank+ to page over sends on pots
2022-05-02 22:41:40 -06:00
Caleb Potter
0d05cd231b
US2400: maps track parameters and sends to vpots
...
Pots 0-4 now display the 5 parameters from the Mackie track subview when a
track is selected and pots 8-23 will display up to the first 16 sends.
2022-05-02 22:41:40 -06:00
7cd16d9473
Apply new Item method name to various other usage sites
2022-04-27 13:16:18 +02:00
c9b8a91edb
apply new Item method name to various other usage sites
2022-04-26 22:04:08 -06:00
Caleb Potter
8b82de7ac1
Prevents user from infinitely banking right in mackie plugin subview
...
Changes handle_cursor_right_press() in PluginSubviewState to pure virtual
function so that PluginSelect and PluginEdit can each have their own
version.
2022-04-18 11:14:53 -06:00
Caleb Potter
f3bd740913
Formatting. Adds spaces before parentheses
2022-04-18 11:07:45 -06:00
Caleb Potter
8e375f5acd
Moves left brackets to be on the same line as conditionals
2022-04-18 11:07:45 -06:00
Caleb Potter
bc6461dc76
Prevents user from infinitely banking right in mackie sends subview
2022-04-18 11:07:45 -06:00
Caleb Potter
17a7dbe06d
adds ability to bank over in mackie sends subview
...
The cursor_left and cursor_right mackie control buttons will now move the
sends subview left and right like it does in the plugin subview. Previously,
if you had more than 8 sends (which is almost always the case for Mixbus),
then sends 9+ were unreachable on an 8 channel controller.
2022-04-18 11:07:45 -06:00
844479568b
fix building OSC surface (amend 9b89dd7967)
2022-04-14 04:49:23 +02:00
Mads Kiilerich
49855e52aa
wscript: consistently have at most one empty separator line
2022-04-09 12:16:40 +02:00
Mads Kiilerich
bac32a8c2d
wscript: consistently use 4 spaces for indentation
2022-04-09 12:16:40 +02:00
Mads Kiilerich
c3bdcdd3fa
wscript: consistently use space indentation instead of tab indentation
2022-04-09 12:16:40 +02:00
Mads Kiilerich
06f8936a73
wscript: remove trailing whitespace
2022-04-09 12:16:37 +02:00
7c3268d12f
temporal: TempoMap::use() returns a const ptr to enforce semantics (library version)
...
This commit leaves two issues outstanding:
1. unclear/ugly semantics for drag operations that reset the GUI thread's tempo map to the writable copy
2. undo/redo for the tempo map
These will be addressed in future commits
2022-04-08 11:58:04 -06:00
Remi Thebault
a77ac7107f
fix websockets toggle_roll
...
Also fix BasicUI::toggle_roll who is supposed to do
the same as spacebar but doesn't.
2022-04-08 19:48:23 +02:00
Remi Thebault
93987de09f
websockets provide BBT
2022-04-08 19:39:25 +02:00
Mads Kiilerich
9b89dd7967
wscript: drop liblo check in libs/surfaces - it is already mandatory in top level wscript
2022-04-08 18:39:15 +02:00
7bf89ce109
Constification: make Stateful::get_state() const, with all other required const-ness added (libs)
2022-04-06 21:56:59 -06:00
CalebJPotter
e64fdcfb55
fixes issue where monitor section gets stuck on mute
...
This mute button wasn't meant to mute the monitor section in the first
place.
2022-03-17 15:37:07 -06:00
Caleb Potter
643342995d
fixes issue where MCP controller strips got stranded switching banks
...
This commit fixes an issue where if your controller was currently on a
bank not near the first few tracks, and you then deleted tracks, the
controller bank buttons would appear unresponsive because of the
"if (initial >= sorted.size())" check in switch_banks().
This would occur when the difference between the _initial_bank and
whatever sorted.size() returns was greater than or equal to strip_cnt.
For example, if your _initial_bank was 48, your strip_cnt was 24 and you
had 24 tracks after the deletion, then the above conditional would evaluate
to true and exit out of switch_banks BEFORE actually switching the bank,
effectively stranding the controller unless you added enough tracks back.
2022-03-17 15:37:07 -06:00
Caleb Potter
e89d85f776
remaps button handlers specific to iCon QCon ProG2
...
If the QCon ProG2 is selected as the device profile, then the button map
will be built with handlers that map specific to the iCon QCon ProG2
controller.
2022-03-17 15:37:07 -06:00
Caleb Potter
ad4475fe7a
adds iCon QCon ProG2 specific MCP button handlers
...
Adds function to clear solo and (with shift) mute all channels.Adds
function to save and (with shift) save as. Adds function to toggle all
processors on selected track. Adds functions to select track to the
left/right. Adds function to add marker and (with shift) remove marker at
playhead. Adds function to undo without needing shift modifier.
2022-03-17 15:37:07 -06:00
Caleb Potter
b846356f87
adds MCP button to toggle between master fader and monitor fader
...
Adds an MCP button function to switch the master fader on the controller
between the session master fader and (if enabled) monitor fader.
2022-03-17 15:37:07 -06:00
Caleb Potter
b6a1144472
adds a few general purpose MCP button functions
...
Adds a function to go to the next and previous marker. Adds a function to
redo (without requiring a shift modifier). Adds a function to open a
project.
2022-03-17 15:37:07 -06:00
Caleb Potter
381276e862
adds support for iCon QCon ProG2 controller
...
This commit does no remapping, but it adds the Pro G2 as a value in the
device profiles.
2022-03-17 15:37:07 -06:00
Caleb Potter
d1f4679abc
adds support for iCon Platform M+ controller
...
Adds a device profile for iCon Platform M+ controller and new function
that flips between editor and mixer window. This function is mapped to
"mixer" button on controller.
2022-03-17 15:37:07 -06:00
Caleb Potter
fc961f1622
adds support for MCP device-specific button to function remapping
...
Adding this function so that different devices can remap their buttons
to functions based on device profile.
2022-03-17 15:37:07 -06:00
7633005a22
Fix solo control activation
2022-03-17 13:51:30 -07:00
f58b8e3cb4
fix accidental insertion of "x1"
2022-02-09 10:08:01 -07:00
e77e3b35b8
mackie: fix crash when using thread-local tempo map
...
TempoMap::use() assumes the thread_local pointer has been set up. This
is not the case for the control protocol event loop, so call ::fetch()
instead which does not require this assumption (and sets the thread_local
pointer too, though nothing else in the Mackie code uses it)
2022-02-09 10:08:01 -07:00
Mads Kiilerich
8bb91099c5
wscript: drop configure statements already present in the top level wscript
...
Avoid repeated pointless configure messages like:
Checking for 'g++' (C++ compiler!) : /usr/lib64/ccache/g++
Checking for 'gcc' (C compiler) : /usr/lib64/ccache/gcc
2022-01-22 22:19:03 +01:00
9ee4c14bce
generic MIDI: extend menu options to drop ALL MIDI bindings, not just a binding map
2022-01-15 13:15:38 -07:00
16511974e2
Fix class/struct mismatch C++ ABI [-Wmismatched-tags]
2022-01-10 00:06:24 +01:00
12847b0125
remove Session::bbt_time() and use TempoMap::use()->bbt_at() explicitly everywhere
2021-12-14 21:59:33 -07:00
58796e6b19
fix likely crash in faderport8 support, from calling TempoMap::use() and not TempoMap::fetch()
2021-12-13 21:07:18 -07:00
Marijn Kruisselbrink
0e799357a8
Fix crash in mackie strip code.
...
Strip::notify_property_changed accesses _stripable without verifying
that is not null. However it is possible for this to be null, so
add a null check.
2021-12-13 21:03:38 -07:00
d04d25e7c7
Mackie Control: Clean up detection of QCon master display and meter.
...
Only enable the master display and meter modes for Qcon devices if this
surface is in the master position. Extenders don't have master meters
or master displays.
2021-12-13 21:26:45 -06:00
d60a5187bd
Mackie Control: Fix detection of QCon Extenders so 2nd LCD is correct
...
Logic to detect an extender has to be based on if this surface object is
the master position. Has master fader is true for all surfaces in this
"device".
2021-12-13 21:25:07 -06:00
60be0c27a1
Use updated temporal API 1/2
2021-12-11 14:42:36 +01:00
fcf0c253ad
control surface changes to follow TempoMap::sample_at() API change
2021-11-17 15:57:54 -07:00
Bruno Vernay
e3836e1162
Typo in code Paramater
2021-10-30 23:02:04 +02:00
2066b6b33a
websockets: require Windows7 (with pollfd)
2021-10-13 21:40:39 +02:00
2e0a069c51
WebSockets: use v7 tempo-map correctly
2021-10-12 15:32:41 +02:00
9e763c2672
remove all dangling event-loop-precall code
2021-10-11 17:48:53 -06:00
9adc336d50
control surfaces: fix BasicUI::jump_by_bars() to use tempo map correctly
2021-10-11 17:48:53 -06:00
52decdd1b4
push2: prevent crash caused by missing per-thread tempo map ptr
2021-10-09 11:47:13 -06:00
3475350d7c
push2: session button should be lit
2021-10-09 11:46:53 -06:00
ed3d374f47
Fix --no-nls compilation 1/2 -- #8802
...
pbd/i18n.h MUST NEVER be included from header files and always be
the last include. This is because `_` is declared other headers
notably boost and some apple headers.
leading to issues like
../libs/pbd/gettext.h:58:27: error: expected unqualified-id before ‘const’
58 | # define gettext(Msgid) ((const char *) (Msgid))
2021-09-27 16:28:44 +02:00
b3fff25d5c
Fix --maschine builds (pure virtual)
2021-08-13 21:53:18 +02:00
c0425ba70f
canvas: items should not add child bboxes in their ::compute_bounding_box() method, Item::bounding_box() does that
2021-08-13 12:51:37 -06:00
8bada4b5e1
remove public ::bbt_at (INTEGER) methods, because of superclock_t/samplepos_t confusion
...
libtemporal still needs ::bbt_at (superclock_t) fairly often so retain it as a private method, but public
interfaces take either Beats or timepos_t
2021-08-13 12:51:35 -06:00
3702da5488
fix up osc support after rebase/merge conflicts
2021-08-13 12:51:33 -06:00
364fffd458
temporal: TempoMap::Changed is now a static member named TempoMap::MapChanged
2021-08-13 12:51:32 -06:00
c64db47b37
use new libtemporal sample rate mechanism (libs edition)
2021-08-13 12:51:31 -06:00
bed76798f3
manual fixups after rebase against master (general libs edition)
2021-08-13 12:51:31 -06:00
11af6253f5
mackie: NOOP: fix whitespace
2021-08-13 12:51:31 -06:00
b866335d8f
add glib event loop callback to Generic MIDI surface support
2021-08-13 12:51:30 -06:00
ce7ea4ec36
Use glib event callback in Mackie Control support to set thread-local variables
2021-08-13 12:51:30 -06:00
79763893b3
remove/hide Session::tempo_map() and use TempoMap::use() instead (thread local shared ptr)
2021-08-13 12:51:30 -06:00
f67029bd02
random commit to facilitate trivial move of work from laptop back to main system
2021-08-13 12:51:29 -06:00
086e48796c
surfaces: first round of conversion to use timeline types
2021-08-13 12:51:29 -06:00
f4490f54c5
change Timecode::BBT_Time to use Temporal namespace, plus a couple of other minor changes to enable compilation
...
This still uses the tempo map object in libs/ardour, not the new one in libs/temporal, and isn't likely to be functional
(though it could be)
2021-08-13 12:51:28 -06:00
60f3985957
replace push2 call to Canvas::Box::pack_start() with Canvas::Box::add() which is equivalent
...
::pack_start() was removed
2021-08-13 12:51:26 -06:00
210702481b
add required virtual method to Push2Canvas
2021-08-13 12:51:26 -06:00
9e5354a65e
tweak a minor issue with canvas API
2021-08-13 12:51:26 -06:00
bd008fb87c
Mackie Control: Fix logic in timecode display update
...
Old and new strings are compared before sending to keep traffic down. To
ensure that we send all the required characters be sure to init the last
value to characters that are never going to appear in a real string.
Space is a bad choice since it is a valid character. Use NUL instead.
2021-08-10 16:20:36 -05:00
4001fc2cff
Mackie Control: Use space as replacement for invaild characters on TC disp
2021-08-10 16:17:11 -05:00
563309f6d1
Mackie Control: Fix one off error in timecode display that broke spaces
...
Ignored spaces and allowed character 0x60 which is not valid on the display
2021-08-10 16:16:08 -05:00
8cf7204917
Mackie Control: Use selected device's info when building the Keys dialog
...
The device info file allows key names and values to be configured in each
device file. Use that information when building the Functions Keys tab in
the Mackie protocol setup dialog.
2021-08-06 12:18:24 -05:00
c1dddb1b25
Mackie Control: Be consistent and take the surfaces lock when iterating.
...
Some places in the code take the lock, others don't. This makes everyone
take the lock.
2021-08-03 16:26:26 -05:00
a84543bcc7
Mackie Control: Don't crash when the master is on the right
...
While surfaces are being created it is possible to have surfaces, but
not have a master surface yet. This happens when the config calls
for extenders to the left of the master section. Don't assume that
if we have surfaces, the master surface is available.
2021-08-03 16:26:26 -05:00
454b330950
Mackie Control: Hold the surfaces lock while resetting the master_surface
2021-08-03 16:26:26 -05:00
193cebc912
US2400: build-fix: need some IFDEFs for Mixbus.
2021-08-03 10:58:30 -05:00
521117054e
US2400: Fix order of mixbuses in Flip mode (Mixbus only)
2021-08-03 10:38:19 -05:00
398a1efbd5
US2400: Fix send levels from joystick ("surround pan" on mixbuses 11,12) (Mixbus32C only)
2021-08-03 10:38:18 -05:00
0b5ab1b570
US2400: Fix direction of pan knob LEDs
2021-08-03 10:38:18 -05:00
a22fe3cdc8
Amend 285bb4ac7f: remove incomplete code
2021-07-19 20:32:11 -05:00
285bb4ac7f
Mackie Control : Improve debug trace output by skipping meter write output
2021-07-19 12:25:27 -05:00
581589f080
Mackie Control: Don't call port write directly since it bypasses active chk
...
This keeps the master fader from sending midi output before everything
is initialized.
2021-07-19 12:24:36 -05:00
3114ef4de2
Default_Play_Speed: prep work (libardour)
...
* remove unused variables in session.h
* move default play speed (varispeed(sic)) into fsm
* request_transport_speed should -never- set the default_play_speed
2021-07-03 19:06:02 +02:00
45f9b45bff
Mackie Control Surface: Improved support for iCON QCon Pro X
...
Support the second LCD on the Pro X and use it for channel strip labels.
Support the stereo master meters on the Pro X
2021-07-02 16:00:51 -05:00
7a5ccdd3c3
Mackie Control Surface: Move meter deflection calc to a function.
2021-07-02 15:56:11 -05:00
e94239cc92
Mackie Control Surface: Update the meters even when the transport is stopped
2021-07-02 15:53:20 -05:00
41ac0cb753
Mackie Control Surface: Correctly handle the Monitor section being removed.
...
Adding a Monitor section updated the surface but removing one did not.
2021-07-02 15:51:53 -05:00
c63918ec68
Clear Mackie Control surfaces once connected.
...
This gets the surface in a known state. Otherwise a previous application
or run of ardour may have left LEDs on that are not being used.
2021-07-02 15:43:37 -05:00
b35a8f6626
Fix Wsign-compare, consistently use microseconds_t
2021-06-29 02:04:02 +02:00
b20a541d7e
change PBD::microseconds_t to a signed type and check for -1 in TimingStats::update
...
This may help a Windows issue with the return value of QueryPerformanceCounter
2021-06-28 14:47:48 -06:00
b58dfc7f0f
Resolve microseconds_t ambiguity 1/2
...
This resolves a PBD vs ARDOUR namespace error for some compilers:
```
error: reference to 'microseconds_t' is ambiguous
libs/pbd/pbd/microseconds.h:29:19: error: candidates are: typedef uint64_t PBD::microseconds_t
libs/ardour/ardour/types.h:81:29: error: typedef PBD::microseconds_t ARDOUR::microseconds_t
```
2021-06-27 17:33:05 +02:00
9cbaa31c7e
libs fix for get_microseconds() move to libpbd
2021-06-26 18:27:39 -06:00
83b9ab1bee
Temporarily revert ongoing varispeed development
...
This reverts bf88f3fe6435813db0f4
2021-06-26 18:58:24 +02:00
006055a2ff
Default_Play_Speed: prep work (libardour)
...
* remove unused variables in session.h
* move default play speed (varispeed(sic)) into fsm
* request_transport_speed should -never- set the default_play_speed
2021-06-25 11:51:34 -05:00
db1821a363
Fix crash when removing plugin with mapped controllable #8756
...
MidiControlUI drops the reference to a given controllable in
its own thread. This can happen after the plugin is already
destroyed (even though the PBD::Controllable still exists).
2021-06-21 05:27:11 +02:00
e7466bddbc
Push2: Clean up forward declarations
2021-06-18 13:53:53 -04:00
cc6b58ef00
Fix Windows builds (pthread handle abstraction)
2021-06-17 13:32:10 +02:00
f85bbaa97d
Fix C++11ism
2021-06-16 03:03:26 +02:00
Luciano Iam
04104b68a6
WebSockets: fix surface build for older systems
2021-06-14 14:50:48 +02:00
Luciano Iam
5fffe985bb
WebSockets: update some source headers
2021-06-14 14:45:51 +02:00
Luciano Iam
6cc59ad8e6
WebSockets: update some comments in source
...
Based on feedback from libwebsockets author
https://github.com/warmcat/libwebsockets/issues/2322#issuecomment-860572124
2021-06-14 12:25:29 +02:00
Luciano Iam
f1d7e1759a
WebSockets: repeat 8baf275 for JS files
...
Like ec131fc
2021-06-14 10:25:45 +02:00
Luciano Iam
ebee3a8010
WebSockets: remove unnecessary code
...
Leftovers from copy and pasting from test_ui.cc
2021-06-14 10:02:25 +02:00
Luciano Iam
cb73eb350d
WebSockets: less invasive version of 5407232
...
There is no need to connect signals twice, can connect them directly to the
helper UI loop and skip the surface loop. Then let the server decide if it is
necessary to call lws_cancel_service() or not.
Also rename WebsocketsServer::should_request_write() to read_blocks_event_loop()
it makes more sense for the caller now on-demand write logic is completely
implemented by the server class.
2021-06-14 10:02:25 +02:00
Luciano Iam
e3569b6469
WebSockets: notify server there are pending client updates
...
This is an update to the surface ArdourFeedback class that is needed to support
the new event loop integration method.
The various session event callbacks cannot be queued in the surface event loop
because that would create a delay between the time such events are fired and
the time for writing to clients arrive, due to lws_service() blocking while
it waits to read. To solve this issue a helper AbstractUI is created for
catching events as soon as possible and issuing a call to lws_cancel_service().
See WebsocketsServer::glib_idle_callback()
2021-06-13 22:00:29 +02:00
Luciano Iam
b3661af92a
WebSockets: additional method for event loop integration
...
Some distro repositories offer versions of libwebsockets that have not been
compiled with LWS_WITH_GLIB or LWS_WITH_EXTERNAL_POLL enabled. For such cases
a different event loop integration method is needed.
True for Ubuntu 20.04 as of Jun '21
2021-06-13 22:00:29 +02:00
Luciano Iam
5f504f23ac
WebSockets: reduce server log verbosity
2021-06-13 22:00:28 +02:00
Luciano Iam
373d905a93
Update websockets surface author email in source files
2021-06-13 22:00:28 +02:00
Luciano Iam
12a7480ea3
Move #include inside header guard
2021-06-13 22:00:28 +02:00
b75a37abdb
fix arguemnts to transport call in shared control surface code for transport_play()
2021-06-08 08:32:19 -06:00
74e21e942e
Remove unused variables (Wunused-variable)
2021-05-30 20:09:35 -04:00
1b4aaea92a
Remove unused private fields (Wunused-private-field)
2021-05-30 20:09:35 -04:00
2e501fd77a
ensure the BasicUI implementation of rewind/ffwd is the same as the ARDOUR_UI one
2021-05-19 18:32:00 -06:00
a5a2f111ee
Remove debug line
2021-05-18 14:32:38 -07:00
0130f19e26
Fix positions before start and after end
2021-05-18 14:27:20 -07:00
f9557d0d04
Remove unused code
2021-05-17 13:50:18 -07:00
ab7c6e74e0
OSC, update marks list better.
2021-05-17 13:34:19 -07:00
Tobias Kannenberg
e4a6e981d9
fix OSC "/marker" feedback
2021-05-17 13:31:03 -07:00
3a3fcd0d2d
Don't crash if master fader is not avaliable.
...
If the wrong device profile is selected (ex Xtouch One) but another device
is connected (Xtouch), it is possible to have a master fader on the
device, but not in the code. This would then cause a crash when the
master fader was touched.
This just protects from a wrong configuration.
2021-05-13 12:08:09 -05:00
0fc50b9bf2
Mackie Control: set select state correctly during initial setup
2021-05-11 15:55:04 -06:00
57b3df8b22
copy over (boo!) transport control changes to BasicUI (control surfaces)
2021-05-08 09:20:21 -06:00
4d815554dd
Various Control Surfaces: Fix one off in calculation of fader position
...
MIDI pitch bend holds 14 bits (16384) which gives values of 0 to 16383.
2021-05-07 18:02:44 -05:00
5957e14259
Remove unused #include<> (2/2)
...
PBD::stacktrace() is not used nor needed by default.
It should be used sparingly.
2021-05-05 17:57:16 +02:00
273049a5a1
Mackie Control: if master surface has a jog wheel *and* a scrub button, button toggles between scroll and shuttle behavior
2021-05-04 21:30:22 -06:00
1757cfb8ef
use rewind/ffwd option to alter behavior of control surface rewind/ffwd buttons
...
This does not affect GUI equivalents (yet)
2021-05-04 20:52:01 -06:00
cd4aaa808e
use button_varispeed() in BasicUI::rewind() and BasicUI::ffwd()
2021-05-04 16:38:28 -06:00
009e971bfb
correct the implementation of BasicUI::button_varispeed() to provide incremental speed shifting (by semitones) in both directions
2021-05-04 16:38:02 -06:00
fbd1221833
move FaderPort8 method "button_varispeed()" into BasicUI for more general use
2021-05-04 16:10:24 -06:00
8e868fc743
remove unnecessary 2nd argument from Session::request_locate() calls (default value is identical) (surfaces edition)
2021-05-03 17:40:41 -06:00
f94aec5a59
fix/improve BasicUI's methods for rewind/ffwd/play (used by various surfaces)
2021-04-19 16:14:09 -06:00
48e5607f7c
use Session::request_roll() instead of request_transport_speed (1.0, ...)
2021-04-19 16:14:08 -06:00
52b7e68102
use new Session transport API calls in GUI
2021-04-19 16:14:08 -06:00
e0a6aba28d
Ignore saved port-name when loading ctrl-surface state
...
In some cases old and/or conflicting port names were saved
with the session (e.g. "Faderport" for FP1,8). Loading old sessions
then merges this state into the config, which could lead to
port-registration failure when the surfaces was enabled.
2021-04-17 02:07:09 +02:00
c212909282
Ctrl-surface: do not name single-channel bundle ports
...
Follow Session::setup_bundles() lead for single channel
MIDI bundles. This cleans-up the port-matrix display and
removes redundant names. The underlying engine port-name
is not of interest to the user.
2021-04-17 00:43:20 +02:00
72db091619
Fix crash at exit with classic Faderport
...
FaderPort::~FaderPort () can be called while
FaderPort::map_gain() is called from FaderPort::periodic()
```
Thread 71 Crashed:
0 libardour_faderport.dylib 0x0000000110539c3a ArdourSurface::FaderPort::map_gain() + 138
1 libardour_faderport.dylib 0x000000011053996d ArdourSurface::FaderPort::periodic() + 109
2 libglibmm-2.4.1.dylib 0x000000010bf21da8 Glib::TimeoutSource::dispatch(sigc::slot_base*) + 56
3 libglibmm-2.4.1.dylib 0x000000010bf20c97 Glib::Source::dispatch_vfunc(_GSource*, int (*)(void*), void*) + 39
4 libglib-2.0.0.dylib 0x000000010c012496 g_main_context_dispatch + 326
5 libglib-2.0.0.dylib 0x000000010c01281a g_main_context_iterate + 474
6 libglib-2.0.0.dylib 0x000000010c012b3f g_main_loop_run + 191
7 libpbd.dylib 0x000000010bcee42e BaseUI::main_thread() + 254
8 libglibmm-2.4.1.dylib 0x000000010bf16373 (anonymous namespace)::call_thread_entry_slot(void*) + 35
9 libglib-2.0.0.dylib 0x000000010c03dd0a g_thread_proxy + 90
10 libsystem_pthread.dylib 0x00007fff759e42eb _pthread_body + 126
11 libsystem_pthread.dylib 0x00007fff759e7249 _pthread_start + 66
12 libsystem_pthread.dylib 0x00007fff759e340d thread_start + 13
```
While the GUI thread has already closed the MIDI ports in ~FaderPort
and proceeded to take down the FP GUI.
```
Thread 0:: Dispatch queue: com.apple.main-thread
47 libgtkmm-2.4.1.dylib 0x000000010ca69a56 Gtk::ComboBox::~ComboBox() + 22
48 libardour_faderport.dylib 0x000000011055a6e5 ArdourSurface::FPGUI::~FPGUI() + 149
49 libardour_faderport.dylib 0x000000011055a8b5 ArdourSurface::FPGUI::~FPGUI() + 21
50 libardour_faderport.dylib 0x0000000110551396 ArdourSurface::FaderPort::tear_down_gui() + 70
51 libardour_faderport.dylib 0x0000000110536507 ArdourSurface::FaderPort::~FaderPort() + 535
52 libardour_faderport.dylib 0x0000000110536b9e ArdourSurface::FaderPort::~FaderPort() + 14
53 libardour.dylib 0x000000010ac13f08 ARDOUR::ControlProtocolManager::drop_protocols() + 168
54 libardour.dylib 0x000000010b0ba7e4 ARDOUR::Session::destroy() + 212
55 libardour.dylib 0x000000010b0bbe01 ARDOUR::Session::~Session() + 113
56 libardour.dylib 0x000000010b0bdb5e ARDOUR::Session::~Session() + 14
2021-04-07 02:25:52 +02:00
Daniel Ceregatti
362b9cb4fa
Maschine Mikro MK2 support
2021-04-01 20:07:55 +02:00
c96462f7bb
maschine2: gtk is an indirect dependency of libgtkmm2ext
2021-03-26 18:44:20 +01:00
345726e223
Get NI maschine surface to compile again
2021-03-26 01:16:30 +01:00
b064b3c136
OSC: fix some compiler warnings
2021-02-28 20:01:06 +01:00
0c3eaf188b
OSC: liblo compatibility fix
...
see also 770fd1519c
2021-02-28 20:00:04 +01:00
770fd1519c
Liblo compat fix
...
Upstream liblo changed the opaque type `lo_message` from void*
to a custom struct {}.
2c1ef1c682
2021-02-28 02:25:02 +01:00
John Emmas
d2cb383965
MSVC changes to support the new code modules (Tabbable API stuff)
2021-02-24 14:32:23 +00:00
07c16d38a2
control surfaces: make methods used for transport control (BasicUI) do the right thing w.r.t. default speed
2021-02-12 09:36:52 -07:00
acfa04d700
Update Ctrl-surface MIDI port list when ports change
...
This is a better variant of bbb6851468
2021-02-04 06:19:37 +01:00
cd524f70dc
OSC, strip and select share all main strip functions
...
Allow blocking strip commands for master or monitor
2021-01-23 21:18:32 -08:00
a9f0f771c1
Reuse the same code for strip and select
...
Combine Maser and Monitor to reuse code
Started adding query functionality
Added query functionality to all touchosc fixed commands
2021-01-23 21:17:46 -08:00
eed07770e1
Fix Faderport1 port-connection (amend bbb68514)
2021-01-22 18:46:17 +01:00
8386874a03
OSC: Allow to specify marker name #8543
...
Patch from atsampson
2021-01-18 23:36:35 +01:00
bbb6851468
Subscribe to pretty-port name changes (surfaces)
2021-01-18 03:18:20 +01:00
1737dc1869
Revert "Fix typo in OSC gain feedback message"
...
This was not a typo after all, but a way to show the gain in the
name-display, as per manual:
> In the case where Gainmode is set to position, the track name
> will show the dB value while values are changing.
This reverts commit 3290d66a43
2020-12-17 17:30:24 +01:00
3290d66a43
Fix typo in OSC gain feedback message
2020-12-17 00:58:28 +01:00
ce43161d4e
WebSockets: log hostname and listen-port
2020-11-23 20:12:57 +01:00
7d4cd5c76a
Fix C++11ism
2020-11-20 13:32:20 +01:00
6ca4980e71
FP8: Allow to sort plugin-params by priority
2020-11-20 06:04:32 +01:00
Luciano Iam
9ee828b47b
WS: properly support MIDI strips
2020-11-19 17:03:36 +01:00
ddcf3eb684
Generic Midi encoders fixed
2020-10-24 16:06:04 -07:00
a266a2d5b9
Use session API to set solo
...
This is required so that ::update_route_solo_state() is called
to propagate solo/mute state
2020-10-18 15:28:10 +02:00
72736289c8
NO-OP: rename API rename
...
CP selection API is now implemented as functions, not signals.
2020-10-18 14:47:05 +02:00
84bf97aa49
Update ControlProtocol API, use CoreSelection
...
* replace signal-emission with direct calls to CoreSelecton
using BaseUI's session pointer
* remove unused leftmost strip API
* use CoreSelection for first-selected strip
* Accessing CoreSelection does not modify the session
(allow access from const callbacks)
* replace static calls in P2 surface
This removes indirection and dependency on the GUI for
managing strip selection.
2020-10-18 14:44:38 +02:00
dcea35191c
Consolidate code: use API to print plugin-type 1/2
2020-09-15 16:03:33 +02:00
Luciano Iam
9c08c058a3
WS: crash bugfix related to missing strip panner
...
Surface made Ardour crash when a client connected
and some session track was not a VCA nor had a panner,
like MIDI strips.
2020-09-04 01:59:53 +02:00
63a117bf93
And another boost/C++11 fix
...
This fixes Undefined symbols:
"ArdourSurface::hash_value(ArdourSurface::NodeState const&)", referenced from:
boost::hash<ArdourSurface::NodeState>::operator()(ArdourSurface::NodeState const&) constin client.cc.1.o
boost::hash<ArdourSurface::NodeState>::operator()(ArdourSurface::NodeState const&) constin server.cc.1.o
2020-08-31 08:28:50 +02:00
a9c2350e87
Fix yet another C++11ism
2020-08-31 07:52:48 +02:00
39110463f3
Amend cdd48926d1 use ScopedConnectionList directly
2020-08-31 07:41:11 +02:00
cdd48926d1
Remove more libwebsocket C++11isms
...
* amend previous commit, fix runtime_error implementation
* Do not copy-construct classes that have a PBD::scoped connection list.
Replace std::map::emplace[C+11], an store shared pointers the std::map.
* Update ArdourMixerStrip is-a ScopedConnectionList (not has-a)
2020-08-30 22:57:43 +02:00
8eb4dcb675
Fix websocket C++11ism
2020-08-30 21:15:33 +02:00
af79240c81
Namespace libwebsocket surface classes
...
Using the global names-pace for classes named "Json", "TypedValue",
"ArdourTransport", "ArdourMixerPlugin" etc is not acceptable.
2020-08-30 21:15:07 +02:00
Luciano Iam
665e0686e5
WS: noop use a namespace for JSON utilities
...
Instead of a class with static methods
Also correct some whitespace to prevent triggering of OCD cycles
2020-08-30 19:29:28 +02:00
Luciano Iam
aa38491b7d
WS: move VCA detection to mixer strip interface
...
Expose the wrapped Stripable the least as possible
2020-08-30 19:29:28 +02:00
Luciano Iam
e510c0cb75
WS: consistent naming of strip/plugin/param identifiers
...
Rename all {object}_n variables and arguments to {object}_id
Parts of code were using the former convention, now use the latter everywhere
Another step towards supporting visual position agnostic identifiers in the future
2020-08-30 19:29:28 +02:00
Luciano Iam
c32a5917f3
WS: handle strips and plugins removal
2020-08-30 19:29:27 +02:00
Luciano Iam
a8f917e7e2
WS: prepare for handling object disconnections
...
Use maps instead of vectors for holding strips and plugins
This allows to deal with "holes" after objects are removed
Also paves the way for a future improved way of identifying
individual strips and plugins
2020-08-30 19:29:27 +02:00
Luciano Iam
7521d8ab6f
WS: add some meaningful error messages
2020-08-30 19:29:27 +02:00
Luciano Iam
3509fe1589
WS: use an object-oriented internal API for the mixer
...
- This allows to better handle strips & plugins connection lifecycles
- Coherent with the JS client design
2020-08-30 19:29:27 +02:00
Luciano Iam
4a4734fbb1
WebSockets: properly release strips and plugins when removed
...
This should fix some crashes reported by the beta testing team
2020-08-30 19:29:27 +02:00
87f7dcc5f6
OSC Panner feedback crash with no panner
...
both select and route feedback now test for both
route and panner (not VCA)
2020-08-29 17:08:56 -07:00
1cc9573dba
OSC toggle roll make return to zero optional
2020-08-20 16:26:07 -07:00
b8da1d0265
fix toggle_roll will only start but not stop PH
2020-08-20 16:26:07 -07:00
dfe2270c9f
Revert "WebSockets: properly release strips and plugins when removed"
...
This reverts commit f007ba6b46
2020-08-19 23:59:38 +02:00
Luciano Iam
f007ba6b46
WebSockets: properly release strips and plugins when removed
...
This should fix some crashes reported by the beta testing team
2020-08-19 19:01:18 +02:00
c8bc9a25b3
Added strip feedback for new automation states
...
for mute, trim and panner
2020-08-19 09:45:44 -07:00
5ce796f0b5
Added strip feedback for new automation states
...
for mute, trim and panner
2020-08-19 09:45:44 -07:00
ab0217f3a2
Added touch to more stripable controls
...
pan azimuth and width
mute and trim
2020-08-19 09:45:44 -07:00
d5016f80d3
Added automation control to the rest stripable controls
...
Pan azimuth
Pan Width
trim
mute
2020-08-19 09:45:44 -07:00
fcd347fe0c
Fix --no-nls, i18n include order in libs -- #8361
...
Ardour's "pbd/i18n.h" needs to be included last,
after any include that may indirectly pull in getext or libintl.
For that reason "pbd/i18n.h" must not be used in header files either.
2020-08-19 17:39:32 +02:00
7ab67c42dc
Fixes OSC panner issues: 8338 and 8246
...
8338 - crash with midi and no audio strip
detect no panner
8246 - send feedback of panner type
2020-08-12 08:08:39 -07:00
5c6e8954ed
Add pre/post fader to foldback send creation
...
add position param to send creation
default all to prefader as first step
2020-08-08 18:41:03 -07:00
Luciano Iam
e7e4fb3a81
WS: Use Ardour native scale for pan knobs
2020-07-21 06:49:28 +02:00
4717f7806d
issue 8186 strip controls reset then show on select
...
Causes motor controls to jiggle on all strips
when select changes. Fixed
2020-06-23 20:25:49 -07:00
32aa290578
issue 8243 select gets feedback past selected strips
...
make sure to drop old references when route is changed
2020-06-23 09:03:19 -07:00
