From 160f84e7a84c2106361bad5f855adc81b181e971 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 8 Jun 2020 21:01:20 +0200 Subject: [PATCH 1/5] fix Windows installer: fix Qt dlls missing --- ChangeLog | 4 --- windows/installer.nsi | 59 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 630a4990..66c53151 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,10 +26,6 @@ by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23) -TODO fix Windows installer: fix check for app run, fix Qt dlls missing - - - diff --git a/windows/installer.nsi b/windows/installer.nsi index 53b19fb3..326f5bba 100755 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -57,19 +57,15 @@ Section File "$%QTDIR64%\bin\Qt5Gui.dll" File "$%QTDIR64%\bin\Qt5Widgets.dll" File "$%QTDIR64%\bin\Qt5Network.dll" + File "$%QTDIR64%\bin\Qt5Svg.dll" File "$%QTDIR64%\bin\Qt5Xml.dll" - File "$%QTDIR64%\bin\D3DCompiler_47.dll" - File "$%QTDIR64%\bin\libEGL.dll" - File "$%QTDIR64%\bin\libGLESv2.dll" ${Else} File "$%QTDIR32%\bin\Qt5Core.dll" File "$%QTDIR32%\bin\Qt5Gui.dll" File "$%QTDIR32%\bin\Qt5Widgets.dll" File "$%QTDIR32%\bin\Qt5Network.dll" + File "$%QTDIR32%\bin\Qt5Svg.dll" File "$%QTDIR32%\bin\Qt5Xml.dll" - File "$%QTDIR32%\bin\D3DCompiler_47.dll" - File "$%QTDIR32%\bin\libEGL.dll" - File "$%QTDIR32%\bin\libGLESv2.dll" ${EndIf} ; other files @@ -106,10 +102,40 @@ Section SetOutPath $INSTDIR\platforms ${If} ${RunningX64} File "$%QTDIR64%\plugins\platforms\qwindows.dll" - File "$%QTDIR64%\plugins\platforms\qminimal.dll" ${Else} File "$%QTDIR32%\plugins\platforms\qwindows.dll" - File "$%QTDIR32%\plugins\platforms\qminimal.dll" + ${EndIf} + + ; additional styles dlls + SetOutPath $INSTDIR\styles + ${If} ${RunningX64} + File "$%QTDIR64%\plugins\styles\qwindowsvistastyle.dll" + ${Else} + File "$%QTDIR32%\plugins\styles\qwindowsvistastyle.dll" + ${EndIf} + + ; additional imageformats dlls + SetOutPath $INSTDIR\imageformats + ${If} ${RunningX64} + File "$%QTDIR64%\plugins\imageformats\qgif.dll" + File "$%QTDIR64%\plugins\imageformats\qicns.dll" + File "$%QTDIR64%\plugins\imageformats\qico.dll" + File "$%QTDIR64%\plugins\imageformats\qjpeg.dll" + File "$%QTDIR64%\plugins\imageformats\qsvg.dll" + File "$%QTDIR64%\plugins\imageformats\qtga.dll" + File "$%QTDIR64%\plugins\imageformats\qtiff.dll" + File "$%QTDIR64%\plugins\imageformats\qwbmp.dll" + File "$%QTDIR64%\plugins\imageformats\qwebp.dll" + ${Else} + File "$%QTDIR32%\plugins\imageformats\qgif.dll" + File "$%QTDIR32%\plugins\imageformats\qicns.dll" + File "$%QTDIR32%\plugins\imageformats\qico.dll" + File "$%QTDIR32%\plugins\imageformats\qjpeg.dll" + File "$%QTDIR32%\plugins\imageformats\qsvg.dll" + File "$%QTDIR32%\plugins\imageformats\qtga.dll" + File "$%QTDIR32%\plugins\imageformats\qtiff.dll" + File "$%QTDIR32%\plugins\imageformats\qwbmp.dll" + File "$%QTDIR32%\plugins\imageformats\qwebp.dll" ${EndIf} SectionEnd @@ -134,14 +160,23 @@ Delete $INSTDIR\Qt5Core.dll Delete $INSTDIR\Qt5Gui.dll Delete $INSTDIR\Qt5Widgets.dll Delete $INSTDIR\Qt5Network.dll +Delete $INSTDIR\Qt5Svg.dll Delete $INSTDIR\Qt5Xml.dll -Delete $INSTDIR\D3DCompiler_47.dll -Delete $INSTDIR\libEGL.dll -Delete $INSTDIR\libGLESv2.dll Delete $INSTDIR\COPYING Delete $INSTDIR\platforms\qwindows.dll -Delete $INSTDIR\platforms\qminimal.dll RMDir $INSTDIR\platforms +Delete $INSTDIR\styles\qwindowsvistastyle.dll +RMDir $INSTDIR\styles +Delete $INSTDIR\imageformats\qgif.dll +Delete $INSTDIR\imageformats\qicns.dll +Delete $INSTDIR\imageformats\qico.dll +Delete $INSTDIR\imageformats\qjpeg.dll +Delete $INSTDIR\imageformats\qsvg.dll +Delete $INSTDIR\imageformats\qtga.dll +Delete $INSTDIR\imageformats\qtiff.dll +Delete $INSTDIR\imageformats\qwbmp.dll +Delete $INSTDIR\imageformats\qwebp.dll +RMDir $INSTDIR\imageformats RMDir $INSTDIR SectionEnd From dccfeb88c6ff7c63a928066760c2c222d35bab47 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 8 Jun 2020 21:12:33 +0200 Subject: [PATCH 2/5] "Sort Channels by Name" -> "Sort Channel Users by Name" --- src/clientdlg.cpp | 2 +- src/res/translation/translation_de_DE.qm | Bin 94692 -> 94688 bytes src/res/translation/translation_de_DE.ts | 6 +++--- src/res/translation/translation_es_ES.ts | 4 ++-- src/res/translation/translation_fr_FR.ts | 4 ++-- src/res/translation/translation_it_IT.ts | 4 ++-- src/res/translation/translation_nl_NL.ts | 4 ++-- src/res/translation/translation_pl_PL.ts | 4 ++-- src/res/translation/translation_pt_PT.ts | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 6360b0f1..03e118b3 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -282,7 +282,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, // Edit menu -------------------------------------------------------------- pEditMenu = new QMenu ( tr ( "&Edit" ), this ); - pEditMenu->addAction ( tr ( "&Sort Channels by Name..." ), this, + pEditMenu->addAction ( tr ( "&Sort Channel Users by Name" ), this, SLOT ( OnSortChannelsByName() ), QKeySequence ( Qt::CTRL + Qt::Key_N ) ); diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index c659532e524edd756785f75d4976e70f8adec928..8bcac0444af200889da621a9f3b73d11deabe8c6 100644 GIT binary patch delta 3806 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 TDl_?W^R*eHPGpQ?exLt87we-S diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 01b8e73a..035a5def 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -200,7 +200,7 @@ V E R B I N D U N G S A U F B A U - + Personal Mix at the Server: Eigener Mix am Server: @@ -750,8 +750,8 @@ - &Sort Channels by Name... - &Sortiere Kanäle nach Namen... + &Sort Channel Users by Name + &Sortiere Kanäle nach Namen diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 5cd6729b..198d825a 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -204,7 +204,7 @@ I N T E N T A N D O C O N E C T A R - + Personal Mix at the Server: Mezcla Personal en el Servidor: @@ -762,7 +762,7 @@ - &Sort Channels by Name... + &Sort Channel Users by Name diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 0cd86ee8..c5d059fe 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -212,7 +212,7 @@ 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: Mixage personnel du serveur : @@ -758,7 +758,7 @@ - &Sort Channels by Name... + &Sort Channel Users by Name diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index 251b34bd..7025bd01 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -200,7 +200,7 @@ 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: Mixer personale sul Server: @@ -818,7 +818,7 @@ - &Sort Channels by Name... + &Sort Channel Users by Name diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index 92373b3b..f1af1cf3 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -200,7 +200,7 @@ A A N H E T V E R B I N D E N - + Personal Mix at the Server: @@ -810,7 +810,7 @@ - &Sort Channels by Name... + &Sort Channel Users by Name diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index 9265aec4..ee795ac3 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -168,7 +168,7 @@ - + Personal Mix at the Server: @@ -670,7 +670,7 @@ - &Sort Channels by Name... + &Sort Channel Users by Name diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 4d76b3c2..d028481d 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -212,7 +212,7 @@ T E N T A N D O L I G A R - + Personal Mix at the Server: Mistura Pessoal no Servidor: @@ -754,7 +754,7 @@ - &Sort Channels by Name... + &Sort Channel Users by Name From 1880520f77b8491e597c447d55cced6f6e3ab751 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 8 Jun 2020 21:30:43 +0200 Subject: [PATCH 3/5] update German translation --- src/res/translation/translation_de_DE.qm | Bin 94688 -> 99230 bytes src/res/translation/translation_de_DE.ts | 32 +++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index 8bcac0444af200889da621a9f3b73d11deabe8c6..119a3e2a9821bef4a91beb32602586fbeea47711 100644 GIT binary patch delta 6487 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 a;;Eg6lDeNCGiJ{zP5uLZuC!rADgOtpo#|!( diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 035a5def..b15fa174 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -1930,82 +1930,82 @@ You agree that all data, sounds, or other works transmitted to this server are owned and created by you or your licensors, and that you are making these data, sounds or other works available via the following Creative Commons License (for more information on this license, see - + Sie stimmen zu, dass alle Daten, Klänge oder andere Arbeiten, die zum Server gesendet werden, Ihnen gehören oder von Ihnen selbst oder einem Lizenzgeber erstellt wurden und dass Sie diese Daten, Klänge oder andere Arbeiten unter die folgende Creative Commons Lizenz stellen (Für weitere Informationen über die Lizenz, siehe You are free to: - + Sie dürfen: Share - + Teilen copy and redistribute the material in any medium or format - + das Material in jedwedem Format oder Medium vervielfältigen und weiterverbreiten Adapt - + Bearbeiten remix, transform, and build upon the material - + das Material remixen, verändern und darauf aufbauen The licensor cannot revoke these freedoms as long as you follow the license terms. - + Der Lizenzgeber kann diese Freiheiten nicht widerrufen solange Sie sich an die Lizenzbedingungen halten. Under the following terms: - + Unter folgenden Bedingungen: Attribution - + Namensnennung You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. - + Sie müssen angemessene Urheber- und Rechteangaben machen, einen Link zur Lizenz beifügen und angeben, ob Änderungen vorgenommen wurden. Diese Angaben dürfen in jeder angemessenen Art und Weise gemacht werden, allerdings nicht so, dass der Eindruck entsteht, der Lizenzgeber unterstütze gerade Sie oder Ihre Nutzung besonders. NonCommercial - + Nicht kommerziell You may not use the material for commercial purposes. - + Sie dürfen das Material nicht für kommerzielle Zwecke nutzen. ShareAlike - + Weitergabe unter gleichen Bedingungen If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. - + Wenn Sie das Material remixen, verändern oder anderweitig direkt darauf aufbauen, dürfen Sie Ihre Beiträge nur unter derselben Lizenz wie das Original verbreiten. No additional restrictions - + Keine weiteren Einschränkungen You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. - + Sie dürfen keine zusätzlichen Klauseln oder technische Verfahren einsetzen, die anderen rechtlich irgendetwas untersagen, was die Lizenz erlaubt. From 9c811782dc5238c56b51ac5fe84b34f5c01f9ec6 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 8 Jun 2020 22:02:16 +0200 Subject: [PATCH 4/5] direct use of Q_UNUSED on OPUS calls does not suppress the warning under Linux -> go back to previous implementation --- src/server.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index acab3b19..bc54984c 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -758,6 +758,7 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE */ // Get data from all connected clients ------------------------------------- // some inits + int iUnused; int iNumClients = 0; // init connected client counter bool bChannelIsNowDisconnected = false; bool bUpdateChannelLevels = false; @@ -911,11 +912,11 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE // OPUS decode received data stream if ( CurOpusDecoder != nullptr ) { - Q_UNUSED ( opus_custom_decode ( CurOpusDecoder, - pCurCodedData, - iCeltNumCodedBytes, - &vecvecsData[i][iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], - iClientFrameSizeSamples ) ); + iUnused = opus_custom_decode ( CurOpusDecoder, + pCurCodedData, + iCeltNumCodedBytes, + &vecvecsData[i][iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], + iClientFrameSizeSamples ); } } @@ -1044,11 +1045,11 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE opus_custom_encoder_ctl ( CurOpusEncoder, OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) ); - Q_UNUSED ( opus_custom_encode ( CurOpusEncoder, - &vecsSendData[iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], - iClientFrameSizeSamples, - &vecbyCodedData[0], - iCeltNumCodedBytes ) ); + iUnused = opus_custom_encode ( CurOpusEncoder, + &vecsSendData[iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], + iClientFrameSizeSamples, + &vecbyCodedData[0], + iCeltNumCodedBytes ); } // send separate mix to current clients @@ -1076,6 +1077,8 @@ opus_custom_encoder_ctl ( CurOpusEncoder, // does not consume any significant CPU when no client is connected. Stop(); } + + Q_UNUSED ( iUnused ) } /// @brief Mix all audio data from all clients together. From db05a4d88bce0ba8e37eb25dde995a0e27c9b00c Mon Sep 17 00:00:00 2001 From: daryl Date: Mon, 8 Jun 2020 22:15:23 +0200 Subject: [PATCH 5/5] Spanish tr update --- src/res/translation/translation_es_ES.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 198d825a..76ef2870 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -758,12 +758,12 @@ &Edit - + &Editar &Sort Channel Users by Name - + &Ordenar Canales por Nombre