Merge pull request #411 from stweil/master
Fix some typos (found by codespell)
This commit is contained in:
commit
51e8399ece
45 changed files with 89 additions and 89 deletions
|
@ -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
|
- show number of connected clients in window title (and therefore in OS task
|
||||||
bar)
|
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
|
dialog, added Tool Tips to some GUI controls
|
||||||
|
|
||||||
- server logging history grid lines of weekend days are now plotted with
|
- server logging history grid lines of weekend days are now plotted with
|
||||||
|
|
|
@ -262,7 +262,7 @@ oboe::DataCallbackResult CSound::onAudioReady(oboe::AudioStream *oboeStream, voi
|
||||||
}
|
}
|
||||||
|
|
||||||
// We're good to start recording now
|
// 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
|
// it to the vector ready to send up to the server
|
||||||
|
|
||||||
float *floatData = static_cast<float *>(audioData);
|
float *floatData = static_cast<float *>(audioData);
|
||||||
|
|
|
@ -148,7 +148,7 @@ opus_uint32 opus_cpu_capabilities(void)
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
/* The feature registers which can tell us what the processor supports are
|
/* 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.*/
|
* detection method like on x86.*/
|
||||||
# error "Configured to use ARM asm but no CPU detection method available for " \
|
# error "Configured to use ARM asm but no CPU detection method available for " \
|
||||||
"your platform. Reconfigure with --disable-rtcd (or send patches)."
|
"your platform. Reconfigure with --disable-rtcd (or send patches)."
|
||||||
|
|
|
@ -81,7 +81,7 @@ xcorr_kernel_neon_process8:
|
||||||
@
|
@
|
||||||
@ Load x[0...7]
|
@ Load x[0...7]
|
||||||
VLD1.16 {d6, d7}, [r4]!
|
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.
|
@ assembled to VMOV, like VORR would), so it dual-issues with the prior VLD1.
|
||||||
VAND d3, d5, d5
|
VAND d3, d5, d5
|
||||||
SUBS r12, r12, #8
|
SUBS r12, r12, #8
|
||||||
|
|
|
@ -78,7 +78,7 @@ xcorr_kernel_neon_process8
|
||||||
;
|
;
|
||||||
; Load x[0...7]
|
; Load x[0...7]
|
||||||
VLD1.16 {d6, d7}, [r4]!
|
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.
|
; assembled to VMOV, like VORR would), so it dual-issues with the prior VLD1.
|
||||||
VAND d3, d5, d5
|
VAND d3, d5, d5
|
||||||
SUBS r12, r12, #8
|
SUBS r12, r12, #8
|
||||||
|
|
|
@ -364,7 +364,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
|
||||||
unmask=0;
|
unmask=0;
|
||||||
/* We should never see NaNs here. If we find any, then something really bad happened and we better abort
|
/* 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
|
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. */
|
that crash on NaN since it could result in a worse issue later on. */
|
||||||
celt_assert(!celt_isnan(tmp[0]));
|
celt_assert(!celt_isnan(tmp[0]));
|
||||||
celt_assert(!celt_isnan(norm));
|
celt_assert(!celt_isnan(norm));
|
||||||
|
|
|
@ -82,7 +82,7 @@ struct ec_ctx{
|
||||||
In the encoder: the low end of the current range.*/
|
In the encoder: the low end of the current range.*/
|
||||||
opus_uint32 val;
|
opus_uint32 val;
|
||||||
/*In the decoder: the saved normalization factor from ec_decode().
|
/*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;
|
opus_uint32 ext;
|
||||||
/*A buffered input/output symbol, awaiting carry propagation.*/
|
/*A buffered input/output symbol, awaiting carry propagation.*/
|
||||||
int rem;
|
int rem;
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
_size: The size of the buffer, in chars.*/
|
_size: The size of the buffer, in chars.*/
|
||||||
void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size);
|
void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size);
|
||||||
/*Encodes a symbol given its frequency information.
|
/*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.
|
has read only the previous symbols from the stream.
|
||||||
It is allowable to change the frequency information, or even the entire
|
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
|
source alphabet, so long as the decoder can tell from the context of the
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#include "stack_alloc.h"
|
#include "stack_alloc.h"
|
||||||
|
|
||||||
/* The guts header contains all the multiplication and addition macros that are defined for
|
/* 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(
|
static void kf_bfly2(
|
||||||
|
|
|
@ -103,7 +103,7 @@ extern "C" {
|
||||||
* @endcode
|
* @endcode
|
||||||
*
|
*
|
||||||
* where opus_encoder_get_size() returns the required size for the encoder state. Note that
|
* 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
|
* The encoder state is always continuous in memory and only a shallow copy is sufficient
|
||||||
* to copy it (e.g. memcpy())
|
* to copy it (e.g. memcpy())
|
||||||
|
@ -357,7 +357,7 @@ OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NON
|
||||||
* error = opus_decoder_init(dec, Fs, channels);
|
* error = opus_decoder_init(dec, Fs, channels);
|
||||||
* @endcode
|
* @endcode
|
||||||
* where opus_decoder_get_size() returns the required size for the decoder state. Note that
|
* 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
|
* The decoder state is always continuous in memory and only a shallow copy is sufficient
|
||||||
* to copy it (e.g. memcpy())
|
* to copy it (e.g. memcpy())
|
||||||
|
|
|
@ -143,7 +143,7 @@ extern "C" {
|
||||||
* <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
* <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
|
* channel ordering</a>. A decoder may wish to apply an additional permutation
|
||||||
* to the mapping the encoder used to achieve a different output channel
|
* 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
|
* 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
|
* the Opus packets in a single multistream packet must have the same
|
||||||
|
@ -510,7 +510,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_crea
|
||||||
int *error
|
int *error
|
||||||
) OPUS_ARG_NONNULL(5);
|
) 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
|
* The memory pointed to by \a st must be at least the size returned by
|
||||||
* opus_multistream_encoder_get_size().
|
* opus_multistream_encoder_get_size().
|
||||||
* This is intended for applications which use their own allocator instead of
|
* This is intended for applications which use their own allocator instead of
|
||||||
|
|
|
@ -405,7 +405,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decod
|
||||||
) OPUS_ARG_NONNULL(5);
|
) 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
|
* The memory pointed to by \a st must be at least the size returned by
|
||||||
* opus_projection_decoder_get_size().
|
* opus_projection_decoder_get_size().
|
||||||
* This is intended for applications which use their own allocator instead of
|
* This is intended for applications which use their own allocator instead of
|
||||||
|
|
|
@ -248,7 +248,7 @@ function(get_opus_sources SOURCE_GROUP MAKE_FILE SOURCES)
|
||||||
if(${list_length} LESS 1)
|
if(${list_length} LESS 1)
|
||||||
message(
|
message(
|
||||||
FATAL_ERROR
|
FATAL_ERROR
|
||||||
"No files parsed succesfully from ${SOURCE_GROUP} in ${MAKE_FILE}")
|
"No files parsed successfully from ${SOURCE_GROUP} in ${MAKE_FILE}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# remove trailing whitespaces
|
# remove trailing whitespaces
|
||||||
|
|
|
@ -156,7 +156,7 @@ static OPUS_INLINE void silk_PLC_update(
|
||||||
silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( opus_int16 ));
|
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 ) );
|
silk_memcpy( psPLC->prevLPC_Q12, psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( opus_int16 ) );
|
||||||
psPLC->prevLTP_scale_Q14 = psDecCtrl->LTP_scale_Q14;
|
psPLC->prevLTP_scale_Q14 = psDecCtrl->LTP_scale_Q14;
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@ static OPUS_INLINE void silk_PLC_conceal(
|
||||||
/* LPC concealment. Apply BWE to previous LPC */
|
/* LPC concealment. Apply BWE to previous LPC */
|
||||||
silk_bwexpander( psPLC->prevLPC_Q12, psDec->LPC_order, SILK_FIX_CONST( BWE_COEF, 16 ) );
|
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 ) );
|
silk_memcpy( A_Q12, psPLC->prevLPC_Q12, psDec->LPC_order * sizeof( opus_int16 ) );
|
||||||
|
|
||||||
/* First Lost frame */
|
/* First Lost frame */
|
||||||
|
|
|
@ -78,7 +78,7 @@ static const unsigned char silk_TargetRate_WB_21[201 - 10] = {
|
||||||
247,248,249,249,250,251,252,253,255
|
247,248,249,249,250,251,252,253,255
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Control SNR of redidual quantizer */
|
/* Control SNR of residual quantizer */
|
||||||
opus_int silk_control_SNR(
|
opus_int silk_control_SNR(
|
||||||
silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
|
silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
|
||||||
opus_int32 TargetRate_bps /* I Target max bitrate (bps) */
|
opus_int32 TargetRate_bps /* I Target max bitrate (bps) */
|
||||||
|
|
|
@ -98,7 +98,7 @@ void silk_decode_core(
|
||||||
pres_Q14 = res_Q14;
|
pres_Q14 = res_Q14;
|
||||||
A_Q12 = psDecCtrl->PredCoef_Q12[ k >> 1 ];
|
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 ) );
|
silk_memcpy( A_Q12_tmp, A_Q12, psDec->LPC_order * sizeof( opus_int16 ) );
|
||||||
B_Q14 = &psDecCtrl->LTPCoef_Q14[ k * LTP_ORDER ];
|
B_Q14 = &psDecCtrl->LTPCoef_Q14[ k * LTP_ORDER ];
|
||||||
signalType = psDec->indices.signalType;
|
signalType = psDec->indices.signalType;
|
||||||
|
|
|
@ -120,7 +120,7 @@ void silk_decode_indices(
|
||||||
}
|
}
|
||||||
psDec->ec_prevLagIndex = psDec->indices.lagIndex;
|
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 );
|
psDec->indices.contourIndex = (opus_int8)ec_dec_icdf( psRangeDec, psDec->pitch_contour_iCDF, 8 );
|
||||||
|
|
||||||
/********************/
|
/********************/
|
||||||
|
|
|
@ -140,7 +140,7 @@ void silk_encode_indices(
|
||||||
}
|
}
|
||||||
psEncC->ec_prevLagIndex = psIndices->lagIndex;
|
psEncC->ec_prevLagIndex = psIndices->lagIndex;
|
||||||
|
|
||||||
/* Countour index */
|
/* Contour index */
|
||||||
silk_assert( psIndices->contourIndex >= 0 );
|
silk_assert( psIndices->contourIndex >= 0 );
|
||||||
silk_assert( ( psIndices->contourIndex < 34 && psEncC->fs_kHz > 8 && psEncC->nb_subfr == 4 ) ||
|
silk_assert( ( psIndices->contourIndex < 34 && psEncC->fs_kHz > 8 && psEncC->nb_subfr == 4 ) ||
|
||||||
( psIndices->contourIndex < 11 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 4 ) ||
|
( psIndices->contourIndex < 11 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 4 ) ||
|
||||||
|
|
|
@ -61,7 +61,7 @@ void silk_find_pitch_lags_FLP(
|
||||||
x_buf = x - psEnc->sCmn.ltp_mem_length;
|
x_buf = x - psEnc->sCmn.ltp_mem_length;
|
||||||
|
|
||||||
/******************************************/
|
/******************************************/
|
||||||
/* Estimate LPC AR coeficients */
|
/* Estimate LPC AR coefficients */
|
||||||
/******************************************/
|
/******************************************/
|
||||||
|
|
||||||
/* Calculate windowed signal */
|
/* Calculate windowed signal */
|
||||||
|
|
|
@ -142,7 +142,7 @@ opus_int silk_control_audio_bandwidth(
|
||||||
silk_EncControlStruct *encControl /* I Control structure */
|
silk_EncControlStruct *encControl /* I Control structure */
|
||||||
);
|
);
|
||||||
|
|
||||||
/* Control SNR of redidual quantizer */
|
/* Control SNR of residual quantizer */
|
||||||
opus_int silk_control_SNR(
|
opus_int silk_control_SNR(
|
||||||
silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
|
silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
|
||||||
opus_int32 TargetRate_bps /* I Target max bitrate (bps) */
|
opus_int32 TargetRate_bps /* I Target max bitrate (bps) */
|
||||||
|
|
|
@ -86,14 +86,14 @@ static inline void silk_noise_shape_quantizer_del_dec(
|
||||||
/*Unused.*/
|
/*Unused.*/
|
||||||
(void)arch;
|
(void)arch;
|
||||||
|
|
||||||
//Intialize b_Q14 variables
|
//Initialize b_Q14 variables
|
||||||
b_Q14_0 = b_Q14[ 0 ];
|
b_Q14_0 = b_Q14[ 0 ];
|
||||||
b_Q14_1 = b_Q14[ 1 ];
|
b_Q14_1 = b_Q14[ 1 ];
|
||||||
b_Q14_2 = b_Q14[ 2 ];
|
b_Q14_2 = b_Q14[ 2 ];
|
||||||
b_Q14_3 = b_Q14[ 3 ];
|
b_Q14_3 = b_Q14[ 3 ];
|
||||||
b_Q14_4 = b_Q14[ 4 ];
|
b_Q14_4 = b_Q14[ 4 ];
|
||||||
|
|
||||||
//Intialize a_Q12 variables
|
//Initialize a_Q12 variables
|
||||||
a_Q12_0 = a_Q12[0];
|
a_Q12_0 = a_Q12[0];
|
||||||
a_Q12_1 = a_Q12[1];
|
a_Q12_1 = a_Q12[1];
|
||||||
a_Q12_2 = a_Q12[2];
|
a_Q12_2 = a_Q12[2];
|
||||||
|
|
|
@ -231,7 +231,7 @@ typedef struct {
|
||||||
/* Struct for Packet Loss Concealment */
|
/* Struct for Packet Loss Concealment */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
opus_int32 pitchL_Q8; /* Pitch lag to use for voiced concealment */
|
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_int16 prevLPC_Q12[ MAX_LPC_ORDER ];
|
||||||
opus_int last_frame_lost; /* Was previous frame lost */
|
opus_int last_frame_lost; /* Was previous frame lost */
|
||||||
opus_int32 rand_seed; /* Seed for unvoiced signal generation */
|
opus_int32 rand_seed; /* Seed for unvoiced signal generation */
|
||||||
|
|
|
@ -88,7 +88,7 @@ typedef struct {
|
||||||
*/
|
*/
|
||||||
void tonality_analysis_init(TonalityAnalysisState *analysis, opus_int32 Fs);
|
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.
|
* Call this when there's a discontinuity in the data.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1604,7 +1604,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
|
||||||
redundancy = 1;
|
redundancy = 1;
|
||||||
celt_to_silk = 1;
|
celt_to_silk = 1;
|
||||||
st->silk_bw_switch = 0;
|
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;
|
prefill=2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -187,7 +187,7 @@ int CSound::Init ( const int /* iNewPrefMonoBufferSize */ )
|
||||||
// try setting buffer size
|
// try setting buffer size
|
||||||
// TODO seems not to work! -> no audio after this operation!
|
// 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
|
// 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...
|
// this CSound::Init() function is called...
|
||||||
//jack_set_buffer_size ( pJackClient, iNewPrefMonoBufferSize );
|
//jack_set_buffer_size ( pJackClient, iNewPrefMonoBufferSize );
|
||||||
|
|
||||||
|
|
|
@ -312,7 +312,7 @@ int CSound::CountChannels ( AudioDeviceID devID,
|
||||||
|
|
||||||
QString CSound::LoadAndInitializeDriver ( int iDriverIdx, bool )
|
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 );
|
const QString strStat = CheckDeviceCapabilities ( iDriverIdx );
|
||||||
|
|
||||||
// check if device is capable
|
// check if device is capable
|
||||||
|
@ -561,7 +561,7 @@ QString CSound::CheckDeviceCapabilities ( const int iDriverIdx )
|
||||||
// add the "[n]:" at the beginning as is in the Audio-Midi-Setup
|
// add the "[n]:" at the beginning as is in the Audio-Midi-Setup
|
||||||
if ( !bConvOK || ( iPropertySize == 0 ) )
|
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] =
|
sChannelNamesOutput[iCurOutCH] =
|
||||||
QString ( "%1: Channel %1" ).arg ( iCurOutCH + 1 );
|
QString ( "%1: Channel %1" ).arg ( iCurOutCH + 1 );
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,7 +204,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
|
||||||
"QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" );
|
"QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" );
|
||||||
|
|
||||||
pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons
|
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)
|
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 );
|
pPan->setFixedSize ( 50, 50 );
|
||||||
pPanLabel->setText ( tr ( "PAN" ) );
|
pPanLabel->setText ( tr ( "PAN" ) );
|
||||||
|
@ -216,7 +216,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
|
||||||
|
|
||||||
case GD_SLIMFADER:
|
case GD_SLIMFADER:
|
||||||
pLabelPictGrid->addWidget ( plblLabel, 0, Qt::AlignHCenter ); // label below icons
|
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 );
|
pFader->setMinimumHeight ( 85 );
|
||||||
pPan->setFixedSize ( 28, 28 );
|
pPan->setFixedSize ( 28, 28 );
|
||||||
pFader->setTickPosition ( QSlider::NoTicks );
|
pFader->setTickPosition ( QSlider::NoTicks );
|
||||||
|
@ -229,11 +229,11 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// reset style sheet and set original paramters
|
// reset style sheet and set original parameters
|
||||||
pFader->setTickPosition ( QSlider::TicksBothSides );
|
pFader->setTickPosition ( QSlider::TicksBothSides );
|
||||||
pFader->setStyleSheet ( "" );
|
pFader->setStyleSheet ( "" );
|
||||||
pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons
|
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 );
|
pFader->setMinimumHeight ( 85 );
|
||||||
pPan->setFixedSize ( 50, 50 );
|
pPan->setFixedSize ( 50, 50 );
|
||||||
pPanLabel->setText ( tr ( "Pan" ) );
|
pPanLabel->setText ( tr ( "Pan" ) );
|
||||||
|
@ -691,7 +691,7 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) :
|
||||||
pMainLayout->addItem ( new QSpacerItem ( 0, 0, QSizePolicy::Expanding ) );
|
pMainLayout->addItem ( new QSpacerItem ( 0, 0, QSizePolicy::Expanding ) );
|
||||||
|
|
||||||
// set margins of the layout to zero to get maximum space for the controls
|
// 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
|
// add the group box to the scroll area
|
||||||
pScrollArea->setMinimumWidth ( 200 ); // at least two faders shall be visible
|
pScrollArea->setMinimumWidth ( 200 ); // at least two faders shall be visible
|
||||||
|
@ -816,7 +816,7 @@ void CAudioMixerBoard::HideAll()
|
||||||
// make all controls invisible
|
// make all controls invisible
|
||||||
for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
|
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] );
|
StoreFaderSettings ( vecpChanFader[i] );
|
||||||
|
|
||||||
vecpChanFader[i]->SetChannelLevel ( 0 );
|
vecpChanFader[i]->SetChannelLevel ( 0 );
|
||||||
|
@ -978,7 +978,7 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
|
||||||
// if current fader is not used, hide it
|
// if current fader is not used, hide it
|
||||||
if ( !bFaderIsUsed )
|
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] );
|
StoreFaderSettings ( vecpChanFader[i] );
|
||||||
|
|
||||||
vecpChanFader[i]->Hide();
|
vecpChanFader[i]->Hide();
|
||||||
|
@ -1067,7 +1067,7 @@ void CAudioMixerBoard::UpdateGainValue ( const int iChannelIdx,
|
||||||
if ( vecpChanFader[i]->IsVisible() && vecpChanFader[i]->IsSelect() && ( i != iChannelIdx ) )
|
if ( vecpChanFader[i]->IsVisible() && vecpChanFader[i]->IsSelect() && ( i != iChannelIdx ) )
|
||||||
{
|
{
|
||||||
// synchronize faders with moving fader level (it is important
|
// 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 );
|
vecpChanFader[i]->SetFaderLevel ( vecpChanFader[i]->GetFaderLevel() + iDiffLevel, true );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -291,14 +291,14 @@ void CNetBufWithStats::UpdateAutoSetting()
|
||||||
iCurMaxUpDecision = viBufSizesForSim[NUM_STAT_SIMULATION_BUFFERS - 1];
|
iCurMaxUpDecision = viBufSizesForSim[NUM_STAT_SIMULATION_BUFFERS - 1];
|
||||||
|
|
||||||
// This is a worst case, something very bad had happened. Hopefully
|
// 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).
|
// phase to get quickly back to normal buffer sizes (hopefully).
|
||||||
ResetInitCounter();
|
ResetInitCounter();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Post calculation (filtering) --------------------------------------------
|
// 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
|
// filtering shall be slower than for down direction since we assume
|
||||||
// that the lower value is the actual value which can be used for
|
// that the lower value is the actual value which can be used for
|
||||||
// the current network condition. If the current error rate estimation
|
// the current network condition. If the current error rate estimation
|
||||||
|
|
|
@ -260,7 +260,7 @@ public:
|
||||||
eBufState = CBufferBase<TData>::BS_OK;
|
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,
|
virtual bool Get ( CVector<TData>& vecData,
|
||||||
|
@ -327,7 +327,7 @@ public:
|
||||||
eBufState = CBufferBase<TData>::BS_OK;
|
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
|
virtual int GetAvailSpace() const
|
||||||
|
|
|
@ -550,7 +550,7 @@ EPutDataStat CChannel::PutAudioData ( const CVector<uint8_t>& vecbyData,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// the protocol parsing failed and this was no audio block,
|
// 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;
|
eRet = PS_PROT_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ CChatDlg::CChatDlg ( QWidget* parent, Qt::WindowFlags f ) :
|
||||||
txvChatWindow->clear();
|
txvChatWindow->clear();
|
||||||
edtLocalInputText->clear();
|
edtLocalInputText->clear();
|
||||||
|
|
||||||
// we do not want to show a curser in the chat history
|
// we do not want to show a cursor in the chat history
|
||||||
txvChatWindow->setCursorWidth ( 0 );
|
txvChatWindow->setCursorWidth ( 0 );
|
||||||
|
|
||||||
// set a placeholder text to make sure where to type the message in (#384)
|
// set a placeholder text to make sure where to type the message in (#384)
|
||||||
|
@ -85,7 +85,7 @@ void CChatDlg::OnLocalInputTextTextChanged ( const QString& strNewText )
|
||||||
// check and correct length
|
// check and correct length
|
||||||
if ( strNewText.length() > MAX_LEN_CHAT_TEXT )
|
if ( strNewText.length() > MAX_LEN_CHAT_TEXT )
|
||||||
{
|
{
|
||||||
// text is too long, update control with shortend text
|
// text is too long, update control with shortened text
|
||||||
edtLocalInputText->setText ( strNewText.left ( MAX_LEN_CHAT_TEXT ) );
|
edtLocalInputText->setText ( strNewText.left ( MAX_LEN_CHAT_TEXT ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -254,7 +254,7 @@ void CClient::OnSendCLProtMessage ( CHostAddress InetAddr,
|
||||||
|
|
||||||
void CClient::OnInvalidPacketReceived ( CHostAddress RecHostAddr )
|
void CClient::OnInvalidPacketReceived ( CHostAddress RecHostAddr )
|
||||||
{
|
{
|
||||||
// message coult not be parsed, check if the packet comes
|
// message could not be parsed, check if the packet comes
|
||||||
// from the server we just connected -> if yes, send
|
// from the server we just connected -> if yes, send
|
||||||
// disconnect message since the server may not know that we
|
// disconnect message since the server may not know that we
|
||||||
// are not connected anymore
|
// are not connected anymore
|
||||||
|
@ -1184,7 +1184,7 @@ int CClient::EstimatedOverallDelay ( const int iPingTimeMs )
|
||||||
|
|
||||||
if ( dSoundCardInputOutputLatencyMs == 0.0 )
|
if ( dSoundCardInputOutputLatencyMs == 0.0 )
|
||||||
{
|
{
|
||||||
// use an alternative aproach for estimating the sound card delay:
|
// use an alternative approach for estimating the sound card delay:
|
||||||
//
|
//
|
||||||
// we assume that we have two period sizes for the input and one for the
|
// we assume that we have two period sizes for the input and one for the
|
||||||
// output, therefore we have "3 *" instead of "2 *" (for input and output)
|
// output, therefore we have "3 *" instead of "2 *" (for input and output)
|
||||||
|
|
|
@ -242,7 +242,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
|
||||||
|
|
||||||
// Mac Workaround:
|
// Mac Workaround:
|
||||||
// If the connect button is the default button, on Mac it is highlighted
|
// If the connect button is the default button, on Mac it is highlighted
|
||||||
// by fading in and out a blue backgroud color. This operation consumes so
|
// by fading in and out a blue background color. This operation consumes so
|
||||||
// much CPU that we get audio interruptions.
|
// much CPU that we get audio interruptions.
|
||||||
// Better solution: increase thread priority of worker thread (since the
|
// Better solution: increase thread priority of worker thread (since the
|
||||||
// user can always highlight the button manually, too) -> TODO
|
// user can always highlight the button manually, too) -> TODO
|
||||||
|
@ -711,7 +711,7 @@ void CClientDlg::OnConnectDlgAccepted()
|
||||||
// user
|
// user
|
||||||
strMixerBoardLabel = strSelectedAddress;
|
strMixerBoardLabel = strSelectedAddress;
|
||||||
|
|
||||||
// special case: if the address is empty, we substitude the default
|
// special case: if the address is empty, we substitute the default
|
||||||
// central server address so that a user which just pressed the connect
|
// central server address so that a user which just pressed the connect
|
||||||
// button without selecting an item in the table or manually entered an
|
// button without selecting an item in the table or manually entered an
|
||||||
// address gets a successful connection
|
// address gets a successful connection
|
||||||
|
@ -1197,7 +1197,7 @@ rbtReverbSelR->setStyleSheet ( "color: rgb(220, 220, 220);"
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// reset style sheet and set original paramters
|
// reset style sheet and set original parameters
|
||||||
backgroundFrame->setStyleSheet ( "" );
|
backgroundFrame->setStyleSheet ( "" );
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
|
@ -295,7 +295,7 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// substitude the receive host address for central server
|
// substitute the receive host address for central server
|
||||||
CurHostAddress = InetAddr;
|
CurHostAddress = InetAddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -412,7 +412,7 @@ void CConnectDlg::SetConnClientsList ( const CHostAddress& InetAddr,
|
||||||
|
|
||||||
if ( pCurListViewItem )
|
if ( pCurListViewItem )
|
||||||
{
|
{
|
||||||
// first remove any existing childs
|
// first remove any existing children
|
||||||
DeleteAllListViewItemChilds ( pCurListViewItem );
|
DeleteAllListViewItemChilds ( pCurListViewItem );
|
||||||
|
|
||||||
// get number of connected clients
|
// get number of connected clients
|
||||||
|
@ -477,8 +477,8 @@ void CConnectDlg::SetConnClientsList ( const CHostAddress& InetAddr,
|
||||||
// add the new child to the corresponding server item
|
// add the new child to the corresponding server item
|
||||||
pCurListViewItem->addChild ( pNewChildListViewItem );
|
pCurListViewItem->addChild ( pNewChildListViewItem );
|
||||||
|
|
||||||
// at least one server has childs now, show decoration to be able
|
// at least one server has children now, show decoration to be able
|
||||||
// to show the childs
|
// to show the children
|
||||||
lvwServers->setRootIsDecorated ( true );
|
lvwServers->setRootIsDecorated ( true );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -486,7 +486,7 @@ void CConnectDlg::SetConnClientsList ( const CHostAddress& InetAddr,
|
||||||
|
|
||||||
void CConnectDlg::OnServerListItemSelectionChanged()
|
void CConnectDlg::OnServerListItemSelectionChanged()
|
||||||
{
|
{
|
||||||
// get current selected item (we are only interested in the first selcted
|
// get current selected item (we are only interested in the first selected
|
||||||
// item)
|
// item)
|
||||||
QList<QTreeWidgetItem*> CurSelListItemList = lvwServers->selectedItems();
|
QList<QTreeWidgetItem*> CurSelListItemList = lvwServers->selectedItems();
|
||||||
|
|
||||||
|
@ -569,7 +569,7 @@ void CConnectDlg::UpdateListFilter()
|
||||||
bFilterFound = true;
|
bFilterFound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// search childs
|
// search children
|
||||||
for ( int iCCnt = 0; iCCnt < pCurListViewItem->childCount(); iCCnt++ )
|
for ( int iCCnt = 0; iCCnt < pCurListViewItem->childCount(); iCCnt++ )
|
||||||
{
|
{
|
||||||
if ( pCurListViewItem->child ( iCCnt )->text ( 0 ).indexOf ( sFilterText, 0, Qt::CaseInsensitive ) >= 0 )
|
if ( pCurListViewItem->child ( iCCnt )->text ( 0 ).indexOf ( sFilterText, 0, Qt::CaseInsensitive ) >= 0 )
|
||||||
|
@ -785,13 +785,13 @@ void CConnectDlg::SetPingTimeAndNumClientsResult ( const CHostAddress& InetAddr,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if no server item has childs, do not show decoration
|
// if no server item has children, do not show decoration
|
||||||
bool bAnyListItemHasChilds = false;
|
bool bAnyListItemHasChilds = false;
|
||||||
const int iServerListLen = lvwServers->topLevelItemCount();
|
const int iServerListLen = lvwServers->topLevelItemCount();
|
||||||
|
|
||||||
for ( int iIdx = 0; iIdx < iServerListLen; iIdx++ )
|
for ( int iIdx = 0; iIdx < iServerListLen; iIdx++ )
|
||||||
{
|
{
|
||||||
// check if the current list item has childs
|
// check if the current list item has children
|
||||||
if ( lvwServers->topLevelItem ( iIdx )->childCount() > 0 )
|
if ( lvwServers->topLevelItem ( iIdx )->childCount() > 0 )
|
||||||
{
|
{
|
||||||
bAnyListItemHasChilds = true;
|
bAnyListItemHasChilds = true;
|
||||||
|
@ -846,7 +846,7 @@ QTreeWidgetItem* CConnectDlg::GetParentListViewItem ( QTreeWidgetItem* pItem )
|
||||||
|
|
||||||
void CConnectDlg::DeleteAllListViewItemChilds ( QTreeWidgetItem* pItem )
|
void CConnectDlg::DeleteAllListViewItemChilds ( QTreeWidgetItem* pItem )
|
||||||
{
|
{
|
||||||
// loop over all childs
|
// loop over all children
|
||||||
while ( pItem->childCount() > 0 )
|
while ( pItem->childCount() > 0 )
|
||||||
{
|
{
|
||||||
// get the first child in the list
|
// get the first child in the list
|
||||||
|
|
|
@ -268,9 +268,9 @@ CONNECTION LESS MESSAGES
|
||||||
... ------------------+----------------------------------+ ...
|
... ------------------+----------------------------------+ ...
|
||||||
... 2 bytes number n | n bytes UTF-8 string server name | ...
|
... 2 bytes number n | n bytes UTF-8 string server name | ...
|
||||||
... ------------------+----------------------------------+ ...
|
... ------------------+----------------------------------+ ...
|
||||||
... ------------------+---------------------------------------------+ ...
|
... ------------------+----------------------------------------------+ ...
|
||||||
... 2 bytes number n | n bytes UTF-8 string server interal address | ...
|
... 2 bytes number n | n bytes UTF-8 string server internal address | ...
|
||||||
... ------------------+---------------------------------------------+ ...
|
... ------------------+----------------------------------------------+ ...
|
||||||
... ------------------+---------------------------+
|
... ------------------+---------------------------+
|
||||||
... 2 bytes number n | n bytes UTF-8 string city |
|
... 2 bytes number n | n bytes UTF-8 string city |
|
||||||
... ------------------+---------------------------+
|
... ------------------+---------------------------+
|
||||||
|
@ -282,7 +282,7 @@ CONNECTION LESS MESSAGES
|
||||||
- "is permanent" is a flag which indicates if the server is permanent
|
- "is permanent" is a flag which indicates if the server is permanent
|
||||||
online or not. If this value is any value <> 0 indicates that the server
|
online or not. If this value is any value <> 0 indicates that the server
|
||||||
is permanent online.
|
is permanent online.
|
||||||
- "server interal address" represents the IPv4 address as a dotted quad to
|
- "server internal address" represents the IPv4 address as a dotted quad to
|
||||||
be used by clients with the same external IP address as the server.
|
be used by clients with the same external IP address as the server.
|
||||||
NOTE: In the PROTMESSID_CLM_SERVER_LIST list, this field will be empty
|
NOTE: In the PROTMESSID_CLM_SERVER_LIST list, this field will be empty
|
||||||
as only the initial IP address should be used by the client. Where
|
as only the initial IP address should be used by the client. Where
|
||||||
|
|
|
@ -154,7 +154,7 @@ void CJamSession::DisconnectClient(int iChID)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief CJamSession::Frame Process a frame emited for a client by the server
|
* @brief CJamSession::Frame Process a frame emitted for a client by the server
|
||||||
* @param iChID the client channel id
|
* @param iChID the client channel id
|
||||||
* @param name the client name
|
* @param name the client name
|
||||||
* @param address the client IP and port number
|
* @param address the client IP and port number
|
||||||
|
@ -301,7 +301,7 @@ QMap<QString, QList<STrackItem>> CJamSession::TracksFromSessionDir(const QString
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief CJamRecorder::Init Create recording directory, if necessary, and connect signal handlers
|
* @brief CJamRecorder::Init Create recording directory, if necessary, and connect signal handlers
|
||||||
* @param server Server object emiting signals
|
* @param server Server object emitting signals
|
||||||
* @return QString::null on success else the failure reason
|
* @return QString::null on success else the failure reason
|
||||||
*/
|
*/
|
||||||
QString CJamRecorder::Init()
|
QString CJamRecorder::Init()
|
||||||
|
@ -506,7 +506,7 @@ void CJamRecorder::OnDisconnected(int iChID)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief CJamRecorder::OnFrame Handle a frame emited for a client by the server
|
* @brief CJamRecorder::OnFrame Handle a frame emitted for a client by the server
|
||||||
* @param iChID the client channel id
|
* @param iChID the client channel id
|
||||||
* @param name the client name
|
* @param name the client name
|
||||||
* @param address the client IP and port number
|
* @param address the client IP and port number
|
||||||
|
|
|
@ -149,7 +149,7 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Create recording directory, if necessary, and connect signal handlers
|
* @brief Create recording directory, if necessary, and connect signal handlers
|
||||||
* @param server Server object emiting signals
|
* @param server Server object emitting signals
|
||||||
*/
|
*/
|
||||||
QString Init();
|
QString Init();
|
||||||
|
|
||||||
|
|
|
@ -390,7 +390,7 @@ CServer::CServer ( const int iNewMaxNumChan,
|
||||||
{
|
{
|
||||||
QString strCurServerNameForHTMLStatusFile = strServerNameForHTMLStatusFile;
|
QString strCurServerNameForHTMLStatusFile = strServerNameForHTMLStatusFile;
|
||||||
|
|
||||||
// if server name is empty, substitude a default name
|
// if server name is empty, substitute a default name
|
||||||
if ( strCurServerNameForHTMLStatusFile.isEmpty() )
|
if ( strCurServerNameForHTMLStatusFile.isEmpty() )
|
||||||
{
|
{
|
||||||
strCurServerNameForHTMLStatusFile = "[server address]";
|
strCurServerNameForHTMLStatusFile = "[server address]";
|
||||||
|
@ -412,7 +412,7 @@ CServer::CServer ( const int iNewMaxNumChan,
|
||||||
|
|
||||||
if ( file.open ( QIODevice::ReadOnly | QIODevice::Text ) )
|
if ( file.open ( QIODevice::ReadOnly | QIODevice::Text ) )
|
||||||
{
|
{
|
||||||
// use entrie file content for the welcome message
|
// use entire file content for the welcome message
|
||||||
strWelcomeMessage = file.readAll();
|
strWelcomeMessage = file.readAll();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -616,7 +616,7 @@ void CServer::OnNewConnection ( int iChID,
|
||||||
// a channel name request to the client which causes a channel
|
// a channel name request to the client which causes a channel
|
||||||
// name message to be transmitted to the server. If the server
|
// name message to be transmitted to the server. If the server
|
||||||
// receives this message, the channel list will be automatically
|
// receives this message, the channel list will be automatically
|
||||||
// updated (implicitely).
|
// updated (implicitly).
|
||||||
//
|
//
|
||||||
// Usually it is not required to send the channel list to the
|
// Usually it is not required to send the channel list to the
|
||||||
// client currently connecting since it automatically requests
|
// client currently connecting since it automatically requests
|
||||||
|
@ -631,7 +631,7 @@ void CServer::OnNewConnection ( int iChID,
|
||||||
// send welcome message (if enabled)
|
// send welcome message (if enabled)
|
||||||
if ( !strWelcomeMessage.isEmpty() )
|
if ( !strWelcomeMessage.isEmpty() )
|
||||||
{
|
{
|
||||||
// create formated server welcome message and send it just to
|
// create formatted server welcome message and send it just to
|
||||||
// the client which just connected to the server
|
// the client which just connected to the server
|
||||||
const QString strWelcomeMessageFormated =
|
const QString strWelcomeMessageFormated =
|
||||||
"<b>Server Welcome Message:</b> " + strWelcomeMessage;
|
"<b>Server Welcome Message:</b> " + strWelcomeMessage;
|
||||||
|
@ -1021,7 +1021,7 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
|
||||||
vecvecsData[i] );
|
vecvecsData[i] );
|
||||||
}
|
}
|
||||||
|
|
||||||
// generate a sparate mix for each channel
|
// generate a separate mix for each channel
|
||||||
// actual processing of audio data -> mix
|
// actual processing of audio data -> mix
|
||||||
ProcessData ( vecvecsData,
|
ProcessData ( vecvecsData,
|
||||||
vecvecdGains[i],
|
vecvecdGains[i],
|
||||||
|
|
|
@ -476,7 +476,7 @@ void CServerDlg::OnServerNameTextChanged ( const QString& strNewName )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// text is too long, update control with shortend text
|
// text is too long, update control with shortened text
|
||||||
edtServerName->setText ( strNewName.left ( MAX_LEN_SERVER_NAME ) );
|
edtServerName->setText ( strNewName.left ( MAX_LEN_SERVER_NAME ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -492,7 +492,7 @@ void CServerDlg::OnLocationCityTextChanged ( const QString& strNewCity )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// text is too long, update control with shortend text
|
// text is too long, update control with shortened text
|
||||||
edtLocationCity->setText ( strNewCity.left ( MAX_LEN_SERVER_CITY ) );
|
edtLocationCity->setText ( strNewCity.left ( MAX_LEN_SERVER_CITY ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum,
|
||||||
ServerList.clear();
|
ServerList.clear();
|
||||||
|
|
||||||
// Init server list entry (server info for this server) with defaults. Per
|
// Init server list entry (server info for this server) with defaults. Per
|
||||||
// definition the client substitudes the IP address of the central server
|
// definition the client substitutes the IP address of the central server
|
||||||
// itself for his server list. If we are the central server, we assume that
|
// itself for his server list. If we are the central server, we assume that
|
||||||
// we have a permanent server.
|
// we have a permanent server.
|
||||||
CServerListEntry ThisServerListEntry ( CHostAddress(),
|
CServerListEntry ThisServerListEntry ( CHostAddress(),
|
||||||
|
|
|
@ -291,7 +291,7 @@ printf ( "\n" );
|
||||||
// we only want to parse controller messages
|
// we only want to parse controller messages
|
||||||
if ( ( iStatusByte >= 0xB0 ) && ( iStatusByte < 0xC0 ) )
|
if ( ( iStatusByte >= 0xB0 ) && ( iStatusByte < 0xC0 ) )
|
||||||
{
|
{
|
||||||
// make sure paket is long enough
|
// make sure packet is long enough
|
||||||
if ( vMIDIPaketBytes.Size() > 2 )
|
if ( vMIDIPaketBytes.Size() > 2 )
|
||||||
{
|
{
|
||||||
// we are assuming that the controller number is the same
|
// we are assuming that the controller number is the same
|
||||||
|
|
|
@ -49,7 +49,7 @@ public:
|
||||||
iLPort = static_cast<quint16> ( GenRandomIntInRange ( -2, 10000 ) );
|
iLPort = static_cast<quint16> ( GenRandomIntInRange ( -2, 10000 ) );
|
||||||
|
|
||||||
// bind socket (try 100 port numbers)
|
// bind socket (try 100 port numbers)
|
||||||
quint16 iPortIncrement = 0; // start value: port nubmer plus ten
|
quint16 iPortIncrement = 0; // start value: port number plus ten
|
||||||
bool bSuccess = false; // initialization for while loop
|
bool bSuccess = false; // initialization for while loop
|
||||||
|
|
||||||
while ( !bSuccess && ( iPortIncrement <= 100 ) )
|
while ( !bSuccess && ( iPortIncrement <= 100 ) )
|
||||||
|
|
12
src/util.cpp
12
src/util.cpp
|
@ -141,12 +141,12 @@ void CCRC::AddByte ( const uint8_t byNewInput )
|
||||||
{
|
{
|
||||||
for ( int i = 0; i < 8; i++ )
|
for ( int i = 0; i < 8; i++ )
|
||||||
{
|
{
|
||||||
// shift bits in shift-register for transistion
|
// shift bits in shift-register for transition
|
||||||
iStateShiftReg <<= 1;
|
iStateShiftReg <<= 1;
|
||||||
|
|
||||||
// take bit, which was shifted out of the register-size and place it
|
// take bit, which was shifted out of the register-size and place it
|
||||||
// at the beginning (LSB)
|
// at the beginning (LSB)
|
||||||
// (If condition is not satisfied, implicitely a "0" is added)
|
// (If condition is not satisfied, implicitly a "0" is added)
|
||||||
if ( ( iStateShiftReg & iBitOutMask) > 0 )
|
if ( ( iStateShiftReg & iBitOutMask) > 0 )
|
||||||
{
|
{
|
||||||
iStateShiftReg |= 1;
|
iStateShiftReg |= 1;
|
||||||
|
@ -196,7 +196,7 @@ void CAudioReverb::Init ( const EAudChanConf eNAudioChannelConf,
|
||||||
const int iSampleRate,
|
const int iSampleRate,
|
||||||
const double rT60 )
|
const double rT60 )
|
||||||
{
|
{
|
||||||
// store paramters
|
// store parameters
|
||||||
eAudioChannelConf = eNAudioChannelConf;
|
eAudioChannelConf = eNAudioChannelConf;
|
||||||
iStereoBlockSizeSam = iNStereoBlockSizeSam;
|
iStereoBlockSizeSam = iNStereoBlockSizeSam;
|
||||||
|
|
||||||
|
@ -807,7 +807,7 @@ void CMusProfDlg::OnAliasTextChanged ( const QString& strNewName )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// text is too long, update control with shortend text
|
// text is too long, update control with shortened text
|
||||||
pedtAlias->setText ( strNewName.left ( MAX_LEN_FADER_TAG ) );
|
pedtAlias->setText ( strNewName.left ( MAX_LEN_FADER_TAG ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -845,7 +845,7 @@ void CMusProfDlg::OnCityTextChanged ( const QString& strNewCity )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// text is too long, update control with shortend text
|
// text is too long, update control with shortened text
|
||||||
pedtCity->setText ( strNewCity.left ( MAX_LEN_SERVER_CITY ) );
|
pedtCity->setText ( strNewCity.left ( MAX_LEN_SERVER_CITY ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -928,7 +928,7 @@ bool NetworkUtil::ParseNetworkAddress ( QString strAddress,
|
||||||
// first try if this is an IP number an can directly applied to QHostAddress
|
// first try if this is an IP number an can directly applied to QHostAddress
|
||||||
if ( !InetAddr.setAddress ( strAddress ) )
|
if ( !InetAddr.setAddress ( strAddress ) )
|
||||||
{
|
{
|
||||||
// it was no vaild IP address, try to get host by name, assuming
|
// it was no valid IP address, try to get host by name, assuming
|
||||||
// that the string contains a valid host name string
|
// that the string contains a valid host name string
|
||||||
const QHostInfo HostInfo = QHostInfo::fromName ( strAddress );
|
const QHostInfo HostInfo = QHostInfo::fromName ( strAddress );
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ echo Use the Visual Studio x86 x64 Cross Tools Command Prompt to call this skrip
|
||||||
goto endofskript
|
goto endofskript
|
||||||
|
|
||||||
:qtdirproblem
|
:qtdirproblem
|
||||||
echo The QTDIR32 and QTDIR64 is not set, please set these environment variables correclty before calling this script
|
echo The QTDIR32 and QTDIR64 is not set, please set these environment variables correctly before calling this script
|
||||||
goto endofskript
|
goto endofskript
|
||||||
|
|
||||||
:nsispluginproblem
|
:nsispluginproblem
|
||||||
|
|
|
@ -53,7 +53,7 @@ QString CSound::LoadAndInitializeDriver ( int iDriverIdx,
|
||||||
return tr ( "The audio driver could not be initialized." );
|
return tr ( "The audio driver could not be initialized." );
|
||||||
}
|
}
|
||||||
|
|
||||||
// check device capabilities if it fullfills our requirements
|
// check device capabilities if it fulfills our requirements
|
||||||
const QString strStat = CheckDeviceCapabilities();
|
const QString strStat = CheckDeviceCapabilities();
|
||||||
|
|
||||||
// check if device is capable
|
// check if device is capable
|
||||||
|
@ -165,7 +165,7 @@ QString CSound::CheckDeviceCapabilities()
|
||||||
// support the required sample format. But since we have support for
|
// support the required sample format. But since we have support for
|
||||||
// all known sample types, the following check should always pass and
|
// all known sample types, the following check should always pass and
|
||||||
// therefore we throw the error message on any channel which does not
|
// therefore we throw the error message on any channel which does not
|
||||||
// fullfill the sample format requirement (quick hack solution).
|
// fulfill the sample format requirement (quick hack solution).
|
||||||
if ( !CheckSampleTypeSupported ( channelInfosInput[i].type ) )
|
if ( !CheckSampleTypeSupported ( channelInfosInput[i].type ) )
|
||||||
{
|
{
|
||||||
// return error string
|
// return error string
|
||||||
|
@ -195,7 +195,7 @@ QString CSound::CheckDeviceCapabilities()
|
||||||
// support the required sample format. But since we have support for
|
// support the required sample format. But since we have support for
|
||||||
// all known sample types, the following check should always pass and
|
// all known sample types, the following check should always pass and
|
||||||
// therefore we throw the error message on any channel which does not
|
// therefore we throw the error message on any channel which does not
|
||||||
// fullfill the sample format requirement (quick hack solution).
|
// fulfill the sample format requirement (quick hack solution).
|
||||||
if ( !CheckSampleTypeSupported ( channelInfosOutput[i].type ) )
|
if ( !CheckSampleTypeSupported ( channelInfosOutput[i].type ) )
|
||||||
{
|
{
|
||||||
// return error string
|
// return error string
|
||||||
|
@ -449,7 +449,7 @@ int CSound::Init ( const int iNewPrefMonoBufferSize )
|
||||||
dInOutLatencyMs = 0.0;
|
dInOutLatencyMs = 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// check wether the driver requires the ASIOOutputReady() optimization
|
// check whether the driver requires the ASIOOutputReady() optimization
|
||||||
// (can be used by the driver to reduce output latency by one block)
|
// (can be used by the driver to reduce output latency by one block)
|
||||||
bASIOPostOutput = ( ASIOOutputReady() == ASE_OK );
|
bASIOPostOutput = ( ASIOOutputReady() == ASE_OK );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue