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/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 c659532e..119a3e2a 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 01b8e73a..b15fa174 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 @@ -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. 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 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. diff --git a/windows/FindProcDLL.dll b/windows/FindProcDLL.dll deleted file mode 100644 index 790c2279..00000000 Binary files a/windows/FindProcDLL.dll and /dev/null differ diff --git a/windows/installer.nsi b/windows/installer.nsi index 8f04714e..326f5bba 100755 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -31,11 +31,12 @@ Section ; check if software is currently running !addplugindir ..\windows - FindProcDLL::FindProc "${APP_EXE}" - IntCmp $R0 1 0 notRunning - MessageBox MB_OK|MB_ICONEXCLAMATION "${APP_NAME} is running. Please close it and run the setup again." /SD IDOK - Abort - notRunning: + nsProcess::_FindProcess "${APP_EXE}" + Pop $R0 + ${If} $R0 = 0 + MessageBox MB_OK|MB_ICONEXCLAMATION "${APP_NAME} is running. Please close it and run the setup again." /sd IDOK + Quit + ${EndIf} ; add reg keys so that software appears in Windows "Add/Remove Software" WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "${APP_NAME} (remove only)" @@ -56,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 @@ -105,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 @@ -133,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 diff --git a/windows/nsProcess.dll b/windows/nsProcess.dll new file mode 100644 index 00000000..4ce01210 Binary files /dev/null and b/windows/nsProcess.dll differ