disable clang-format for code that is unaligned on purpose

linux/sound.cpp

@@ -210,12 +210,14 @@ void CSound::Stop()
 int CSound::Init ( const int /* iNewPrefMonoBufferSize */ )
 {
 
+// clang-format off
 // 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
 // registered callback which calls "EmitReinitRequestSignal()". In that function
 // this CSound::Init() function is called...
 //jack_set_buffer_size ( pJackClient, iNewPrefMonoBufferSize );
+// clang-format on
 
     // without a Jack server, Jamulus makes no sense to run, throw an error message
     if ( bJackWasShutDown )
@@ -336,7 +338,9 @@ int CSound::process ( jack_nframes_t nframes, void* arg )
                 jack_midi_event_get ( &in_event, in_midi, j );
 
                 // copy packet and send it to the MIDI parser
+// clang-format off
 // TODO do not call malloc in real-time callback
+// clang-format on
                 CVector<uint8_t> vMIDIPaketBytes ( in_event.size );
 
                 for ( i = 0; i < static_cast<int> ( in_event.size ); i++ )

src/buffer.cpp

@@ -668,6 +668,7 @@ void CNetBufWithStats::UpdateAutoSetting()
                              dWeightUp,
                              dWeightDown );
 
+// clang-format off
 /*
 // TEST store important detection parameters in file for debugging
 static FILE* pFile = fopen ( "test.dat", "w" );
@@ -683,6 +684,7 @@ else
     icnt++;
 }
 */
+// clang-format on
 
     // apply a hysteresis
     iCurAutoBufferSizeSetting =

src/channel.cpp

@@ -61,9 +61,11 @@ CChannel::CChannel ( const bool bNIsServer ) :
 
     // Connections -------------------------------------------------------------
 
+// clang-format off
 // TODO if we later do not fire vectors in the emits, we can remove this again
 qRegisterMetaType<CVector<uint8_t> > ( "CVector<uint8_t>" );
 qRegisterMetaType<CHostAddress> ( "CHostAddress" );
+// clang-format on
 
     QObject::connect ( &Protocol, &CProtocol::MessReadyForSending,
         this, &CChannel::OnSendProtMessage );

src/channel.h

@@ -167,8 +167,10 @@ class CChannel : public QObject
     void CreateChatTextMes ( const QString& strChatText )    { Protocol.CreateChatTextMes ( strChatText ); }
     void CreateLicReqMes ( const ELicenceType eLicenceType ) { Protocol.CreateLicenceRequiredMes ( eLicenceType ); }
 
+// clang-format off
 // TODO needed for compatibility to old servers >= 3.4.6 and <= 3.5.12
 void CreateReqChannelLevelListMes() { Protocol.CreateReqChannelLevelListMes(); }
+// clang-format on
 
     void CreateConClientListMes ( const CVector<CChannelInfo>& vecChanInfo )
         { Protocol.CreateConClientListMes ( vecChanInfo ); }

src/client.cpp

@@ -304,8 +304,10 @@ void CClient::OnNewConnection()
     Channel.CreateReqConnClientsList();
     CreateServerJitterBufferMessage();
 
+// clang-format off
 // TODO needed for compatibility to old servers >= 3.4.6 and <= 3.5.12
 Channel.CreateReqChannelLevelListMes();
+// clang-format on
 }
 
 void CClient::CreateServerJitterBufferMessage()
@@ -1010,11 +1012,13 @@ void CClient::AudioCallback ( CVector<int16_t>& psData, void* arg )
     // process audio data
     pMyClientObj->ProcessSndCrdAudioData ( psData );
 
+// clang-format off
 /*
 // TEST do a soundcard jitter measurement
 static CTimingMeas JitterMeas ( 1000, "test2.dat" );
 JitterMeas.Measure();
 */
+// clang-format on
 }
 
 void CClient::ProcessSndCrdAudioData ( CVector<int16_t>& vecsStereoSndCrd )

src/clientdlg.cpp

@@ -1271,9 +1271,11 @@ void CClientDlg::Disconnect()
     bDetectFeedback = false;
 
 
+// clang-format off
 // TODO is this still required???
 // immediately update status bar
 OnTimerStatus();
+// clang-format on
 
 
     // reset LEDs

src/main.cpp

@@ -741,8 +741,10 @@ int main ( int argc, char** argv )
     Q_INIT_RESOURCE(resources);
 
 
+// clang-format off
 // TEST -> activate the following line to activate the test bench,
 //CTestbench Testbench ( "127.0.0.1", DEFAULT_PORT_NUMBER );
+// clang-format on
 
 
     try

src/protocol.cpp

