Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ TODO https://github.com/corrados/jamulus/issues/341#issuecomment-647172946
- show number of connected clients in window title (and therefore in OS task
bar)

- added "Whats this" help text to the GUI controls in the general settings
- added "What's this" help text to the GUI controls in the general settings
dialog, added Tool Tips to some GUI controls

- server logging history grid lines of weekend days are now plotted with
Expand Down
2 changes: 1 addition & 1 deletion android/sound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ oboe::DataCallbackResult CSound::onAudioReady(oboe::AudioStream *oboeStream, voi
}

// We're good to start recording now
// Take the data from the recording device ouput buffer and move
// Take the data from the recording device output buffer and move
// it to the vector ready to send up to the server

float *floatData = static_cast<float *>(audioData);
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/celt/arm/armcpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ opus_uint32 opus_cpu_capabilities(void)
}
#else
/* The feature registers which can tell us what the processor supports are
* accessible in priveleged modes only, so we can't have a general user-space
* accessible in privileged modes only, so we can't have a general user-space
* detection method like on x86.*/
# error "Configured to use ARM asm but no CPU detection method available for " \
"your platform. Reconfigure with --disable-rtcd (or send patches)."
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/celt/arm/celt_pitch_xcorr_arm-gnu.S
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ xcorr_kernel_neon_process8:
@
@ Load x[0...7]
VLD1.16 {d6, d7}, [r4]!
@ Unlike VMOV, VAND is a data processsing instruction (and doesn't get
@ Unlike VMOV, VAND is a data processing instruction (and doesn't get
@ assembled to VMOV, like VORR would), so it dual-issues with the prior VLD1.
VAND d3, d5, d5
SUBS r12, r12, #8
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/celt/arm/celt_pitch_xcorr_arm.s
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ xcorr_kernel_neon_process8
;
; Load x[0...7]
VLD1.16 {d6, d7}, [r4]!
; Unlike VMOV, VAND is a data processsing instruction (and doesn't get
; Unlike VMOV, VAND is a data processing instruction (and doesn't get
; assembled to VMOV, like VORR would), so it dual-issues with the prior VLD1.
VAND d3, d5, d5
SUBS r12, r12, #8
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/celt/celt_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
unmask=0;
/* We should never see NaNs here. If we find any, then something really bad happened and we better abort
before it does any damage later on. If these asserts are disabled (no hardening), then the table
lookup a few lines below (id = ...) is likely to crash dur to an out-of-bounds read. DO NOT FIX
lookup a few lines below (id = ...) is likely to crash due to an out-of-bounds read. DO NOT FIX
that crash on NaN since it could result in a worse issue later on. */
celt_assert(!celt_isnan(tmp[0]));
celt_assert(!celt_isnan(norm));
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/celt/entcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ struct ec_ctx{
In the encoder: the low end of the current range.*/
opus_uint32 val;
/*In the decoder: the saved normalization factor from ec_decode().
In the encoder: the number of oustanding carry propagating symbols.*/
In the encoder: the number of outstanding carry propagating symbols.*/
opus_uint32 ext;
/*A buffered input/output symbol, awaiting carry propagation.*/
int rem;
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/celt/entenc.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
_size: The size of the buffer, in chars.*/
void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size);
/*Encodes a symbol given its frequency information.
The frequency information must be discernable by the decoder, assuming it
The frequency information must be discernible by the decoder, assuming it
has read only the previous symbols from the stream.
It is allowable to change the frequency information, or even the entire
source alphabet, so long as the decoder can tell from the context of the
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/celt/kiss_fft.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "stack_alloc.h"

/* The guts header contains all the multiplication and addition macros that are defined for
complex numbers. It also delares the kf_ internal functions.
complex numbers. It also declares the kf_ internal functions.
*/

static void kf_bfly2(
Expand Down
4 changes: 2 additions & 2 deletions libs/opus/include/opus.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ extern "C" {
* @endcode
*
* where opus_encoder_get_size() returns the required size for the encoder state. Note that
* future versions of this code may change the size, so no assuptions should be made about it.
* future versions of this code may change the size, so no assumptions should be made about it.
*
* The encoder state is always continuous in memory and only a shallow copy is sufficient
* to copy it (e.g. memcpy())
Expand Down Expand Up @@ -357,7 +357,7 @@ OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NON
* error = opus_decoder_init(dec, Fs, channels);
* @endcode
* where opus_decoder_get_size() returns the required size for the decoder state. Note that
* future versions of this code may change the size, so no assuptions should be made about it.
* future versions of this code may change the size, so no assumptions should be made about it.
*
* The decoder state is always continuous in memory and only a shallow copy is sufficient
* to copy it (e.g. memcpy())
Expand Down
4 changes: 2 additions & 2 deletions libs/opus/include/opus_multistream.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ extern "C" {
* <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
* channel ordering</a>. A decoder may wish to apply an additional permutation
* to the mapping the encoder used to achieve a different output channel
* order (e.g. for outputing in WAV order).
* order (e.g. for outputting in WAV order).
*
* Each multistream packet contains an Opus packet for each stream, and all of
* the Opus packets in a single multistream packet must have the same
Expand Down Expand Up @@ -510,7 +510,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_crea
int *error
) OPUS_ARG_NONNULL(5);

/** Intialize a previously allocated decoder state object.
/** Initialize a previously allocated decoder state object.
* The memory pointed to by \a st must be at least the size returned by
* opus_multistream_encoder_get_size().
* This is intended for applications which use their own allocator instead of
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/include/opus_projection.h
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decod
) OPUS_ARG_NONNULL(5);


/** Intialize a previously allocated projection decoder state object.
/** Initialize a previously allocated projection decoder state object.
* The memory pointed to by \a st must be at least the size returned by
* opus_projection_decoder_get_size().
* This is intended for applications which use their own allocator instead of
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/opus_functions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ function(get_opus_sources SOURCE_GROUP MAKE_FILE SOURCES)
if(${list_length} LESS 1)
message(
FATAL_ERROR
"No files parsed succesfully from ${SOURCE_GROUP} in ${MAKE_FILE}")
"No files parsed successfully from ${SOURCE_GROUP} in ${MAKE_FILE}")
endif()

# remove trailing whitespaces
Expand Down
4 changes: 2 additions & 2 deletions libs/opus/silk/PLC.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ static OPUS_INLINE void silk_PLC_update(
silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( opus_int16 ));
}

/* Save LPC coeficients */
/* Save LPC coefficients */
silk_memcpy( psPLC->prevLPC_Q12, psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( opus_int16 ) );
psPLC->prevLTP_scale_Q14 = psDecCtrl->LTP_scale_Q14;

Expand Down Expand Up @@ -257,7 +257,7 @@ static OPUS_INLINE void silk_PLC_conceal(
/* LPC concealment. Apply BWE to previous LPC */
silk_bwexpander( psPLC->prevLPC_Q12, psDec->LPC_order, SILK_FIX_CONST( BWE_COEF, 16 ) );

/* Preload LPC coeficients to array on stack. Gives small performance gain */
/* Preload LPC coefficients to array on stack. Gives small performance gain */
silk_memcpy( A_Q12, psPLC->prevLPC_Q12, psDec->LPC_order * sizeof( opus_int16 ) );

/* First Lost frame */
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/silk/control_SNR.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static const unsigned char silk_TargetRate_WB_21[201 - 10] = {
247,248,249,249,250,251,252,253,255
};

/* Control SNR of redidual quantizer */
/* Control SNR of residual quantizer */
opus_int silk_control_SNR(
silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
opus_int32 TargetRate_bps /* I Target max bitrate (bps) */
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/silk/decode_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void silk_decode_core(
pres_Q14 = res_Q14;
A_Q12 = psDecCtrl->PredCoef_Q12[ k >> 1 ];

/* Preload LPC coeficients to array on stack. Gives small performance gain */
/* Preload LPC coefficients to array on stack. Gives small performance gain */
silk_memcpy( A_Q12_tmp, A_Q12, psDec->LPC_order * sizeof( opus_int16 ) );
B_Q14 = &psDecCtrl->LTPCoef_Q14[ k * LTP_ORDER ];
signalType = psDec->indices.signalType;
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/silk/decode_indices.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void silk_decode_indices(
}
psDec->ec_prevLagIndex = psDec->indices.lagIndex;

/* Get countour index */
/* Get contour index */
psDec->indices.contourIndex = (opus_int8)ec_dec_icdf( psRangeDec, psDec->pitch_contour_iCDF, 8 );

/********************/
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/silk/encode_indices.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void silk_encode_indices(
}
psEncC->ec_prevLagIndex = psIndices->lagIndex;

/* Countour index */
/* Contour index */
silk_assert( psIndices->contourIndex >= 0 );
silk_assert( ( psIndices->contourIndex < 34 && psEncC->fs_kHz > 8 && psEncC->nb_subfr == 4 ) ||
( psIndices->contourIndex < 11 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 4 ) ||
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/silk/float/find_pitch_lags_FLP.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void silk_find_pitch_lags_FLP(
x_buf = x - psEnc->sCmn.ltp_mem_length;

/******************************************/
/* Estimate LPC AR coeficients */
/* Estimate LPC AR coefficients */
/******************************************/

/* Calculate windowed signal */
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/silk/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ opus_int silk_control_audio_bandwidth(
silk_EncControlStruct *encControl /* I Control structure */
);

/* Control SNR of redidual quantizer */
/* Control SNR of residual quantizer */
opus_int silk_control_SNR(
silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
opus_int32 TargetRate_bps /* I Target max bitrate (bps) */
Expand Down
4 changes: 2 additions & 2 deletions libs/opus/silk/mips/NSQ_del_dec_mipsr1.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ static inline void silk_noise_shape_quantizer_del_dec(
/*Unused.*/
(void)arch;

//Intialize b_Q14 variables
//Initialize b_Q14 variables
b_Q14_0 = b_Q14[ 0 ];
b_Q14_1 = b_Q14[ 1 ];
b_Q14_2 = b_Q14[ 2 ];
b_Q14_3 = b_Q14[ 3 ];
b_Q14_4 = b_Q14[ 4 ];

//Intialize a_Q12 variables
//Initialize a_Q12 variables
a_Q12_0 = a_Q12[0];
a_Q12_1 = a_Q12[1];
a_Q12_2 = a_Q12[2];
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/silk/structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ typedef struct {
/* Struct for Packet Loss Concealment */
typedef struct {
opus_int32 pitchL_Q8; /* Pitch lag to use for voiced concealment */
opus_int16 LTPCoef_Q14[ LTP_ORDER ]; /* LTP coeficients to use for voiced concealment */
opus_int16 LTPCoef_Q14[ LTP_ORDER ]; /* LTP coefficients to use for voiced concealment */
opus_int16 prevLPC_Q12[ MAX_LPC_ORDER ];
opus_int last_frame_lost; /* Was previous frame lost */
opus_int32 rand_seed; /* Seed for unvoiced signal generation */
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/src/analysis.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ typedef struct {
*/
void tonality_analysis_init(TonalityAnalysisState *analysis, opus_int32 Fs);

/** Reset a TonalityAnalysisState stuct.
/** Reset a TonalityAnalysisState struct.
*
* Call this when there's a discontinuity in the data.
*/
Expand Down
2 changes: 1 addition & 1 deletion libs/opus/src/opus_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
redundancy = 1;
celt_to_silk = 1;
st->silk_bw_switch = 0;
/* Do a prefill without reseting the sampling rate control. */
/* Do a prefill without resetting the sampling rate control. */
prefill=2;
}

Expand Down
2 changes: 1 addition & 1 deletion linux/sound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ int CSound::Init ( const int /* iNewPrefMonoBufferSize */ )
// try setting buffer size
// TODO seems not to work! -> no audio after this operation!
// Doesn't this give an infinite loop? The set buffer size function will call our
// registerd callback which calls "EmitReinitRequestSignal()". In that function
// registered callback which calls "EmitReinitRequestSignal()". In that function
// this CSound::Init() function is called...
//jack_set_buffer_size ( pJackClient, iNewPrefMonoBufferSize );

Expand Down
4 changes: 2 additions & 2 deletions mac/sound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ int CSound::CountChannels ( AudioDeviceID devID,

QString CSound::LoadAndInitializeDriver ( int iDriverIdx, bool )
{
// check device capabilities if it fullfills our requirements
// check device capabilities if it fulfills our requirements
const QString strStat = CheckDeviceCapabilities ( iDriverIdx );

// check if device is capable
Expand Down Expand Up @@ -561,7 +561,7 @@ QString CSound::CheckDeviceCapabilities ( const int iDriverIdx )
// add the "[n]:" at the beginning as is in the Audio-Midi-Setup
if ( !bConvOK || ( iPropertySize == 0 ) )
{
// use a defalut name in case there was an error or the name is empty
// use a default name in case there was an error or the name is empty
sChannelNamesOutput[iCurOutCH] =
QString ( "%1: Channel %1" ).arg ( iCurOutCH + 1 );
}
Expand Down
16 changes: 8 additions & 8 deletions src/audiomixerboard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
"QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" );

pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons
pLabelInstBox->setMinimumHeight ( 52 ); // maximum hight of the instrument+flag pictures
pLabelInstBox->setMinimumHeight ( 52 ); // maximum height of the instrument+flag pictures
pFader->setMinimumHeight ( 120 ); // if this value is too small, the fader might not be movable with the mouse for fancy skin (#292)
pPan->setFixedSize ( 50, 50 );
pPanLabel->setText ( tr ( "PAN" ) );
Expand All @@ -216,7 +216,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )

case GD_SLIMFADER:
pLabelPictGrid->addWidget ( plblLabel, 0, Qt::AlignHCenter ); // label below icons
pLabelInstBox->setMinimumHeight ( 84 ); // maximum hight of the instrument+flag+label
pLabelInstBox->setMinimumHeight ( 84 ); // maximum height of the instrument+flag+label
pFader->setMinimumHeight ( 85 );
pPan->setFixedSize ( 28, 28 );
pFader->setTickPosition ( QSlider::NoTicks );
Expand All @@ -229,11 +229,11 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
break;

default:
// reset style sheet and set original paramters
// reset style sheet and set original parameters
pFader->setTickPosition ( QSlider::TicksBothSides );
pFader->setStyleSheet ( "" );
pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons
pLabelInstBox->setMinimumHeight ( 52 ); // maximum hight of the instrument+flag pictures
pLabelInstBox->setMinimumHeight ( 52 ); // maximum height of the instrument+flag pictures
pFader->setMinimumHeight ( 85 );
pPan->setFixedSize ( 50, 50 );
pPanLabel->setText ( tr ( "Pan" ) );
Expand Down Expand Up @@ -691,7 +691,7 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) :
pMainLayout->addItem ( new QSpacerItem ( 0, 0, QSizePolicy::Expanding ) );

// set margins of the layout to zero to get maximum space for the controls
pGroupBoxLayout->setContentsMargins ( 0, 0, 0, 1 ); // note: to avoid problems at the botton, use a small margin for that
pGroupBoxLayout->setContentsMargins ( 0, 0, 0, 1 ); // note: to avoid problems at the bottom, use a small margin for that

// add the group box to the scroll area
pScrollArea->setMinimumWidth ( 200 ); // at least two faders shall be visible
Expand Down Expand Up @@ -816,7 +816,7 @@ void CAudioMixerBoard::HideAll()
// make all controls invisible
for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
{
// before hiding the fader, store its level (if some conditions are fullfilled)
// before hiding the fader, store its level (if some conditions are fulfilled)
StoreFaderSettings ( vecpChanFader[i] );

vecpChanFader[i]->SetChannelLevel ( 0 );
Expand Down Expand Up @@ -978,7 +978,7 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
// if current fader is not used, hide it
if ( !bFaderIsUsed )
{
// before hiding the fader, store its level (if some conditions are fullfilled)
// before hiding the fader, store its level (if some conditions are fulfilled)
StoreFaderSettings ( vecpChanFader[i] );

vecpChanFader[i]->Hide();
Expand Down Expand Up @@ -1067,7 +1067,7 @@ void CAudioMixerBoard::UpdateGainValue ( const int iChannelIdx,
if ( vecpChanFader[i]->IsVisible() && vecpChanFader[i]->IsSelect() && ( i != iChannelIdx ) )
{
// synchronize faders with moving fader level (it is important
// to set the group flag to avoid inifinite looping)
// to set the group flag to avoid infinite looping)
vecpChanFader[i]->SetFaderLevel ( vecpChanFader[i]->GetFaderLevel() + iDiffLevel, true );
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,14 @@ void CNetBufWithStats::UpdateAutoSetting()
iCurMaxUpDecision = viBufSizesForSim[NUM_STAT_SIMULATION_BUFFERS - 1];

// This is a worst case, something very bad had happened. Hopefully
// this was just temporary so that we initiate a new initialzation
// this was just temporary so that we initiate a new initialization
// phase to get quickly back to normal buffer sizes (hopefully).
ResetInitCounter();
}


// Post calculation (filtering) --------------------------------------------
// Define different weigths for up and down direction. Up direction
// Define different weights for up and down direction. Up direction
// filtering shall be slower than for down direction since we assume
// that the lower value is the actual value which can be used for
// the current network condition. If the current error rate estimation
Expand Down
4 changes: 2 additions & 2 deletions src/buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ template<class TData> class CBufferBase
eBufState = CBufferBase<TData>::BS_OK;
}

return true; // no error check in base class, alyways return ok
return true; // no error check in base class, always return ok
}

virtual bool Get ( CVector<TData>& vecData,
Expand Down Expand Up @@ -327,7 +327,7 @@ template<class TData> class CBufferBase
eBufState = CBufferBase<TData>::BS_OK;
}

return true; // no error check in base class, alyways return ok
return true; // no error check in base class, always return ok
}

virtual int GetAvailSpace() const
Expand Down
2 changes: 1 addition & 1 deletion src/channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ EPutDataStat CChannel::PutAudioData ( const CVector<uint8_t>& vecbyData,
else
{
// the protocol parsing failed and this was no audio block,
// we treat this as protocol error (unkown packet)
// we treat this as protocol error (unknown packet)
eRet = PS_PROT_ERR;
}

Expand Down
Loading