Merge pull request #2427 from pljones/patch/recorder-adjustments

Recorder adjustments
jamulussoftware · Feb 28, 2022 · 158a0ab · 158a0ab
2 parents 74150e5 + 5570ccb
commit 158a0ab
Show file tree

Hide file tree

Showing 26 changed files with 158 additions and 134 deletions.
diff --git a/src/recorder/jamcontroller.cpp b/src/recorder/jamcontroller.cpp
@@ -91,15 +91,15 @@ void CJamController::SetRecordingDir ( QString newRecordingDir, int iServerFrame
     {
         pJamRecorder         = new recorder::CJamRecorder ( newRecordingDir, iServerFrameSizeSamples );
         strRecorderErrMsg    = pJamRecorder->Init();
-        bRecorderInitialised = ( strRecorderErrMsg == QString::null );
+        bRecorderInitialised = ( strRecorderErrMsg == QString() );
         bEnableRecording     = bRecorderInitialised && !bDisableRecording;
 
         qInfo() << qUtf8Printable ( QString ( "Recording state: %1" ).arg ( bEnableRecording ? "enabled" : "disabled" ) );
     }
     else
     {
         // This is the only time this is ever true - UI needs to handle it
-        strRecorderErrMsg    = QString::null;
+        strRecorderErrMsg    = QString();
         bRecorderInitialised = false;
         bEnableRecording     = false;
 

diff --git a/src/recorder/jamrecorder.cpp b/src/recorder/jamrecorder.cpp
@@ -359,11 +359,11 @@ QMap<QString, QList<STrackItem>> CJamSession::TracksFromSessionDir ( const QStri
 /**
  * @brief CJamRecorder::Init Create recording directory, if necessary, and connect signal handlers
  * @param server Server object emitting signals
- * @return QString::null on success else the failure reason
+ * @return QString() on success else the failure reason
  */
 QString CJamRecorder::Init()
 {
-    QString   errmsg = QString::null;
+    QString   errmsg = QString();
     QFileInfo fi ( recordBaseDir.absolutePath() );
     fi.setCaching ( false );
 

diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm
diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts
@@ -3631,13 +3631,13 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion &apos;Stummschalten&apos
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="125"/>
-        <source>Recording has been switched off by the UI checkbox</source>
-        <translation>Die Aufnahme wurde über die Checkbox in der Benutzeroberfläche ausgeschaltet</translation>
+        <source>Recording has been switched off by the UI checkbox.</source>
+        <translation>Die Aufnahme wurde über die Checkbox in der Benutzeroberfläche ausgeschaltet.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="127"/>
-        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received</source>
-        <translation>Die Aufnahme wurde entweder durch eine Auswahl in der Benutzeroberfläche oder das SIGUSR2 Signal beendet</translation>
+        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received.</source>
+        <translation>Die Aufnahme wurde entweder durch eine Auswahl in der Benutzeroberfläche oder das SIGUSR2 Signal beendet.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="155"/>
@@ -3731,8 +3731,8 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion &apos;Stummschalten&apos
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="122"/>
-        <source>No recording directory has been set or the value is not useable</source>
-        <translation>Es wurde kein Aufnahmeverzeichnis gesetzt oder es wurde ein ungültiges Aufnahmeverzeichnis angegeben</translation>
+        <source>No recording directory has been set or the value is not useable.</source>
+        <translation>Es wurde kein Aufnahmeverzeichnis gesetzt oder es wurde ein ungültiges Aufnahmeverzeichnis angegeben.</translation>
     </message>
     <message>
         <source>Recording has been switched off</source>
@@ -3748,13 +3748,13 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion &apos;Stummschalten&apos
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="129"/>
-        <source>There is no one connected to the server to record</source>
-        <translation>Es ist kein Musiker mit dem Server verbunden</translation>
+        <source>There is no one connected to the server to record.</source>
+        <translation>Es ist kein Musiker mit dem Server verbunden.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="130"/>
-        <source>The performers are being recorded to the specified session directory</source>
-        <translation>Die Aufnahme ist aktiv</translation>
+        <source>The performers are being recorded to the specified session directory.</source>
+        <translation>Die Aufnahme ist aktiv.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="131"/>

diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm
diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts
@@ -3691,13 +3691,13 @@ Hemos silenciado tu canal y activado &apos;Silenciarme Yo&apos;. Por favor resue
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="125"/>
-        <source>Recording has been switched off by the UI checkbox</source>
-        <translation>La grabación se ha apagado con la casilla de la interfaz gráfica</translation>
+        <source>Recording has been switched off by the UI checkbox.</source>
+        <translation>La grabación se ha apagado con la casilla de la interfaz gráfica.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="127"/>
-        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received</source>
-        <translation>La grabación se ha apagado, bien a través de la casilla de la interfaz gráfica o por haber recibido SIGUSR2</translation>
+        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received.</source>
+        <translation>La grabación se ha apagado, bien a través de la casilla de la interfaz gráfica o por haber recibido SIGUSR2.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="155"/>
@@ -3791,8 +3791,8 @@ Hemos silenciado tu canal y activado &apos;Silenciarme Yo&apos;. Por favor resue
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="122"/>
-        <source>No recording directory has been set or the value is not useable</source>
-        <translation>No se ha establecido ningún directorio de grabación o el valor no es utilizable</translation>
+        <source>No recording directory has been set or the value is not useable.</source>
+        <translation>No se ha establecido ningún directorio de grabación o el valor no es utilizable.</translation>
     </message>
     <message>
         <source>Recording has been switched off</source>
@@ -3808,13 +3808,13 @@ Hemos silenciado tu canal y activado &apos;Silenciarme Yo&apos;. Por favor resue
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="129"/>
-        <source>There is no one connected to the server to record</source>
-        <translation>No hay nadie conectado al servidor para grabar</translation>
+        <source>There is no one connected to the server to record.</source>
+        <translation>No hay nadie conectado al servidor para grabar.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="130"/>
-        <source>The performers are being recorded to the specified session directory</source>
-        <translation>Los intérpretes están siendo grabados al directorio de sesión especificado</translation>
+        <source>The performers are being recorded to the specified session directory.</source>
+        <translation>Los intérpretes están siendo grabados al directorio de sesión especificado.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="131"/>

diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm
diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts
@@ -3206,8 +3206,8 @@ Nous avons coupé votre canal et activé &quot;Me silencer&quot;. Veuillez d&apo
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="122"/>
-        <source>No recording directory has been set or the value is not useable</source>
-        <translation>Aucun répertoire d&apos;enregistrement n&apos;a été défini ou la valeur n&apos;est pas utilisable</translation>
+        <source>No recording directory has been set or the value is not useable.</source>
+        <translation>Aucun répertoire d&apos;enregistrement n&apos;a été défini ou la valeur n&apos;est pas utilisable.</translation>
     </message>
     <message>
         <source>Recording has been switched off</source>
@@ -3223,13 +3223,13 @@ Nous avons coupé votre canal et activé &quot;Me silencer&quot;. Veuillez d&apo
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="129"/>
-        <source>There is no one connected to the server to record</source>
-        <translation>Il n&apos;y a personne connecté au serveur pour enregistrer</translation>
+        <source>There is no one connected to the server to record.</source>
+        <translation>Il n&apos;y a personne connecté au serveur pour enregistrer.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="130"/>
-        <source>The performers are being recorded to the specified session directory</source>
-        <translation>Les interprètes sont enregistrés dans le répertoire de session spécifié</translation>
+        <source>The performers are being recorded to the specified session directory.</source>
+        <translation>Les interprètes sont enregistrés dans le répertoire de session spécifié.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="131"/>
@@ -3348,12 +3348,12 @@ Nous avons coupé votre canal et activé &quot;Me silencer&quot;. Veuillez d&apo
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="125"/>
-        <source>Recording has been switched off by the UI checkbox</source>
+        <source>Recording has been switched off by the UI checkbox.</source>
         <translation>L&apos;enregistrement a été désactivé par la case à cocher de l&apos;interface utilisateur</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="127"/>
-        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received</source>
+        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received.</source>
         <translation>L&apos;enregistrement a été désactivé, soit par la case à cocher de l&apos;interface utilisateur, soit par la réception de SIGUSR2</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_it_IT.qm b/src/res/translation/translation_it_IT.qm
diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts
@@ -3640,13 +3640,13 @@ E&apos; stato disattivato l&apos;audio del tuo canale ed inserito il &quot;Disat
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="125"/>
-        <source>Recording has been switched off by the UI checkbox</source>
-        <translation>La registrazione è stata fermata mediante il box presente sull&apos;interfaccia</translation>
+        <source>Recording has been switched off by the UI checkbox.</source>
+        <translation>La registrazione è stata fermata mediante il box presente sull&apos;interfaccia.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="127"/>
-        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received</source>
-        <translation>La registrazione è stata fermata mediante il box presente sull&apos;interfaccia oppure dalla ricezione del segnale SIGUSR2</translation>
+        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received.</source>
+        <translation>La registrazione è stata fermata mediante il box presente sull&apos;interfaccia oppure dalla ricezione del segnale SIGUSR2.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="155"/>
@@ -3740,8 +3740,8 @@ E&apos; stato disattivato l&apos;audio del tuo canale ed inserito il &quot;Disat
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="122"/>
-        <source>No recording directory has been set or the value is not useable</source>
-        <translation>Cartella per la registrazione non settata o non utilizzabile</translation>
+        <source>No recording directory has been set or the value is not useable.</source>
+        <translation>Cartella per la registrazione non settata o non utilizzabile.</translation>
     </message>
     <message>
         <source>Recording has been switched off</source>
@@ -3757,13 +3757,13 @@ E&apos; stato disattivato l&apos;audio del tuo canale ed inserito il &quot;Disat
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="129"/>
-        <source>There is no one connected to the server to record</source>
-        <translation>Non c&apos;è nessuno collegato al server per registrare</translation>
+        <source>There is no one connected to the server to record.</source>
+        <translation>Non c&apos;è nessuno collegato al server per registrare.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="130"/>
-        <source>The performers are being recorded to the specified session directory</source>
-        <translation>Gli artisti vengono registrati nella directory della sessione specificata</translation>
+        <source>The performers are being recorded to the specified session directory.</source>
+        <translation>Gli artisti vengono registrati nella directory della sessione specificata.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="131"/>

diff --git a/src/res/translation/translation_nl_NL.qm b/src/res/translation/translation_nl_NL.qm
diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts
@@ -3635,13 +3635,13 @@ We hebben uw kanaal gedempt en &apos;Demp mijzelf&apos; geactiveerd. Los eerst h
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="125"/>
-        <source>Recording has been switched off by the UI checkbox</source>
-        <translation>Opname is uitgeschakeld middels het vinkje in het venster</translation>
+        <source>Recording has been switched off by the UI checkbox.</source>
+        <translation>Opname is uitgeschakeld middels het vinkje in het venster.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="127"/>
-        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received</source>
-        <translation>Opname is uitgeschakeld middels het vinkje in het venster of doordat het SIGUSR2 signaal is ontvangen</translation>
+        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received.</source>
+        <translation>Opname is uitgeschakeld middels het vinkje in het venster of doordat het SIGUSR2 signaal is ontvangen.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="155"/>
@@ -3735,8 +3735,8 @@ We hebben uw kanaal gedempt en &apos;Demp mijzelf&apos; geactiveerd. Los eerst h
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="122"/>
-        <source>No recording directory has been set or the value is not useable</source>
-        <translation>Geen geluidsopnamedirectory ingesteld of waarde is niet bruikbaar</translation>
+        <source>No recording directory has been set or the value is not useable.</source>
+        <translation>Geen geluidsopnamedirectory ingesteld of waarde is niet bruikbaar.</translation>
     </message>
     <message>
         <source>Recording has been switched off</source>
@@ -3752,13 +3752,13 @@ We hebben uw kanaal gedempt en &apos;Demp mijzelf&apos; geactiveerd. Los eerst h
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="129"/>
-        <source>There is no one connected to the server to record</source>
-        <translation>Er is niemand verbonden met de server voor geluidsopname</translation>
+        <source>There is no one connected to the server to record.</source>
+        <translation>Er is niemand verbonden met de server voor geluidsopname.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="130"/>
-        <source>The performers are being recorded to the specified session directory</source>
-        <translation>Het geluid van de muzikanten wordt opgenomen in de aangegeven sessie-directory</translation>
+        <source>The performers are being recorded to the specified session directory.</source>
+        <translation>Het geluid van de muzikanten wordt opgenomen in de aangegeven sessie-directory.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="131"/>

diff --git a/src/res/translation/translation_pl_PL.qm b/src/res/translation/translation_pl_PL.qm
diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts
@@ -3229,13 +3229,13 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="125"/>
-        <source>Recording has been switched off by the UI checkbox</source>
-        <translation>Nagrywanie zostało wyłączone przez użytkownika</translation>
+        <source>Recording has been switched off by the UI checkbox.</source>
+        <translation>Nagrywanie zostało wyłączone przez użytkownika.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="127"/>
-        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received</source>
-        <translation>Nagrywanie zostało wyłączone przez użytkownika lub otrzymano komunikat SIGUSR2</translation>
+        <source>Recording has been switched off, either by the UI checkbox or SIGUSR2 being received.</source>
+        <translation>Nagrywanie zostało wyłączone przez użytkownika lub otrzymano komunikat SIGUSR2.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="148"/>
@@ -3403,8 +3403,8 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="122"/>
-        <source>No recording directory has been set or the value is not useable</source>
-        <translation>Nie wybrano katalogu nagrywania lub nie da się go używać</translation>
+        <source>No recording directory has been set or the value is not useable.</source>
+        <translation>Nie wybrano katalogu nagrywania lub nie da się go używać.</translation>
     </message>
     <message>
         <source>Recording has been switched off</source>
@@ -3420,13 +3420,13 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="129"/>
-        <source>There is no one connected to the server to record</source>
-        <translation>Nikt nie jest podłączony do serwera żeby nagrywać</translation>
+        <source>There is no one connected to the server to record.</source>
+        <translation>Nikt nie jest podłączony do serwera żeby nagrywać.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="130"/>
-        <source>The performers are being recorded to the specified session directory</source>
-        <translation>Wykonawcy są nagrywani do wybranego katalogu</translation>
+        <source>The performers are being recorded to the specified session directory.</source>
+        <translation>Wykonawcy są nagrywani do wybranego katalogu.</translation>
     </message>
     <message>
         <location filename="../../serverdlg.cpp" line="131"/>

diff --git a/src/res/translation/translation_pt_BR.qm b/src/res/translation/translation_pt_BR.qm