diff --git a/ChangeLog b/ChangeLog index 63b92d3e..203b40e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ - support sorting faders by channel instrument, coded by Alberstein8 (#356) +- add server recording indicator, coded by pljones (#295) + - support for storing/recovering the server window positions (#357) @@ -17,6 +19,7 @@ + 3.5.6 (2020-06-09) - support sorting faders by channel name (#178) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 581408c0..0a1d902d 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -630,9 +630,9 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) : setAccessibleName ( "Personal Mix at the Server groupbox" ); - setWhatsThis ( "" + tr( "Personal Mix at the Server" ) + ": " + + setWhatsThis ( "" + tr ( "Personal Mix at the Server" ) + ": " + tr ( "When connected to a server, the controls here allow you to set " ) + - tr ( "your local mix without affecting what others hear from you.") + "
" + + tr ( "your local mix without affecting what others hear from you." ) + "
" + tr ( "The title shows the server name and, when known, " "whether it is actively recording." ) ); @@ -816,23 +816,23 @@ void CAudioMixerBoard::ChangeFaderOrder ( const bool bDoSort, } } -QString CAudioMixerBoard::GetTitle() +void CAudioMixerBoard::UpdateTitle() { - QString myTitle = ""; + QString strTitlePrefix = ""; + if ( eRecorderState == RS_RECORDING ) { - myTitle = "[" + tr ( "RECORDING ACTIVE" ) + "] "; + strTitlePrefix = "[" + tr ( "RECORDING ACTIVE" ) + "] "; } - return myTitle + tr ( "Personal Mix at: " ) + strServerName; + + setTitle ( strTitlePrefix + tr ( "Personal Mix at: " ) + strServerName ); } void CAudioMixerBoard::SetRecorderState ( const ERecorderState newRecorderState ) { + // store the new recorder state and update the title eRecorderState = newRecorderState; - if ( !strServerName.isEmpty() && !bNoFaderVisible ) - { - setTitle ( GetTitle() ); - } + UpdateTitle(); } void CAudioMixerBoard::ApplyNewConClientList ( CVector& vecChanInfo ) @@ -841,7 +841,7 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector& vecChanInf // in the audio mixer board to show a "try to connect" before if ( bNoFaderVisible ) { - setTitle ( GetTitle() ); + UpdateTitle(); } // get number of connected clients diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h index 9415453b..3d8457be 100755 --- a/src/audiomixerboard.h +++ b/src/audiomixerboard.h @@ -190,8 +190,6 @@ protected: } }; - QString GetTitle(); - bool GetStoredFaderSettings ( const CChannelInfo& ChanInfo, int& iStoredFaderLevel, int& iStoredPanValue, @@ -200,6 +198,7 @@ protected: void StoreFaderSettings ( CChannelFader* pChanFader ); void UpdateSoloStates(); + void UpdateTitle(); void OnGainValueChanged ( const int iChannelIdx, const double dValue ); diff --git a/src/protocol.cpp b/src/protocol.cpp index 838e7145..61be0026 100755 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -1585,8 +1585,8 @@ bool CProtocol::EvaluateRecorderStateMes(const CVector& vecData) const int iRecorderState = static_cast ( GetValFromStream ( vecData, iPos, 1 ) ); - if ( ( iRecorderState != RS_UNDEFINED ) && - ( iRecorderState != RS_NOT_INITIALISED ) && + // note that RS_UNDEFINED is only internally used + if ( ( iRecorderState != RS_NOT_INITIALISED ) && ( iRecorderState != RS_NOT_ENABLED ) && ( iRecorderState != RS_RECORDING ) ) { diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index 56d35893..e697891c 100644 Binary files a/src/res/translation/translation_de_DE.qm and b/src/res/translation/translation_de_DE.qm differ diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 6dfdae60..69ce25b3 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -190,18 +190,43 @@ CAudioMixerBoard - + + Personal Mix at the Server + + + + + When connected to a server, the controls here allow you to set + + + + + your local mix without affecting what others hear from you. + + + + + The title shows the server name and, when known, whether it is actively recording. + + + + Server - + T R Y I N G T O C O N N E C T V E R B I N D U N G S A U F B A U - - Personal Mix at the Server: + + RECORDING ACTIVE + + + + + Personal Mix at: Eigener Mix am Server: @@ -715,7 +740,7 @@ - + C&onnect &Verbinden @@ -769,18 +794,18 @@ Keine - + Center Mitte - + R - + L @@ -865,22 +890,22 @@ Sortiere Kanäle nach &Instrument - + Central Server Zentralserver - + user Musiker - + users Musiker - + D&isconnect &Trennen @@ -1513,22 +1538,22 @@ Manuell - + Custom Benutzerdefiniert - + All Genres Alle Genres - + Genre Rock Genre Rock - + Genre Jazz Genre Jazz @@ -1537,12 +1562,12 @@ Genre Rock/Jazz - + Genre Classical/Folk/Choir Genre Klassik/Volksmusik/Chor - + Default Standard @@ -2643,22 +2668,22 @@ Server - + Predefined Address Vordefinierte Adresse - + Recording Aufnahme - + Not recording Keine Aufnahme - + Not enabled Nicht aktiviert @@ -2685,42 +2710,42 @@ &Fenster - + Unregistered Nicht registriert - + Bad address Ungültige Adresse - + Registration requested Registrierung angefordert - + Registration failed Registrierung fehlgeschlagen - + Check server version Überprüfe Version des Servers - + Registered Registriert - + Central Server full Zentralserver voll - + Unknown value Unbekannter Wert diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm index 0d5c7ce9..cbaba548 100644 Binary files a/src/res/translation/translation_es_ES.qm and b/src/res/translation/translation_es_ES.qm differ diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index e8e494ad..525fb649 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -194,18 +194,43 @@ CAudioMixerBoard - + + Personal Mix at the Server + + + + + When connected to a server, the controls here allow you to set + + + + + your local mix without affecting what others hear from you. + + + + + The title shows the server name and, when known, whether it is actively recording. + + + + Server Servidor - + T R Y I N G T O C O N N E C T I N T E N T A N D O C O N E C T A R - - Personal Mix at the Server: + + RECORDING ACTIVE + + + + + Personal Mix at: Mezcla Personal en el Servidor: @@ -727,7 +752,7 @@ - + C&onnect C&onectar @@ -777,18 +802,18 @@ Ninguno - + Center Centro - + R R - + L L @@ -873,22 +898,22 @@ Ordenar Canales por &Instrumento - + Central Server Servidor Central - + user usuario - + users usuarios - + D&isconnect D&esconectar @@ -1521,12 +1546,12 @@ Manual - + Custom Personalizado - + All Genres Todos los Géneros @@ -1535,22 +1560,22 @@ Género Rock/Jazz - + Genre Classical/Folk/Choir Género Clásica/Folk/Coro - + Genre Rock Género Rock - + Genre Jazz Género Jazz - + Default Por defecto @@ -2655,22 +2680,22 @@ - + Predefined Address Dirección Preestablecida - + Recording Grabando - + Not recording No grabando - + Not enabled No habilitado @@ -2697,42 +2722,42 @@ &Ventana - + Unregistered Sin registrar - + Bad address Dirección no válida - + Registration requested Registro solicitado - + Registration failed Error de registro - + Check server version Comprueba la versión del servidor - + Registered Registrado - + Central Server full Servidor Central lleno - + Unknown value Valor desconocido diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm index 922678b1..7cd60017 100644 Binary files a/src/res/translation/translation_fr_FR.qm and b/src/res/translation/translation_fr_FR.qm differ diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 916a7929..0e73552b 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -202,18 +202,43 @@ CAudioMixerBoard - + + Personal Mix at the Server + + + + + When connected to a server, the controls here allow you to set + + + + + your local mix without affecting what others hear from you. + + + + + The title shows the server name and, when known, whether it is actively recording. + + + + Server Serveur - + T R Y I N G T O C O N N E C T T E N T A T I V E D E C O N N E X I O N - - Personal Mix at the Server: + + RECORDING ACTIVE + + + + + Personal Mix at: Mixage personnel du serveur : @@ -723,7 +748,7 @@ - + C&onnect Se c&onnecter @@ -777,18 +802,18 @@ Aucun - + Center Centre - + R D - + L G @@ -873,22 +898,22 @@ - + Central Server Serveur central - + user utilisateur - + users utilisateurs - + D&isconnect Dé&connecter @@ -1525,12 +1550,12 @@ Manuel - + Custom Personnalisé - + All Genres Tous les genres @@ -1539,22 +1564,22 @@ Genre rock/jazz - + Genre Classical/Folk/Choir Genre classique/folk/choeur - + Genre Rock Genre Rock - + Genre Jazz Genre Jazz - + Default Défaut @@ -2647,22 +2672,22 @@ serveur - + Predefined Address Adresse prédéfinie - + Recording Enregistrement - + Not recording Ne pas enregistrer - + Not enabled Non activé @@ -2689,42 +2714,42 @@ &Fenêtre - + Unregistered Non inscrit - + Bad address Mauvaise adresse - + Registration requested Inscription demandée - + Registration failed Échec de l'inscription - + Check server version Vérifier la version du serveur - + Registered Inscrit - + Central Server full Serveur central rempli - + Unknown value Valeur inconnue diff --git a/src/res/translation/translation_it_IT.qm b/src/res/translation/translation_it_IT.qm index fad3e633..11929a8d 100644 Binary files a/src/res/translation/translation_it_IT.qm and b/src/res/translation/translation_it_IT.qm differ diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index 1fcc8ed6..d49733c2 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -190,18 +190,43 @@ CAudioMixerBoard - + + Personal Mix at the Server + + + + + When connected to a server, the controls here allow you to set + + + + + your local mix without affecting what others hear from you. + + + + + The title shows the server name and, when known, whether it is actively recording. + + + + Server Server - + T R Y I N G T O C O N N E C T I N A T T E S A D I C O N N E S S I O N E - - Personal Mix at the Server: + + RECORDING ACTIVE + + + + + Personal Mix at: Mixer personale sul Server: @@ -560,7 +585,7 @@ - + L L @@ -783,7 +808,7 @@ - + C&onnect C&onnetti @@ -847,32 +872,32 @@ Nullo - + Center Centro - + R R - + Central Server Server Centrale - + user utente - + users utenti - + D&isconnect D&isconnetti @@ -1537,32 +1562,32 @@ Ok - + Custom Personalizzato - + All Genres Tutti i Generi - + Genre Rock Genere Rock - + Genre Jazz Genere Jazz - + Genre Classical/Folk/Choir Genere Classica/Folk/Corale - + Default Default @@ -2621,62 +2646,62 @@ &Finestra - + Predefined Address Indirizzo Predefinito - + Recording Registrazione - + Not recording Registrazione Ferma - + Not enabled Non Abilitata - + Unregistered Non registrato - + Bad address Indirizzo Errato - + Registration requested Registrazione richiesta - + Registration failed Registrazione fallita - + Check server version Controlla Versione server - + Registered Registrato - + Central Server full Server Centrale Pieno - + Unknown value Valore sconosciuto diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index 7b289a7f..c864878d 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -190,18 +190,43 @@ CAudioMixerBoard - + + Personal Mix at the Server + + + + + When connected to a server, the controls here allow you to set + + + + + your local mix without affecting what others hear from you. + + + + + The title shows the server name and, when known, whether it is actively recording. + + + + Server Server - + T R Y I N G T O C O N N E C T A A N H E T V E R B I N D E N - - Personal Mix at the Server: + + RECORDING ACTIVE + + + + + Personal Mix at: @@ -552,7 +577,7 @@ - + L L @@ -775,7 +800,7 @@ - + C&onnect C&onnect @@ -835,32 +860,32 @@ Geen - + Center Centrum - + R R - + Central Server - + user gebruiker - + users gebruikers - + D&isconnect &Afmelden @@ -1485,32 +1510,32 @@ Handmatig - + Custom - + All Genres - + Genre Rock - + Genre Jazz - + Genre Classical/Folk/Choir - + Default Standaard @@ -2599,22 +2624,22 @@ server - + Predefined Address - + Recording - + Not recording - + Not enabled @@ -2641,42 +2666,42 @@ &Window - + Unregistered Niet geregistreerd - + Bad address Slecht adres - + Registration requested Aanmelding gevraagd - + Registration failed Registratie is mislukt - + Check server version Controleer de versie van de server - + Registered Geregistreerd - + Central Server full Centrale server vol - + Unknown value Onbekende waarde diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index d408dab7..18bd9f20 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -158,18 +158,43 @@ CAudioMixerBoard - - Server + + Personal Mix at the Server + + + + + When connected to a server, the controls here allow you to set + + + + + your local mix without affecting what others hear from you. + + + + + The title shows the server name and, when known, whether it is actively recording. + Server + + + + T R Y I N G T O C O N N E C T - - Personal Mix at the Server: + + RECORDING ACTIVE + + + + + Personal Mix at: @@ -464,7 +489,7 @@ - + L @@ -635,7 +660,7 @@ - + C&onnect @@ -695,32 +720,32 @@ - + Center - + R - + Central Server - + user - + users - + D&isconnect @@ -1225,32 +1250,32 @@ - + Custom - + All Genres - + Genre Rock - + Genre Jazz - + Genre Classical/Folk/Choir - + Default @@ -2244,22 +2269,22 @@ - + Predefined Address - + Recording - + Not recording - + Not enabled @@ -2289,42 +2314,42 @@ - + Unregistered - + Bad address - + Registration requested - + Registration failed - + Check server version - + Registered - + Central Server full - + Unknown value diff --git a/src/res/translation/translation_pt_PT.qm b/src/res/translation/translation_pt_PT.qm index da5729ef..1fca6c2d 100644 Binary files a/src/res/translation/translation_pt_PT.qm and b/src/res/translation/translation_pt_PT.qm differ diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index fda43a8f..bb350ebc 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -202,18 +202,43 @@ CAudioMixerBoard - + + Personal Mix at the Server + + + + + When connected to a server, the controls here allow you to set + + + + + your local mix without affecting what others hear from you. + + + + + The title shows the server name and, when known, whether it is actively recording. + + + + Server Servidor - + T R Y I N G T O C O N N E C T T E N T A N D O L I G A R - - Personal Mix at the Server: + + RECORDING ACTIVE + + + + + Personal Mix at: Mistura Pessoal no Servidor: @@ -719,7 +744,7 @@ - + C&onnect &Ligar @@ -773,18 +798,18 @@ Nenhum - + Center Centro - + R R - + L L @@ -869,22 +894,22 @@ - + Central Server Servidor Central - + user utilizador - + users utilizadores - + D&isconnect Desl&igar @@ -1513,22 +1538,22 @@ Manual - + Custom Personalizado - + All Genres Servidor Geral - + Genre Rock Servidor Rock - + Genre Jazz Servidor Jazz @@ -1537,12 +1562,12 @@ Servidor Rock/Jazz - + Genre Classical/Folk/Choir Serv. Clássica/Folclore/Coro - + Default Servidor Padrão @@ -2631,22 +2656,22 @@ - + Predefined Address Endereço Predefinido - + Recording A gravar - + Not recording Não está a gravar - + Not enabled Desactivado @@ -2673,42 +2698,42 @@ &Janela - + Unregistered Não Registado - + Bad address Endereço incorrecto - + Registration requested Registo solicitado - + Registration failed Falha no registo - + Check server version Verifique versão do servidor - + Registered Registado - + Central Server full Servidor Central Cheio - + Unknown value Valor desconhecido