Skip to content
Open
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 docs/JAMULUS_PROTOCOL.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ The message packet structure is:
The TAG bytes are zero bytes.
The ID provides the message type.
The SEQ is a wrapping sequence number for the message
LENgth of the data preceeds the data and is followed by a CRC for the packet.
LENgth of the data precedes the data and is followed by a CRC for the packet.

Data is sent little-endian, i.e. not network byte-order.

Expand Down
2 changes: 1 addition & 1 deletion src/analyzerconsole.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ CAnalyzerConsole::CAnalyzerConsole ( CClient* pNCliP, QWidget* parent ) :

setLayout ( pMainLayout );

// error rate gaph tab
// error rate graph tab
pTabWidgetBufErrRate = new QWidget();
QVBoxLayout* pTabErrRateLayout = new QVBoxLayout ( pTabWidgetBufErrRate );

Expand Down
2 changes: 1 addition & 1 deletion src/mac/activity.mm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

pActivity->activityId = [[NSProcessInfo processInfo]
beginActivityWithOptions:options
reason:@"Jamulus provides low latency audio processing and should not be inturrupted by system throttling."];
reason:@"Jamulus provides low latency audio processing and should not be interrupted by system throttling."];
}

void CActivity::EndActivity()
Expand Down
2 changes: 1 addition & 1 deletion src/protocol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2609,7 +2609,7 @@ bool CProtocol::EvaluateCLRegisterServerResp ( const CHostAddress& InetAddr, con
const int iSvrRegResult = static_cast<int> ( GetValFromStream ( vecData, iPos, 1 ) );

if ( ( iSvrRegResult != SRR_REGISTERED ) && ( iSvrRegResult != SRR_SERVER_LIST_FULL ) && ( iSvrRegResult != SRR_VERSION_TOO_OLD ) &&
( iSvrRegResult != SRR_NOT_FULFILL_REQIREMENTS ) )
( iSvrRegResult != SRR_NOT_FULFILL_REQUIREMENTS ) )
{
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/serverlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ void CServerListManager::Append ( const CHostAddress& InetAddr,
// if the server is not listed, refuse registration and send registration response
if ( !vWhiteList.contains ( InetAddr.InetAddr ) )
{
pConnLessProtocol->CreateCLRegisterServerResp ( InetAddr, SRR_NOT_FULFILL_REQIREMENTS );
pConnLessProtocol->CreateCLRegisterServerResp ( InetAddr, SRR_NOT_FULFILL_REQUIREMENTS );
return; // leave function early, i.e., we do not register this server
}
}
Expand Down Expand Up @@ -920,7 +920,7 @@ void CServerListManager::StoreRegistrationResult ( ESvrRegResult eResult )
SetSvrRegStatus ( ESvrRegStatus::SRS_VERSION_TOO_OLD );
break;

case ESvrRegResult::SRR_NOT_FULFILL_REQIREMENTS:
case ESvrRegResult::SRR_NOT_FULFILL_REQUIREMENTS:
SetSvrRegStatus ( ESvrRegStatus::SRS_NOT_FULFILL_REQUIREMENTS );
break;

Expand Down
4 changes: 2 additions & 2 deletions src/sound/jack/sound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,10 @@ int CSound::Init ( const int /* iNewPrefMonoBufferSize */ )
CSoundBase::Init ( iJACKBufferSizeMono );

// set internal buffer size value and calculate stereo buffer size
iJACKBufferSizeStero = 2 * iJACKBufferSizeMono;
iJACKBufferSizeStereo = 2 * iJACKBufferSizeMono;

// create memory for intermediate audio buffer
vecsTmpAudioSndCrdStereo.Init ( iJACKBufferSizeStero );
vecsTmpAudioSndCrdStereo.Init ( iJACKBufferSizeStereo );

return iJACKBufferSizeMono;
}
Expand Down
2 changes: 1 addition & 1 deletion src/sound/jack/sound.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class CSound : public CSoundBase
// to access them from the callback function
CVector<short> vecsTmpAudioSndCrdStereo;
int iJACKBufferSizeMono;
int iJACKBufferSizeStero;
int iJACKBufferSizeStereo;
bool bJackWasShutDown;

jack_port_t* input_port_left;
Expand Down
10 changes: 5 additions & 5 deletions src/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ enum ENetwFlags
// Audio quality enum ----------------------------------------------------------
enum EAudioQuality
{
// used for settings and the comobo box index -> enum values must be fixed!
// used for settings and the combo box index -> enum values must be fixed!
AQ_LOW = 0,
AQ_NORMAL = 1,
AQ_HIGH = 2,
Expand Down Expand Up @@ -703,10 +703,10 @@ inline QString svrRegStatusToString ( ESvrRegStatus eSvrRegStatus )
enum ESvrRegResult
{
// used for protocol -> enum values must be fixed!
SRR_REGISTERED = 0,
SRR_SERVER_LIST_FULL = 1,
SRR_VERSION_TOO_OLD = 2,
SRR_NOT_FULFILL_REQIREMENTS = 3
SRR_REGISTERED = 0,
SRR_SERVER_LIST_FULL = 1,
SRR_VERSION_TOO_OLD = 2,
SRR_NOT_FULFILL_REQUIREMENTS = 3
};

// Skill level enum ------------------------------------------------------------
Expand Down
Loading