mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4487: FIX: volume adjustment display

Browse Source 
This is a followup on #4439 (and #4436) that fixes 2 issues of that implementation:

    Wrong volume adjustments being displayed for ChannelListeners in certain situations
    MainWindow not updating automatically when the adjustments change
This commit is contained in:
Robert Adam 2020-09-15 19:04:15 +02:00 committed by GitHub
commit 5d238094ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mumble/MainWindow.cpp
View File

@ -313,6 +313,8 @@ void MainWindow::setupGui() {
QObject::connect(
this, &MainWindow::userRemovedChannelListener, pmModel,
static_cast< void (UserModel::*)(const ClientUser *, const Channel *) >(&UserModel::removeChannelListener));
QObject::connect(&ChannelListener::get(), &ChannelListener::localVolumeAdjustmentsChanged, pmModel,
&UserModel::on_channelListenerLocalVolumeAdjustmentChanged);
qaAudioMute->setChecked(g.s.bMute);
qaAudioDeaf->setChecked(g.s.bDeaf);

22
src/mumble/UserModel.cpp
View File

@ -1018,6 +1018,7 @@ ClientUser *UserModel::addUser(unsigned int id, const QString &name) {
connect(p, SIGNAL(muteDeafStateChanged()), this, SLOT(userStateChanged()));
connect(p, SIGNAL(prioritySpeakerStateChanged()), this, SLOT(userStateChanged()));
connect(p, SIGNAL(recordingStateChanged()), this, SLOT(userStateChanged()));
connect(p, &ClientUser::localVolumeAdjustmentsChanged, this, &UserModel::userStateChanged);
Channel *c = Channel::get(0);
ModelItem *citem = ModelItem::c_qhChannels.value(c);
@ -1659,6 +1660,7 @@ Channel *UserModel::getSubChannel(Channel *p, int idx) const {
void UserModel::userStateChanged() {
ClientUser *user = qobject_cast< ClientUser * >(sender());
if (!user)
return;
@ -1668,6 +1670,14 @@ void UserModel::userStateChanged() {
updateOverlay();
}
void UserModel::on_channelListenerLocalVolumeAdjustmentChanged(int channelID, float oldValue, float newValue) {
Q_UNUSED(oldValue);
Q_UNUSED(newValue);
const QModelIndex idx = channelListenerIndex(ClientUser::get(g.uiSession), Channel::get(channelID));
emit dataChanged(idx, idx);
}
void UserModel::toggleChannelFiltered(Channel *c) {
QModelIndex idx;
if (c) {
@ -1929,9 +1939,15 @@ QString UserModel::createDisplayString(const ClientUser &user, bool isChannelLis
// Get the configured volume adjustment. Depending on whether
// this display string is for a ChannelListener or a regular user, we have to fetch
// the volume adjustment differently.
float volumeAdjustment = isChannelListener && parentChannel
? ChannelListener::getListenerLocalVolumeAdjustment(parentChannel->iId)
: user.getLocalVolumeAdjustments();
float volumeAdjustment = 1.0f;
if (isChannelListener) {
if (parentChannel && user.uiSession == g.uiSession) {
// Only the listener of the local user can have a volume adjustment
volumeAdjustment = ChannelListener::getListenerLocalVolumeAdjustment(parentChannel->iId);
}
} else {
volumeAdjustment = user.getLocalVolumeAdjustments();
}
// Transform the adjustment into dB
// *2 == 6 dB

1
src/mumble/UserModel.h
View File

@ -208,6 +208,7 @@ public:
public slots:
/// Invalidates the model data of the ClientUser triggering this slot.
void userStateChanged();
void on_channelListenerLocalVolumeAdjustmentChanged(int channelID, float oldValue, float newValue);
void ensureSelfVisible();
void recheckLinks();
void updateOverlay() const;