-
Notifications
You must be signed in to change notification settings - Fork 84
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
--ctrlmidich improved documentation #1053
--ctrlmidich improved documentation #1053
Conversation
4fe14d3
to
a71fad6
Compare
a71fad6
to
d6fbe39
Compare
d6fbe39
to
3f90839
Compare
c0c64d5
to
843b811
Compare
843b811
to
60a88a5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the basis that @ignotus666 also gives his ok to this...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me
60a88a5
to
61b3008
Compare
Spotted another couple of places I'd said "0 is default" (when it's not -- feature disabled is default). |
If this is mergable, please do so. |
|
Converted to draft as will need reconsidering after jamulussoftware/jamulus#3426 |
@softins do you want to take this branch and replace the |
61b3008
to
dbd3f46
Compare
Rebased and updated. @softins you'll probably need to fix what I've just broken... |
bb4703b
to
d1d4468
Compare
@pljones I have made my updates to the docs; please review and comment if desired. I found that the CI was failing from today. It seems like the We ought to update the CI runner separately from this PR - I'll raise one shortly, and then revert that commit from this PR. DONE |
wiki/en/Tips-Tricks-More.md
Outdated
|
||
`--ctrlmidich "1;f0*8;p16*8;s32*8;m48*8;o64"` | ||
When this option is used on the command line, Jamulus will prepend a channel number to each Client name, which can be used to control the channel using MIDI CC numbers. In Jamulus version 3.12.0 onwards, when connected to a server of at least version 3.5.5, your own fader will always be given channel 0, and so will appear first when unsorted or sorted by channel, whether or not "Own Fader First" is enabled. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When this option is used on the command line, Jamulus will prepend a channel number to each Client name, which can be used to control the channel using MIDI CC numbers. In Jamulus version 3.12.0 onwards, when connected to a server of at least version 3.5.5, your own fader will always be given channel 0, and so will appear first when unsorted or sorted by channel, whether or not "Own Fader First" is enabled. | |
When this option is used on the command line, Jamulus will prepend a channel number to each Client name, which can be used to control the channel using MIDI CC numbers. In Jamulus version 3.12.0 onwards, when connected to a server of at least version 3.5.5, your own fader will always be given channel 0, and so will appear first when sorted by channel or when "Own Fader First" is enabled. |
In "unsorted", if you join an occupied server, you'll go to the position in the list you arrive back at the client in. Are you guaranteed to be the first in that list?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested that. In 3.12.0, if you join an occupied server of 3.5.5 or later, you get channel 0 and appear first in the unsorted list.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I tested the new version by connecting to an occupied server of a recent version, my own channel always showed up first in the unsorted view. Performing the same test against a server older than 3.5.5, my own channel appeared to the right of the the prior occupants.
I haven't worked through the code to examine whether this is guaranteed, but it appeared consistent in practice.
Also my wording of the final sentence "whether or not" was intended to make clear that when unsorted or sorted by channel, the Own fader first option made no difference.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested that. In 3.12.0, if you join an occupied server of 3.5.5 or later, you get channel 0 and appear first in the unsorted list.
Does that mean the server holds multiple lists of clients, one per client, so it can consistently return the list to the client in that order? Or does it just filter the response and set to zero and move to first the client for each client it's sending the list to? Sounds like more work than needed... (Especially given how much work the client then does with the list when it arrives...)
Also my wording of the final sentence "whether or not" was intended to make clear that when unsorted or sorted by channel, the Own fader first option made no difference.
"Own Fader First" should be taken as the one that disregards sort order. To say a sort order then disregards "Own Fader First" is somewhat circular. It's either unnecessary or confusing. "Unsorted" shouldn't be expressed to mean "your own fader will be first (under some circumstances)" because that's not really that useful (even if it may be true).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested that. In 3.12.0, if you join an occupied server of 3.5.5 or later, you get channel 0 and appear first in the unsorted list.
Does that mean the server holds multiple lists of clients, one per client, so it can consistently return the list to the client in that order? Or does it just filter the response and set to zero and move to first the client for each client it's sending the list to? Sounds like more work than needed... (Especially given how much work the client then does with the list when it arrives...)
No, the server always sends its own channel numbers to every client. And from 3.5.5 it also sends the client its own server channel ID when it connects. Since the recently-merged update, each client maintains its own set of client-side channel numbers and maps between the two. It maps its own server channel number to client channel 0, and each new server-side channel to the lowest free client channel ID.
When the server sends a connected clients list to the client, the client rewrites the channel numbers in that list according to its own mapping, before passing it up to the mixer board. The mixer board doesn't need to know the client layer mapped them. But I think it processes new channels in order of channel number, rather than order in the list, which means that when processing the first list received after a new connection, it will put channel 0 first. I need to verify this by examining the code.
Also my wording of the final sentence "whether or not" was intended to make clear that when unsorted or sorted by channel, the Own fader first option made no difference.
"Own Fader First" should be taken as the one that disregards sort order. To say a sort order then disregards "Own Fader First" is somewhat circular. It's either unnecessary or confusing. "Unsorted" shouldn't be expressed to mean "your own fader will be first (under some circumstances)" because that's not really that useful (even if it may be true).
OK, fair enough. I'll commit your wording.
Just a few bits and pieces. |
Co-authored-by: Peter L Jones <pljones@users.noreply.github.com>
9cbf914
to
48bd5e6
Compare
Co-authored-by: Peter L Jones <pljones@users.noreply.github.com>
@softins any outstanding Weblate PRs have to be merged before a documentation (website) PR goes in... Weblate's locked up now. |
Oh, right, sorry. Didn't know that! Would you like me to resolve the conflict? I'm happy to, but don't want to duplicate effort. |
Don't worry, it's happened to me a few times! The way I did it was to just revert the offending merged PR, merge the Weblate PR and then this one - but feel free to apply whatever fix you think is best. |
That sounds good to me. |
@ignotus666 ok, I've successfully reverted this PR, and the weblate PR no longer complains of a conflict. Shall I just go ahead and merge it, or does it need checking first? |
Yes, I think you can merge it, I checked the Spanish docs and they're ok, can't speak for the other one though. |
Short description of changes
jamulussoftware/jamulus#3394 adds a new feature to the
--ctrlmidich
option to allow binding a MIDI CC number explicitly to the participant's "own" channel on the server, regardless of the assigned channel number.This required some changes to the documentation to explain how it worked. I took the opportunity to clarify (hopefully) the detailed information in Tips & Tricks.
Context: Fixes an issue? Related issues
See jamulussoftware/jamulus#3394
Status of this Pull Request
Looks okay locally.
What is missing until this pull request can be merged?
Needs reviewing and shouldn't be merged until after jamulussoftware/jamulus#3394
Does this need translation?
YES
Checklist