Repository navigation
Feature/channel meters - #42
Conversation
f804c39 to
8f6c1a0
Compare
|
I have just updated the centest server with your newest code. I'll test it later when more people are online. Feel free to test on this server, too, if you like. |
| #define PING_UPDATE_TIME_SERVER_LIST_MS 2000 // ms | ||
|
|
||
| // defines the interval between Channel Level updates from the server | ||
| #define CHANNEL_LEVEL_UPDATE_INTERVAL 100 // number of frames |
There was a problem hiding this comment.
The number is not given in ms but in frames. So it is dependent on the frame size and sample rate, right?
There was a problem hiding this comment.
Yes -- will your work affect this? If the frame frequency drops, I guess the channel level update interval should also drop?
There was a problem hiding this comment.
I am currently working on supporting different frame sizes in the server. So I have to make sure that your update time stays the same no matter which frame size is in use by the server right now. No big deal, I just have to remember it that there is something to do :-).
| const CVector<uint8_t>& vecData ) | ||
| { | ||
| int iPos = 0; // init position pointer | ||
| const int iDataLen = vecData.Size(); // four bits per channel, 2 channels per byte |
There was a problem hiding this comment.
You could introduce a plausability check here. The maximum possible number of channels at the server is given in the global.h file. You could check that the length of the data vector does not exceed that number, i.e. the number of bits times the maximum possible number of channels.
There was a problem hiding this comment.
Yep, I'll add that (just before rebasing).
|
Hmm, too bad. I just checked in some modifications in the protocol which made your commit to have merge conflicts. |
Also includes a number of minor wording changes elsewhere.
8f6c1a0 to
c6b702c
Compare
|
OK rebased with check for MAX_NUM_CHANNELS added - is it okay? Testing: it compiles clean still :). -edit- |
|
Great, thank you for your fast response. The code looks good to me. I'll merge it now. Again, thank you very much for this contribution. In these times with croweded servers it is a really useful tool. Unfortunately, all the existing servers have to update to a new version so that it works for them, too. |
|
Thanks for the comments. I've updated jamulus.drealm.info now. Does the central server know the version of a registering server? Be interesting to have stats on how fast each version usually gets rolled out to server. |
|
Yes, this is already implemented. Just define the following and re-compile: https://github.com/corrados/jamulus/blob/master/src/global.h#L78. Then open the Server List. |
OK, so next attempt :)
The proposed manual changes are here:
https://github.com/pljones/jamulus/blob/feature/channel-meters/src/res/homepage/manual.md