Skip to content

Client: Always update gain levels #1009

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.

Sign up for GitHub

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

Jump to bottom
Merged
hoffie merged 1 commit into from
Mar 2, 2021
Merged

Client: Always update gain levels #1009

hoffie merged 1 commit into from
Mar 2, 2021

Conversation

@hoffie
Copy link
Member

@hoffie hoffie commented Feb 17, 2021 •
edited
Loading

Previously, gain levels had only been updated when a channel's name changed. This lead to missing gain level updates when reconnecting to a restarted server. Therefore, always update gain levels when receiving a new channel list.

Fixes #955.

Note: This is an alternative approach to #1010. Both PRs are compatible and can be merged together.

@hoffie hoffie marked this pull request as draft February 17, 2021 00:20
This was referenced Feb 17, 2021
Closed
Merged
hoffie
hoffie commented Feb 17, 2021
View reviewed changes
@softins softins added this to the Release 3.7.0 milestone Feb 25, 2021
hoffie added a commit to hoffie/jamulus that referenced this pull request Mar 1, 2021
@hoffie
Changelog: Document jamulussoftware#955, jamulussoftware#1009, jamulu…
9786099 
…ssoftware#1010

Signed-off-by: Christian Hoffmann <mail@hoffmann-christian.info>
@hoffie hoffie marked this pull request as ready for review March 1, 2021 22:25
@hoffie
Client: Always update gain levels
f116811 
Previously, gain levels had only been updated when a channel's
name changed. This leads to missing gain level updates when
reconnecting to a restarted server.
Therefore, always update gain levels when receiving a new channel
list.

Fixes jamulussoftware#955.