@@ -640,10 +640,12 @@ void CProtocol::ParseMessageBody ( const CVector<uint8_t>& vecbyMesBodyData,
                                    const int               iRecCounter,
                                    const int               iRecID )
 {
+// clang-format off
 /*
 // TEST channel implementation: randomly delete protocol messages (50 % loss)
 if ( rand() < ( RAND_MAX / 2 ) ) return false;
 */
+// clang-format on
 
     // In case we received a message and returned an answer but our answer
     // did not make it to the receiver, he will resend his message. We check
@@ -865,10 +867,12 @@ void CProtocol::ParseConnectionLessMessageBody ( const CVector<uint8_t>& vecbyMe
                                                  const int               iRecID,
                                                  const CHostAddress&     InetAddr )
 {
+// clang-format off
 /*
 // TEST channel implementation: randomly delete protocol messages (50 % loss)
 if ( rand() < ( RAND_MAX / 2 ) ) return false;
 */
+// clang-format on
 
     // check which type of message we received and do action
     switch ( iRecID )
@@ -2884,8 +2888,10 @@ bool CProtocol::ParseMessageFrame ( const CVector<uint8_t>& vecbyData,
 
     // Extract actual data -----------------------------------------------------
 
+// clang-format off
 // TODO this memory allocation is done in the real time thread but should be
 //      done in the low priority protocol management thread
+// clang-format on
 
     vecbyMesBodyData.Init ( iLenBy );
 

src/protocol.h

@@ -129,8 +129,10 @@ class CProtocol : public QObject
     void CreateLicenceRequiredMes ( const ELicenceType eLicenceType );
     void CreateOpusSupportedMes();
 
+// clang-format off
 // TODO needed for compatibility to old servers >= 3.4.6 and <= 3.5.12
 void CreateReqChannelLevelListMes();
+// clang-format on
 
     void CreateVersionAndOSMes();
     void CreateRecorderStateMes ( const ERecorderState eRecorderState );

src/recorder/jamrecorder.cpp

@@ -108,6 +108,7 @@ void CJamClient::Disconnect()
 QString CJamClient::TranslateChars (const QString& input) const
 {
     // Allow letters and numbers
+    // clang-format off
     static const char charmap[256] = {
         '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_',
         '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_', '_',
@@ -126,6 +127,7 @@ QString CJamClient::TranslateChars (const QString& input) const
         'a', 'a', 'a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i',
         'd', 'n', 'o', 'o', 'o', 'o', 'o', '_', 'o', 'u', 'u', 'u', 'u', 'y', 'p', 'y'
     };
+    // clang-format on
 
     QByteArray r = input.toLatin1();
 

src/server.cpp

@@ -189,9 +189,11 @@ void CHighPrecisionTimer::run()
     {
         // call processing routine by fireing signal
 
+// clang-format off
 // TODO by emit a signal we leave the high priority thread -> maybe use some
 //      other connection type to have something like a true callback, e.g.
 //      "Qt::DirectConnection" -> Can this work?
+// clang-format on
 
         emit timeout();
 
@@ -810,9 +812,11 @@ void CServer::Stop()
 
 void CServer::OnTimer()
 {
+// clang-format off
 /*
 static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TEST do a timer jitter measurement
 */
+// clang-format on
     // Get data from all connected clients -------------------------------------
     // some inits
     int  iNumClients          = 0; // init connected client counter
@@ -1411,9 +1415,11 @@ void CServer::MixEncodeTransmitData ( const int iChanCnt,
         // OPUS encoding
         if ( pCurOpusEncoder != nullptr )
         {
+// clang-format off
 // TODO find a better place than this: the setting does not change all the time so for speed
 //      optimization it would be better to set it only if the network frame size is changed
 opus_custom_encoder_ctl ( pCurOpusEncoder, OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) );
+// clang-format on
 
             for ( size_t iB = 0; iB < (size_t)vecNumFrameSizeConvBlocks[iChanCnt]; iB++ )
             {

src/serverdlg.cpp

@@ -225,9 +225,11 @@ CServerDlg::CServerDlg ( CServer*         pNServP,
     lvwClients->setColumnWidth ( 3, 50 );   //         Channels
     lvwClients->clear();
 
+// clang-format off
 // TEST workaround for resize problem of window after iconize in task bar
 lvwClients->setMinimumWidth ( 170 + 130 + 60 + 205 );
 lvwClients->setMinimumHeight ( 140 );
+// clang-format on
 
 
     // insert items in reverse order because in Windows all of them are

src/settings.cpp

@@ -466,9 +466,11 @@ void CClientSettings::ReadSettingsFromXML ( const QDomDocument&   IniXMLDocument
         pClient->SetAudioQuality ( static_cast<EAudioQuality> ( iValue ) );
     }
 
+// clang-format off
 // TODO compatibility to old version (< 3.6.1)
 // NOTE that the strCurAddr and "check for empty" can be removed if compatibility mode is removed
 vstrCentralServerAddress[0] = GetIniSetting ( IniXMLDocument, "client", "centralservaddr" );
+// clang-format on
 
     // directory server addresses
     for ( iIdx = 0; iIdx < MAX_NUM_SERVER_ADDR_ITEMS; iIdx++ )
@@ -494,6 +496,7 @@ vstrCentralServerAddress[0] = GetIniSetting ( IniXMLDocument, "client", "central
         eCentralServerAddressType = AT_DEFAULT;
     }
 
+// clang-format off
 // TODO compatibility to old version (<3.4.7)
 if ( GetFlagIniSet ( IniXMLDocument, "client", "defcentservaddr", bValue ) )
 {
@@ -503,6 +506,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "client", "defcentservaddr", bValue ) )
         eCentralServerAddressType = AT_CUSTOM;
     }
 }
+// clang-format on
 
     // window position of the main window
     vecWindowPosMain = FromBase64ToByteArray (
@@ -835,6 +839,7 @@ void CServerSettings::ReadSettingsFromXML ( const QDomDocument&   IniXMLDocument
         pServer->SetCentralServerAddressType ( AT_DEFAULT );
     }
 
+// clang-format off
 // TODO compatibility to old version
 if ( GetFlagIniSet ( IniXMLDocument, "server", "defcentservaddr", bValue ) )
 {
@@ -844,6 +849,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "server", "defcentservaddr", bValue ) )
         pServer->SetCentralServerAddressType ( AT_CUSTOM );
     }
 }
+// clang-format on
 
     if ( !CommandLineOptions.contains ( "--centralserver" ) &&
          !CommandLineOptions.contains ( "--directoryserver" ) )

src/socket.cpp

@@ -32,7 +32,9 @@ void CSocket::Init ( const quint16 iPortNumber, const quint16 iQosNumber, const
 #ifdef _WIN32
     // for the Windows socket usage we have to start it up first
 
+// clang-format off
 // TODO check for error and exit application on error
+// clang-format on
 
     WSADATA wsa;
     WSAStartup ( MAKEWORD(1, 0), &wsa );
@@ -271,14 +273,18 @@ void CSocket::OnDataReceived()
         if ( CProtocol::IsConnectionLessMessageID ( iRecID ) )
         {
 
+// clang-format off
 // TODO a copy of the vector is used -> avoid malloc in real-time routine
+// clang-format on
 
             emit ProtcolCLMessageReceived ( iRecID, vecbyMesBodyData, RecHostAddr );
         }
         else
         {
 
+// clang-format off
 // TODO a copy of the vector is used -> avoid malloc in real-time routine
+// clang-format on
 
             emit ProtcolMessageReceived ( iRecCounter, iRecID, vecbyMesBodyData, RecHostAddr );
         }

src/util.h

@@ -697,9 +697,11 @@ enum ESkillLevel
 class CStereoSignalLevelMeter
 {
 public:
+// clang-format off
 // TODO Calculate smoothing factor from sample rate and frame size (64 or 128 samples frame size).
 //      But tests with 128 and 64 samples frame size have shown that the meter fly back
 //      is ok for both numbers of samples frame size with a factor of 0.99.
+// clang-format on
     CStereoSignalLevelMeter ( const bool   bNIsStereoOut     = true,
                               const double dNSmoothingFactor = 0.99 ) :
         dSmoothingFactor ( dNSmoothingFactor ), bIsStereoOut ( bNIsStereoOut ) { Reset(); }
@@ -822,7 +824,9 @@ class CInstPictures
     static EInstCategory GetCategory ( const int iInstrument );
     static void          UpdateTableOnLanguageChange() { GetTable ( true ); }
 
+// clang-format off
 // TODO make use of instrument category (not yet implemented)
+// clang-format on
 
 protected:
     class CInstPictProps

src/vstmain.cpp

@@ -57,8 +57,10 @@ CLlconVST::CLlconVST ( audioMasterCallback AudioMaster ) :
     connect ( &TimerOnOff, SIGNAL ( timeout() ),
         this, SLOT ( OnTimerOnOff() ) );
 
+// clang-format off
 // TODO settings
 Client.SetServerAddr ( DEFAULT_SERVER_ADDRESS );
+// clang-format on
 }
 
 bool CLlconVST::GetName ( char* cName )