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

update

Browse source
This commit is contained in:
daryl 2020-06-04 13:33:50 +02:00
parent c68b943812
commit bd75c353cf
2 changed files with 52 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
src/clientdlg.cpp
View file

@ -48,25 +48,23 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
// Add help text to controls ----------------------------------------------- // Add help text to controls -----------------------------------------------
// input level meter // input level meter
QString strInpLevH = "<b>" + tr ( "Input Level Meter" ) + ":</b> " + tr ( "The input level " QString strInpLevH = "<b>" + tr ( "Input Level Meter" ) + ":</b> " + tr ( "This shows "
"indicators show the input level of the two stereo channels " "the level of the two stereo channels "
"of the current selected audio input." ) + "<br>" + "for your audio input." ) + "<br>" +
tr ( "Make sure not to clip the input signal to avoid distortions of the " tr ( "Make sure not to clip the input signal to avoid distortions of the "
"audio signal." ); "audio signal." );
QString strInpLevHTT = tr ( "If the " ) + APP_NAME + QString strInpLevHTT = tr ( "If the application "
tr ( " software is connected and " "is connected to a server and "
"you play your instrument/sing in the microphone, the LED level " "you play your instrument/sing into the microphone, the VU "
"meter should flicker. If this is not the case, you have " "meter should flicker. If this is not the case, you have "
"probably selected the wrong input channel (e.g. line in instead " "probably selected the wrong input channel (e.g. 'line in' instead "
"of the microphone input) or set the input gain too low in the " "of the microphone input) or set the input gain too low in the "
"(Windows) audio mixer." ) + "<br>" + tr ( "For a proper usage of the " ) + "(Windows) audio mixer." ) + "<br>" + tr ( "For proper usage of the "
APP_NAME + tr ( " software, " "application, you should not hear your singing/instrument through "
"you should not hear your singing/instrument in the loudspeaker or " "the loudspeaker or your headphone when the software is not connected."
"your headphone when the " ) + APP_NAME + "This can be achieved by muting your input audio channel in the "
tr ( " software is not connected. This can " "Playback mixer (not the Recording mixer!)." ) + TOOLTIP_COM_END_TEXT;
"be achieved by muting your input audio channel in the Playback "
"mixer (not the Recording mixer!)." ) + TOOLTIP_COM_END_TEXT;
QString strInpLevHAccText = tr ( "Input level meter" ); QString strInpLevHAccText = tr ( "Input level meter" );
QString strInpLevHAccDescr = tr ( "Simulates an analog LED level meter." ); QString strInpLevHAccDescr = tr ( "Simulates an analog LED level meter." );
@ -85,9 +83,8 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
// connect/disconnect button // connect/disconnect button
butConnect->setWhatsThis ( "<b>" + tr ( "Connect/Disconnect Button" ) + ":</b> " + butConnect->setWhatsThis ( "<b>" + tr ( "Connect/Disconnect Button" ) + ":</b> " +
tr ( "Push this button to connect to a server. A dialog where you can " tr ( "Opens a dialog where you can select a server to connect to."
"select a server will open. If you are connected, pressing this " "If you are connected, pressing this button will end the session." ) );
"button will end the session." ) );
butConnect->setAccessibleName ( butConnect->setAccessibleName (
tr ( "Connect and disconnect toggle button" ) ); tr ( "Connect and disconnect toggle button" ) );
@ -95,13 +92,13 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
butConnect->setAccessibleDescription ( tr ( "Clicking on this " butConnect->setAccessibleDescription ( tr ( "Clicking on this "
"button changes the caption of the button from Connect to " "button changes the caption of the button from Connect to "
"Disconnect, i.e., it implements a toggle functionality for connecting " "Disconnect, i.e., it implements a toggle functionality for connecting "
"and disconnecting the " ) + APP_NAME + tr ( " software." ) ); "and disconnecting the application." ) );
// local audio input fader // local audio input fader
QString strAudFader = "<b>" + tr ( "Local Audio Input Fader" ) + ":</b> " + QString strAudFader = "<b>" + tr ( "Local Audio Input Fader" ) + ":</b> " +
tr ( "With the audio fader, the relative levels of the left and right local audio " tr ( "Controls the relative levels of the left and right local audio "
"channels can be changed. For a mono signal it acts like a panning " "channels. For a mono signal it acts as a pan between the two channels."
"between the two channels. If, e.g., a microphone is connected to " "For example, if a microphone is connected to "
"the right input channel and an instrument is connected to the left " "the right input channel and an instrument is connected to the left "
"input channel which is much louder than the microphone, move the " "input channel which is much louder than the microphone, move the "
"audio fader in a direction where the label above the fader shows " ) + "audio fader in a direction where the label above the fader shows " ) +
@ -115,64 +112,68 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
sldAudioPan->setAccessibleName ( tr ( "Local audio input fader (left/right)" ) ); sldAudioPan->setAccessibleName ( tr ( "Local audio input fader (left/right)" ) );
// reverberation level // reverberation level
QString strAudReverb = "<b>" + tr ( "Reverberation Level" ) + ":</b> " + QString strAudReverb = "<b>" + tr ( "Reverb effect" ) + ":</b> " +
tr ( "A reverberation effect can be applied to one local mono audio channel or to both " tr ( "Reverb can be applied to one local mono audio channel or to both "
"channels in stereo mode. The mono channel selection and the " "channels in stereo mode. The mono channel selection and the "
"reverberation level can be modified. If, e.g., " "reverb level can be modified. For example, if "
"the microphone signal is fed into the right audio channel of the " "a microphone signal is fed in to the right audio channel of the "
"sound card and a reverberation effect shall be applied, set the " "sound card and a reverb effect needs to be applied, set the "
"channel selector to right and move the fader upwards until the " "channel selector to right and move the fader upwards until the "
"desired reverberation level is reached." ) + "<br>" + tr ( "desired reverb level is reached." ) + "<br>" + tr (
"The reverberation effect requires significant CPU so it should " "Reverb requires significant CPU so it should "
"only be used on fast PCs. If the reverberation level fader is set to " "only be used on fast PCs. If the reverb level fader is set to "
"minimum (which is the default setting), the reverberation effect is " "minimum (the default setting), the effect is "
"switched off and does not cause any additional CPU usage." ); "switched off and does not cause any additional CPU usage." );
lblAudioReverb->setWhatsThis ( strAudReverb ); lblAudioReverb->setWhatsThis ( strAudReverb );
sldAudioReverb->setWhatsThis ( strAudReverb ); sldAudioReverb->setWhatsThis ( strAudReverb );
sldAudioReverb->setAccessibleName ( tr ( "Reverberation effect level setting" ) ); sldAudioReverb->setAccessibleName ( tr ( "Reverb effect level setting" ) );
// reverberation channel selection // reverberation channel selection
QString strRevChanSel = "<b>" + tr ( "Reverberation Channel Selection" ) + ":</b> " + QString strRevChanSel = "<b>" + tr ( "Reverb Channel Selection" ) + ":</b> " +
tr ( "With these radio buttons the audio input channel on which the " tr ( "With these radio buttons the audio input channel on which the "
"reverberation effect is applied can be chosen. Either the left " "reverb effect is applied can be chosen. Either the left "
"or right input channel can be selected." ); "or right input channel can be selected." );
rbtReverbSelL->setWhatsThis ( strRevChanSel ); rbtReverbSelL->setWhatsThis ( strRevChanSel );
rbtReverbSelL->setAccessibleName ( tr ( "Left channel selection for reverberation" ) ); rbtReverbSelL->setAccessibleName ( tr ( "Left channel selection for reverb" ) );
rbtReverbSelR->setWhatsThis ( strRevChanSel ); rbtReverbSelR->setWhatsThis ( strRevChanSel );
rbtReverbSelR->setAccessibleName ( tr ( "Right channel selection for reverberation" ) ); rbtReverbSelR->setAccessibleName ( tr ( "Right channel selection for reverb" ) );
// delay LED // delay LED
QString strLEDDelay = "<b>" + tr ( "Delay Status LED" ) + ":</b> " + QString strLEDDelay = "<b>" + tr ( "Delay Status LED" ) + ":</b> " +
tr ( "The delay status LED indicator shows the current audio delay " tr ( "The " ) + "<b>" + tr ( "Delay Status" ) + ":</b> " + tr ( "LED shows the "
"status. If the light is green, the delay is perfect for a jam " "current audio delay status:" ) +
"session. If the light is yellow, a session is still possible but " "<ul>"
"it may be harder to play. If the light is red, the delay is too " "<li>" "<b>" + tr ( "Green" ) + ":</b> " + tr ( "- The delay is perfect for a jam "
"large for jamming." ); "session " ) + "</li>"
"<li>" "<b>" + tr ( "Yellow" ) + ":</b> " + tr ( "- A session is still possible "
"but it may be harder to play." ) + "</li>"
"<li>" "<b>" + tr ( "Red" ) + ":</b> " + tr ( "- The delay is too large for "
"jamming." ) + "</li>"
"</ul>";
lblDelay->setWhatsThis ( strLEDDelay ); lblDelay->setWhatsThis ( strLEDDelay );
ledDelay->setWhatsThis ( strLEDDelay ); ledDelay->setWhatsThis ( strLEDDelay );
ledDelay->setToolTip ( tr ( "If this LED indicator turns red, " ledDelay->setToolTip ( tr ( "If this LED indicator turns red, "
"you will not have much fun using the " ) + APP_NAME + "you will not have much fun using the application" ) +
tr ( " software." ) + TOOLTIP_COM_END_TEXT ); TOOLTIP_COM_END_TEXT );
ledDelay->setAccessibleName ( tr ( "Delay status LED indicator" ) ); ledDelay->setAccessibleName ( tr ( "Delay status LED indicator" ) );
// buffers LED // buffers LED
QString strLEDBuffers = "<b>" + tr ( "Buffers Status LED" ) + ":</b> " + QString strLEDBuffers = "<b>" + tr ( "Buffers Status LED" ) + ":</b> " +
tr ( "The buffers status LED indicator shows the current audio/streaming " tr ( "The buffers status LED shows the current audio/streaming "
"status. If the light is green, there are no buffer overruns/underruns " "status. If the light is red, the audio stream is interrupted."
"and the audio stream is not interrupted. If the light is red, the " "This is caused by one of the following problems:" ) +
"audio stream is interrupted caused by one of the following problems:" ) +
"<ul>" "<ul>"
"<li>" + tr ( "The network jitter buffer is not large enough for the current " "<li>" + tr ( "The network jitter buffer is not large enough for the current "
"network/audio interface jitter." ) + "</li>" "network/audio interface jitter." ) + "</li>"
"<li>" + tr ( "The sound card buffer delay (buffer size) is set to too small a " "<li>" + tr ( "The sound card's buffer delay (buffer size) is too small "
"value." ) + "</li>" "(see Settings window)." ) + "</li>"
"<li>" + tr ( "The upload or download stream rate is too high for the current " "<li>" + tr ( "The upload or download stream rate is too high for your "
"available internet bandwidth." ) + "</li>" "internet bandwidth." ) + "</li>"
"<li>" + tr ( "The CPU of the client or server is at 100%." ) + "</li>" "<li>" + tr ( "The CPU of the client or server is at 100%." ) + "</li>"
"</ul>"; "</ul>";

2
src/res/homepage/manual.md
View file

@ -10,7 +10,7 @@ Main Window
![LEDs](led.png) ![LEDs](led.png)
The **Status** LED shows the current audio delay status. The **Delay Status** LED shows the current audio delay status:
* **Green** - The delay is perfect for a jam session * **Green** - The delay is perfect for a jam session