Signed-off-by: Christian Hoffmann <mail@hoffmann-christian.info>
@hoffie hoffie force-pushed the fix-955-always-send-gain-on-channel-list branch from bd08164 to f116811 Compare March 1, 2021 22:25
@hoffie hoffie requested review from pljones and softins March 1, 2021 22:26
@hoffie hoffie merged commit 080ac23 into jamulussoftware:master Mar 2, 2021
@hoffie hoffie mentioned this pull request Mar 7, 2021
Closed
2 tasks
hoffie added a commit to hoffie/jamulus that referenced this pull request Mar 8, 2021
@hoffie
Revert "Client: Always update gain levels"
bddfb3e 
This reverts PR jamulussoftware#1009 (f116811) as it
has unintended side effects (jamulussoftware#1191).

Basically, that PR assumed that applying stored fader levels would
always be a safe thing to do.
This is not the case, as changes in fader levels are currently not
stored immediately, but rather in specific events only (e.g.
disconnects).

PR jamulussoftware#1009 was initially supposed to help with jamulussoftware#955 as a client-side fix.
With the revert, we still have the server-side fix from jamulussoftware#1010.

It is planned to re-apply jamulussoftware#1009 once fader-level storage has been fully
understood and extended to cover all relevant places (jamulussoftware#1191).
@hoffie hoffie mentioned this pull request Mar 8, 2021
Merged
hoffie added a commit to hoffie/jamulus that referenced this pull request Mar 9, 2021
@hoffie
Revert "Client: Always update gain levels"
ab1bbe6 
This reverts PR jamulussoftware#1009 (f116811) as it
has unintended side effects (jamulussoftware#1191).

Basically, that PR assumed that applying stored fader levels would
always be a safe thing to do.
This is not the case, as changes in fader levels are currently not
stored immediately, but rather in specific events only (e.g.
disconnects).

PR jamulussoftware#1009 was initially supposed to help with jamulussoftware#955 as a client-side fix.
With the revert, we still have the server-side fix from jamulussoftware#1010.

It is planned to re-apply jamulussoftware#1009 once fader-level storage has been fully
understood and extended to cover all relevant places (jamulussoftware#1191).
dingodoppelt added a commit to dingodoppelt/jamulus that referenced this pull request Mar 13, 2021
@dingodoppelt
Squashed commit of the following:
7f89975 
commit 9298a08
Merge: 36f0cea 4f4a99c
Author: dingodoppelt <dexxter@top-email.net>
Date:   Sat Mar 13 23:30:33 2021 +0100

    Merge branch 'improve-multi-thread' of https://github.com/menzels/jamulus into menzels-improve-multi-thread

commit 36f0cea
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Sat Mar 13 00:11:16 2021 +0100

    Changelog: Improve formatting (jamulussoftware#1218)

    * Fix author's Github handle
    * Improve structure and readability
    * Group related entries (e.g. Windows-related, Bug fixes)
    * Use consistent style regarding cases, tenses and punctuation.
    * Unify "coded by", "suggested by" and "created by" to "contributed by"
    * Sort entries by end-user relevance
    * Add attributions for new translations
    * @-mention authors
    * Further improvements by @softins

commit d2c7975
Merge: 02e2d37 d5bb37e
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Sat Mar 13 00:00:19 2021 +0100

    Merge pull request jamulussoftware#1231 from softins/translation-attribution

    Add translation attributions.

commit 02e2d37
Merge: be82183 b6d78ad
Author: ann0see <20726856+ann0see@users.noreply.github.com>
Date:   Fri Mar 12 18:53:50 2021 +0100

    Merge pull request jamulussoftware#1221 from hoffie/fix-italian-versine

commit d5bb37e
Author: Tony Mountifield <tony@mountifield.org>
Date:   Fri Mar 12 15:12:37 2021 +0000

    Add translation attributions.

commit b6d78ad
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Wed Mar 10 17:03:06 2021 +0100

    Installer: Fix typo in Italian translation

    versine -> versione

    Thanks to @Zyfuss in jamulussoftware#1217 (comment)

commit be82183
Author: Tony Mountifield <tony@mountifield.org>
Date:   Wed Mar 10 11:02:55 2021 +0000

    Set version to 3.7.0rc1

commit aa00386
Author: Tony Mountifield <tony@mountifield.org>
Date:   Wed Mar 10 10:49:42 2021 +0000

    Additions to ChangeLog and contributors list.

commit 5111a05
Merge: 5d2574a c58a080
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Wed Mar 10 11:22:58 2021 +0100

    Merge pull request jamulussoftware#1203 from hoffie/improve-translation-checker-macros-detection

    Tools: Improve Wininstaller translation checker

commit 5d2574a
Merge: 17d8f74 ef78ff5
Author: Tony Mountifield <tony@mountifield.org>
Date:   Tue Mar 9 21:24:15 2021 +0000

    Merge pull request jamulussoftware#1194 from npostavs/np.driverInfo-set0

commit 17d8f74
Merge: 3a17f92 ab1bbe6
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Tue Mar 9 17:25:06 2021 +0100

    Merge pull request jamulussoftware#1210 from hoffie/revert-1009

    Revert "Client: Always update gain levels"

commit 3a17f92
Author: Tony Mountifield <tony@mountifield.org>
Date:   Tue Mar 9 15:47:31 2021 +0000

    Fix accelerator and update qm for FR and SE.

commit ab1bbe6
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Mon Mar 8 23:01:02 2021 +0100

    Revert "Client: Always update gain levels"

    This reverts PR jamulussoftware#1009 (f116811) as it
    has unintended side effects (jamulussoftware#1191).

    Basically, that PR assumed that applying stored fader levels would
    always be a safe thing to do.
    This is not the case, as changes in fader levels are currently not
    stored immediately, but rather in specific events only (e.g.
    disconnects).

    PR jamulussoftware#1009 was initially supposed to help with jamulussoftware#955 as a client-side fix.
    With the revert, we still have the server-side fix from jamulussoftware#1010.

    It is planned to re-apply jamulussoftware#1009 once fader-level storage has been fully
    understood and extended to cover all relevant places (jamulussoftware#1191).

commit 2d7025e
Merge: ca2ae79 b6ce552
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Mon Mar 8 21:51:56 2021 +0100

    Merge pull request jamulussoftware#1208 from Snayler/wininstallerpt

    pt_PT translation of wininstaller for 3.7.0

commit ca2ae79
Author: Olivier Humbert <trebmuh@users.noreply.github.com>
Date:   Mon Mar 8 21:46:33 2021 +0100

    Update French translation for 3.7.0 (jamulussoftware#1199)

    * French translation update

    * fixes a French translation mistake after a double-check

    * Updates French translation

commit b6ce552
Author: Miguel de Matos <11491485+Snayler@users.noreply.github.com>
Date:   Mon Mar 8 17:39:30 2021 +0000

    pt_PT translation of wininstaller for 3.7.0

commit ef78ff5
Author: Noam Postavsky <npostavs@users.sourceforge.net>
Date:   Sun Mar 7 10:45:37 2021 -0500

    windows/sound.cpp: Explicitly set driverInfo to 0

    Until now, it was semi-accidentally set to zero by virtue of being
    allocated on fresh memory.

commit c58a080
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Mon Mar 8 10:01:30 2021 +0100

    Tools: Improve Wininstaller translation checker

    The checker will now detect if the macros are commented out.

    jamulussoftware#1198 (review)

    Signed-off-by: Christian Hoffmann <mail@hoffmann-christian.info>

commit d87562e
Author: dzpex <65598812+dzpex@users.noreply.github.com>
Date:   Mon Mar 8 09:51:56 2021 +0100

    Installer: Add Italian translation (jamulussoftware#1198)

    * Update it.nsi

    * Update installerlng.nsi

commit 4f4a99c
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Sat Mar 6 20:26:51 2021 +0100

    fix mt handling

commit 8af2860
Merge: 8bf813e 6e630f4
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Sat Feb 20 01:58:01 2021 +0100

    Merge remote-tracking branch 'origin/master' into improve-multi-thread

commit 8bf813e
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Mon Feb 15 21:16:49 2021 +0100

    cleanup and formatting

commit f04f15b
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Mon Feb 15 20:03:37 2021 +0100

    fix indentation

commit 6159fc4
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Mon Feb 15 20:03:20 2021 +0100

    use bigger type to avoid multiplication overflow warning

commit 2e52b70
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Sat Feb 13 23:46:54 2021 +0100

    use custom threadpool

commit 6b112e7
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Sat Feb 13 23:45:31 2021 +0100

    add .cache to gitignore

commit cdd2d88
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Sat Feb 13 23:45:15 2021 +0100

    add custom threadpool impl

commit e08c28d
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Sat Feb 6 23:13:09 2021 +0100

    move opus encoder setup out of loop

commit 5708c2e
Author: Stefan Menzel <menzel.stefan.d@googlemail.com>
Date:   Sat Feb 6 23:12:19 2021 +0100

    improve multithread performance
    spreading the workload equally among available threads
dingodoppelt added a commit to dingodoppelt/jamulus that referenced this pull request Mar 13, 2021
@dingodoppelt
Squashed commit of the following:
28a1bf8 
commit d083a2a
Author: dingodoppelt <dexxter@top-email.net>
Date:   Sat Mar 13 00:51:47 2021 +0100

    allow formatting

commit 77fd5fb
Author: dingodoppelt <dexxter@top-email.net>
Date:   Fri Mar 12 21:23:56 2021 +0100

    send chat message from outside to all clients

commit 79b7b9e
Author: dingodoppelt <dexxter@top-email.net>
Date:   Fri Mar 12 20:39:45 2021 +0100

    accept external chat message via protocol message

commit 36f0cea
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Sat Mar 13 00:11:16 2021 +0100

    Changelog: Improve formatting (jamulussoftware#1218)

    * Fix author's Github handle
    * Improve structure and readability
    * Group related entries (e.g. Windows-related, Bug fixes)
    * Use consistent style regarding cases, tenses and punctuation.
    * Unify "coded by", "suggested by" and "created by" to "contributed by"
    * Sort entries by end-user relevance
    * Add attributions for new translations
    * @-mention authors
    * Further improvements by @softins

commit d2c7975
Merge: 02e2d37 d5bb37e
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Sat Mar 13 00:00:19 2021 +0100

    Merge pull request jamulussoftware#1231 from softins/translation-attribution

    Add translation attributions.

commit 02e2d37
Merge: be82183 b6d78ad
Author: ann0see <20726856+ann0see@users.noreply.github.com>
Date:   Fri Mar 12 18:53:50 2021 +0100

    Merge pull request jamulussoftware#1221 from hoffie/fix-italian-versine

commit d5bb37e
Author: Tony Mountifield <tony@mountifield.org>
Date:   Fri Mar 12 15:12:37 2021 +0000

    Add translation attributions.

commit b6d78ad
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Wed Mar 10 17:03:06 2021 +0100

    Installer: Fix typo in Italian translation

    versine -> versione

    Thanks to @Zyfuss in jamulussoftware#1217 (comment)

commit be82183
Author: Tony Mountifield <tony@mountifield.org>
Date:   Wed Mar 10 11:02:55 2021 +0000

    Set version to 3.7.0rc1

commit aa00386
Author: Tony Mountifield <tony@mountifield.org>
Date:   Wed Mar 10 10:49:42 2021 +0000

    Additions to ChangeLog and contributors list.

commit 5111a05
Merge: 5d2574a c58a080
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Wed Mar 10 11:22:58 2021 +0100

    Merge pull request jamulussoftware#1203 from hoffie/improve-translation-checker-macros-detection

    Tools: Improve Wininstaller translation checker

commit 5d2574a
Merge: 17d8f74 ef78ff5
Author: Tony Mountifield <tony@mountifield.org>
Date:   Tue Mar 9 21:24:15 2021 +0000

    Merge pull request jamulussoftware#1194 from npostavs/np.driverInfo-set0

commit 17d8f74
Merge: 3a17f92 ab1bbe6
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Tue Mar 9 17:25:06 2021 +0100

    Merge pull request jamulussoftware#1210 from hoffie/revert-1009

    Revert "Client: Always update gain levels"

commit 3a17f92
Author: Tony Mountifield <tony@mountifield.org>
Date:   Tue Mar 9 15:47:31 2021 +0000

    Fix accelerator and update qm for FR and SE.

commit ab1bbe6
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Mon Mar 8 23:01:02 2021 +0100

    Revert "Client: Always update gain levels"

    This reverts PR jamulussoftware#1009 (f116811) as it
    has unintended side effects (jamulussoftware#1191).

    Basically, that PR assumed that applying stored fader levels would
    always be a safe thing to do.
    This is not the case, as changes in fader levels are currently not
    stored immediately, but rather in specific events only (e.g.
    disconnects).

    PR jamulussoftware#1009 was initially supposed to help with jamulussoftware#955 as a client-side fix.
    With the revert, we still have the server-side fix from jamulussoftware#1010.

    It is planned to re-apply jamulussoftware#1009 once fader-level storage has been fully
    understood and extended to cover all relevant places (jamulussoftware#1191).

commit 2d7025e
Merge: ca2ae79 b6ce552
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Mon Mar 8 21:51:56 2021 +0100

    Merge pull request jamulussoftware#1208 from Snayler/wininstallerpt

    pt_PT translation of wininstaller for 3.7.0

commit ca2ae79
Author: Olivier Humbert <trebmuh@users.noreply.github.com>
Date:   Mon Mar 8 21:46:33 2021 +0100

    Update French translation for 3.7.0 (jamulussoftware#1199)

    * French translation update

    * fixes a French translation mistake after a double-check

    * Updates French translation

commit b6ce552
Author: Miguel de Matos <11491485+Snayler@users.noreply.github.com>
Date:   Mon Mar 8 17:39:30 2021 +0000

    pt_PT translation of wininstaller for 3.7.0

commit ef78ff5
Author: Noam Postavsky <npostavs@users.sourceforge.net>
Date:   Sun Mar 7 10:45:37 2021 -0500

    windows/sound.cpp: Explicitly set driverInfo to 0

    Until now, it was semi-accidentally set to zero by virtue of being
    allocated on fresh memory.

commit c58a080
Author: Christian Hoffmann <mail@hoffmann-christian.info>
Date:   Mon Mar 8 10:01:30 2021 +0100

    Tools: Improve Wininstaller translation checker

    The checker will now detect if the macros are commented out.

    jamulussoftware#1198 (review)

    Signed-off-by: Christian Hoffmann <mail@hoffmann-christian.info>

commit d87562e
Author: dzpex <65598812+dzpex@users.noreply.github.com>
Date:   Mon Mar 8 09:51:56 2021 +0100

    Installer: Add Italian translation (jamulussoftware#1198)

    * Update it.nsi

    * Update installerlng.nsi
@hoffie hoffie deleted the fix-955-always-send-gain-on-channel-list branch March 19, 2022 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pljones pljones pljones approved these changes

@softins softins softins approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Release 3.7.0

Development

Successfully merging this pull request may close these issues.

Restarting the server on the fly ignores set levels and mixes everybody at 100%

3 participants

@hoffie @pljones @softins