Skip to content

Recorder adjustments #2427

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

Merged
pljones merged 3 commits into from
Feb 28, 2022
Merged

Recorder adjustments #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f2b605
Recorder UI adjustments
pljones Dec 22, 2021
b83df25
Make minor translation changes
pljones Feb 25, 2022
5570ccb
Avoid QString::null (for Qt6)
pljones Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/recorder/jamcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/recorder/jamrecorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
Binary file modified src/res/translation/translation_de_DE.qm
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions src/res/translation/translation_de_DE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand Down
Binary file modified src/res/translation/translation_es_ES.qm
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions src/res/translation/translation_es_ES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand Down
Binary file modified src/res/translation/translation_fr_FR.qm
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions src/res/translation/translation_fr_FR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down
Binary file modified src/res/translation/translation_it_IT.qm
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions src/res/translation/translation_it_IT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand Down
Binary file modified src/res/translation/translation_nl_NL.qm
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions src/res/translation/translation_nl_NL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand Down
Binary file modified src/res/translation/translation_pl_PL.qm
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions src/res/translation/translation_pl_PL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand Down
Binary file modified src/res/translation/translation_pt_BR.qm
View file
Open in desktop
Binary file not shown.
Loading