eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Volker Fischer 2020-06-08 22:45:48 +02:00 committed by GitHub
commit 5c18abd4c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 94 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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

2
src/clientdlg.cpp
View file

@ -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 ) );

BIN
src/res/translation/translation_de_DE.qm
View file

Binary file not shown.

38
src/res/translation/translation_de_DE.ts
View file

@ -200,7 +200,7 @@
<translation>V E R B I N D U N G S A U F B A U</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="832"/>
<location filename="../../audiomixerboard.cpp" line="802"/>
<source>Personal Mix at the Server: </source>
<translation>Eigener Mix am Server: </translation>
</message>
@ -750,8 +750,8 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channels by Name...</source>
<translation>&amp;Sortiere Kanäle nach Namen...</translation>
<source>&amp;Sort Channel Users by Name</source>
<translation>&amp;Sortiere Kanäle nach Namen</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="334"/>
@ -1930,82 +1930,82 @@
<message>
<location filename="../../util.cpp" line="503"/>
<source>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 </source>
<translation type="unfinished"></translation>
<translation>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 </translation>
</message>
<message>
<location filename="../../util.cpp" line="511"/>
<source>You are free to:</source>
<translation type="unfinished"></translation>
<translation>Sie dürfen:</translation>
</message>
<message>
<location filename="../../util.cpp" line="513"/>
<source>Share</source>
<translation type="unfinished"></translation>
<translation>Teilen</translation>
</message>
<message>
<location filename="../../util.cpp" line="514"/>
<source>copy and redistribute the material in any medium or format</source>
<translation type="unfinished"></translation>
<translation>das Material in jedwedem Format oder Medium vervielfältigen und weiterverbreiten</translation>
</message>
<message>
<location filename="../../util.cpp" line="515"/>
<source>Adapt</source>
<translation type="unfinished"></translation>
<translation>Bearbeiten</translation>
</message>
<message>
<location filename="../../util.cpp" line="516"/>
<source>remix, transform, and build upon the material</source>
<translation type="unfinished"></translation>
<translation>das Material remixen, verändern und darauf aufbauen</translation>
</message>
<message>
<location filename="../../util.cpp" line="517"/>
<source>The licensor cannot revoke these freedoms as long as you follow the license terms.</source>
<translation type="unfinished"></translation>
<translation>Der Lizenzgeber kann diese Freiheiten nicht widerrufen solange Sie sich an die Lizenzbedingungen halten.</translation>
</message>
<message>
<location filename="../../util.cpp" line="519"/>
<source>Under the following terms:</source>
<translation type="unfinished"></translation>
<translation>Unter folgenden Bedingungen:</translation>
</message>
<message>
<location filename="../../util.cpp" line="521"/>
<source>Attribution</source>
<translation type="unfinished"></translation>
<translation>Namensnennung</translation>
</message>
<message>
<location filename="../../util.cpp" line="522"/>
<source>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.</source>
<translation type="unfinished"></translation>
<translation>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.</translation>
</message>
<message>
<location filename="../../util.cpp" line="525"/>
<source>NonCommercial</source>
<translation type="unfinished"></translation>
<translation>Nicht kommerziell</translation>
</message>
<message>
<location filename="../../util.cpp" line="526"/>
<source>You may not use the material for commercial purposes.</source>
<translation type="unfinished"></translation>
<translation>Sie dürfen das Material nicht für kommerzielle Zwecke nutzen.</translation>
</message>
<message>
<location filename="../../util.cpp" line="527"/>
<source>ShareAlike</source>
<translation type="unfinished"></translation>
<translation>Weitergabe unter gleichen Bedingungen</translation>
</message>
<message>
<location filename="../../util.cpp" line="528"/>
<source>If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.</source>
<translation type="unfinished"></translation>
<translation>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.</translation>
</message>
<message>
<location filename="../../util.cpp" line="530"/>
<source>No additional restrictions</source>
<translation type="unfinished"></translation>
<translation>Keine weiteren Einschränkungen</translation>
</message>
<message>
<location filename="../../util.cpp" line="531"/>
<source>You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.</source>
<translation type="unfinished"></translation>
<translation>Sie dürfen keine zusätzlichen Klauseln oder technische Verfahren einsetzen, die anderen rechtlich irgendetwas untersagen, was die Lizenz erlaubt.</translation>
</message>
</context>
<context>

8
src/res/translation/translation_es_ES.ts
View file

@ -204,7 +204,7 @@
<translation>I N T E N T A N D O C O N E C T A R</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="832"/>
<location filename="../../audiomixerboard.cpp" line="802"/>
<source>Personal Mix at the Server: </source>
<translation>Mezcla Personal en el Servidor: </translation>
</message>
@ -758,12 +758,12 @@
<message>
<location filename="../../clientdlg.cpp" line="283"/>
<source>&amp;Edit</source>
<translation type="unfinished"></translation>
<translation>&amp;Editar</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channels by Name...</source>
<translation type="unfinished"></translation>
<source>&amp;Sort Channel Users by Name</source>
<translation>&amp;Ordenar Canales por Nombre</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="334"/>

4
src/res/translation/translation_fr_FR.ts
View file

@ -212,7 +212,7 @@
<translation>T E N T A T I V E D E C O N N E X I O N</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="832"/>
<location filename="../../audiomixerboard.cpp" line="802"/>
<source>Personal Mix at the Server: </source>
<translation>Mixage personnel du serveur : </translation>
</message>
@ -758,7 +758,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channels by Name...</source>
<source>&amp;Sort Channel Users by Name</source>
<translation type="unfinished"></translation>
</message>
<message>

4
src/res/translation/translation_it_IT.ts
View file

@ -200,7 +200,7 @@
<translation>I N A T T E S A D I C O N N E S S I O N E</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="832"/>
<location filename="../../audiomixerboard.cpp" line="802"/>
<source>Personal Mix at the Server: </source>
<translation>Mixer personale sul Server: </translation>
</message>
@ -818,7 +818,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channels by Name...</source>
<source>&amp;Sort Channel Users by Name</source>
<translation type="unfinished"></translation>
</message>
<message>

4
src/res/translation/translation_nl_NL.ts
View file

@ -200,7 +200,7 @@
<translation>A A N H E T V E R B I N D E N</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="832"/>
<location filename="../../audiomixerboard.cpp" line="802"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
@ -810,7 +810,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channels by Name...</source>
<source>&amp;Sort Channel Users by Name</source>
<translation type="unfinished"></translation>
</message>
<message>

4
src/res/translation/translation_pl_PL.ts
View file

@ -168,7 +168,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="832"/>
<location filename="../../audiomixerboard.cpp" line="802"/>
<source>Personal Mix at the Server: </source>
<translation type="unfinished"></translation>
</message>
@ -670,7 +670,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channels by Name...</source>
<source>&amp;Sort Channel Users by Name</source>
<translation type="unfinished"></translation>
</message>
<message>

4
src/res/translation/translation_pt_PT.ts
View file

@ -212,7 +212,7 @@
<translation>T E N T A N D O L I G A R</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="832"/>
<location filename="../../audiomixerboard.cpp" line="802"/>
<source>Personal Mix at the Server: </source>
<translation>Mistura Pessoal no Servidor: </translation>
</message>
@ -754,7 +754,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channels by Name...</source>
<source>&amp;Sort Channel Users by Name</source>
<translation>Ordenar os Canais por &amp;Nome...</translation>
</message>
<message>

23
src/server.cpp
View file

@ -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.

59
windows/installer.nsi
View file

@ -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