Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16557 from ctrlaltdavid/DEV-2810

Browse source 
DEV-2810: Rename Stats.audioAudioInboundPPS to Stats.audioInboundPPS
This commit is contained in:
Brad Hefta-Gaub 2019-12-13 13:34:34 -08:00 committed by GitHub
commit e7bb57622a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/+android_interface/Stats.qml
View file

@ -201,7 +201,7 @@ Item {
}
StatText {
visible: root.expanded;
text: "Audio In Audio: " + root.audioAudioInboundPPS + " pps, " +
text: "Audio In Audio: " + root.audioInboundPPS + " pps, " +
"Silent: " + root.audioSilentInboundPPS + " pps";
}
StatText {

2
interface/resources/qml/Stats.qml
View file

@ -238,7 +238,7 @@ Item {
}
StatText {
visible: root.expanded;
text: "Audio In Audio: " + root.audioAudioInboundPPS + " pps, " +
text: "Audio In Audio: " + root.audioInboundPPS + " pps, " +
"Silent: " + root.audioSilentInboundPPS + " pps";
}
StatText {

2
interface/src/ui/Stats.cpp
View file

@ -261,6 +261,7 @@ void Stats::updateStats(bool force) {
STAT_UPDATE(audioMixerInPps, audioMixerNode->getInboundPPS());
STAT_UPDATE(audioMixerOutKbps, (int)roundf(audioMixerNode->getOutboundKbps()));
STAT_UPDATE(audioMixerOutPps, audioMixerNode->getOutboundPPS());
STAT_UPDATE(audioInboundPPS, (int)audioClient->getAudioInboundPPS());
STAT_UPDATE(audioAudioInboundPPS, (int)audioClient->getAudioInboundPPS());
STAT_UPDATE(audioSilentInboundPPS, (int)audioClient->getSilentInboundPPS());
STAT_UPDATE(audioOutboundPPS, (int)audioClient->getAudioOutboundPPS());
@ -274,6 +275,7 @@ void Stats::updateStats(bool force) {
STAT_UPDATE(audioMixerOutPps, -1);
STAT_UPDATE(audioOutboundPPS, -1);
STAT_UPDATE(audioSilentOutboundPPS, -1);
STAT_UPDATE(audioInboundPPS, -1);
STAT_UPDATE(audioAudioInboundPPS, -1);
STAT_UPDATE(audioSilentInboundPPS, -1);
}

20
interface/src/ui/Stats.h
View file

@ -174,10 +174,16 @@ private: \
* second.
* <code>-1</code> if not connected to an audio mixer.
* <em>Read-only.</em>
* @property {number} audioAudioInboundPPS - The number of non-silent audio packets being received by the user, in packets per
* @property {number} audioInboundPPS - The number of non-silent audio packets being received by the user, in packets per
* second.
* <code>-1</code> if not connected to an audio mixer.
* <em>Read-only.</em>
* @property {number} audioAudioInboundPPS - The number of non-silent audio packets being received by the user, in packets per
* second.
* <code>-1</code> if not connected to an audio mixer.
* <em>Read-only.</em>
* <p class="important">Deprecated: This property is deprecated and will be removed. Use <code>audioInboundPPS</code>
* instead.</p>
* @property {number} audioSilentInboundPPS - The number of silent audio packets being received by the user, in packets per
* second.
* <code>-1</code> if not connected to an audio mixer.
@ -506,6 +512,7 @@ class Stats : public QQuickItem {
STATS_PROPERTY(int, audioMixerPps, 0)
STATS_PROPERTY(int, audioOutboundPPS, 0)
STATS_PROPERTY(int, audioSilentOutboundPPS, 0)
STATS_PROPERTY(int, audioInboundPPS, 0)
STATS_PROPERTY(int, audioAudioInboundPPS, 0)
STATS_PROPERTY(int, audioSilentInboundPPS, 0)
STATS_PROPERTY(int, audioPacketLoss, 0)
@ -628,7 +635,7 @@ public slots:
* "avatarMixerOutPps"
* ];
*
* // update the statistics for the script.
* // Update the statistics for the script.
* Stats.forceUpdateStats();
*
* // Report the statistics.
@ -992,10 +999,19 @@ signals:
*/
void audioSilentOutboundPPSChanged();
/**jsdoc
* Triggered when the value of the <code>audioInboundPPS</code> property changes.
* @function Stats.audioInboundPPSChanged
* @returns {Signal}
*/
void audioInboundPPSChanged();
/**jsdoc
* Triggered when the value of the <code>audioAudioInboundPPS</code> property changes.
* @function Stats.audioAudioInboundPPSChanged
* @returns {Signal}
* @deprecated This signal is deprecated and will be removed. Use
* {@link Stats.audioInboundPPSChanged|audioInboundPPSChanged} instead.
*/
void audioAudioInboundPPSChanged();