feature-req925 recording indicator#968
Merged
pljones merged 3 commits intojamulussoftware:masterfrom Feb 10, 2021
dcorson-ticino-com:pr957-server-recording
Merged
feature-req925 recording indicator#968pljones merged 3 commits intojamulussoftware:masterfrom dcorson-ticino-com:pr957-server-recording
pljones merged 3 commits intojamulussoftware:masterfrom
dcorson-ticino-com:pr957-server-recording
Conversation
New function SetMixerBoardDeco sets title color and background according to recording state and skin. Called on recorder state change, skin change and disconnect
ann0see
requested changes
Feb 8, 2021
Member
ann0see
left a comment
ann0see
left a comment
There was a problem hiding this comment.
Thanks for the new PR! It seems to work now. I didn't analyse it yet, but from my first impression, there are some smaller style changes you should make. Will test the code if I have more time.
Contributor
Author
|
Just pushed with the corrected style (I hope)
Don
… On 08 February 2021 at 09:32 ann0see ***@***.***> wrote:
@ann0see requested changes on this pull request.
Thanks for the new PR! It seems to work now. I didn't analyse it yet, but from my first impression, there are some smaller style changes you should make. Will test the code if I have more time.
---------------------------------------------
In src/audiomixerboard.h #968 (comment) :
> @@ -219,6 +219,8 @@ class CAudioMixerBoard :
void SetChannelLevels ( const CVector<uint16_t>& vecChannelLevel );
void SetRecorderState ( const ERecorderState newRecorderState );
+ ERecorderState GetRecorderState () { return eRecorderState; };
The style here's a bit odd
---------------------------------------------
In src/clientdlg.cpp #968 (comment) :
> @@ -39,6 +39,8 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
pSettings ( pNSetP ),
bConnectDlgWasShown ( false ),
bMIDICtrlUsed ( !strMIDISetup.isEmpty() ),
+ eLastRecorderState ( RS_UNDEFINED ), // for SetMixerBoardDeco
+ eLastDesign ( GD_ORIGINAL ), //
Not sure about an empty comment here.
---------------------------------------------
In src/clientdlg.cpp #968 (comment) :
> @@ -1354,3 +1357,40 @@ rbtReverbSelR->setStyleSheet ( "" );
// also apply GUI design to child GUI controls
MainMixerBoard->SetGUIDesign ( eNewDesign );
}
+
+void CClientDlg::OnRecorderStateReceived ( const ERecorderState newRecorderState )
+{
+ MainMixerBoard->SetRecorderState ( newRecorderState );
+ SetMixerBoardDeco( newRecorderState, pClient->GetGUIDesign() );
+}
+
+void CClientDlg::OnGUIDesignChanged()
+{
+ SetGUIDesign ( pClient->GetGUIDesign() );
The code style seems to be a bit inconsistent here.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub #968 (review) , or unsubscribe https://github.com/notifications/unsubscribe-auth/APLAH4CRLZTFRGRJSWNPWFTS56ORXANCNFSM4XH362MQ .
|
ann0see
requested changes
Feb 8, 2021
Member
ann0see
left a comment
ann0see
left a comment
There was a problem hiding this comment.
Thanks for your changes. I think the new linter action (which is in development) is needed since the jamulus code style is odd.
I've added a few other comments.
Member
|
The functionality is ok. Didn't follow the issue, so I can't comment on that. For me, the red tone looks a bit too bright. But that's probably something the UI team (you also belong to) already discussed. |
pljones
reviewed
Feb 10, 2021
| { | ||
| // return if no change | ||
| if ( ( newRecorderState == eLastRecorderState ) && ( eNewDesign == eLastDesign ) ) | ||
| return; |
Collaborator
There was a problem hiding this comment.
Generally this would not be a bare naked return - it would have its own {} block around it. Letting it pass.
pljones
approved these changes
Feb 10, 2021
Member
|
@dcorson-ticino-com Could you please add yourself to the contributor list and add this feature to the Changelog? |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
New function SetMixerBoardDeco sets title color and background according
to recording state and skin.
Called on recorder state change, skin change and disconnect