make raw audio optional at server

Author: dingodoppelt

src/main.cpp

@@ -87,6 +87,7 @@ int main ( int argc, char** argv )
     bool         bDisconnectAllClientsOnQuit = false;
     bool         bUseDoubleSystemFrameSize   = true; // default is 128 samples frame size
     bool         bUseMultithreading          = false;
+    bool         bDisableRaw                 = false;
     bool         bShowAnalyzerConsole        = false;
     bool         bMuteStream                 = false;
     bool         bMuteMeInPersonalMix        = false;
@@ -478,6 +479,19 @@ int main ( int argc, char** argv )
             continue;
         }
 
+        // Disable raw audio feature -------------------------------------------
+        if ( GetFlagArgument ( argv,
+                               i,
+                               "--noraw", // no short form
+                               "--noraw" ) )
+        {
+            bDisableRaw = true;
+            qInfo() << "- raw audio is disabled";
+            CommandLineOptions << "--noraw";
+            ServerOnlyOptions << "--noraw";
+            continue;
+        }
+
         // Client only:
 
         // Connect on startup --------------------------------------------------
@@ -989,6 +1003,7 @@ int main ( int argc, char** argv )
                              strRecordingDirName,
                              bDisconnectAllClientsOnQuit,
                              bUseDoubleSystemFrameSize,
+                             bDisableRaw,
                              bUseMultithreading,
                              bDisableRecording,
                              bDelayPan,
@@ -1115,6 +1130,7 @@ QString UsageArguments ( char** argv )
            "  -P, --delaypan          start with delay panning enabled\n"
            "  -R, --recording         set server recording directory; server will record when a session is active by default\n"
            "      --norecord          set server not to record by default when recording is configured\n"
+           "      --noraw             disable raw audio\n"
            "  -s, --server            start Server\n"
            "      --serverbindip      IP address the Server will bind to (rather than all)\n"
            "  -T, --multithreading    use multithreading to make better use of\n"

src/server.cpp

@@ -40,6 +40,7 @@ CServer::CServer ( const int          iNewMaxNumChan,
                    const QString&     strRecordingDirName,
                    const bool         bNDisconnectAllClientsOnQuit,
                    const bool         bNUseDoubleSystemFrameSize,
+                   const bool         bNDisableRaw,
                    const bool         bNUseMultithreading,
                    const bool         bDisableRecording,
                    const bool         bNDelayPan,
@@ -49,6 +50,7 @@ CServer::CServer ( const int          iNewMaxNumChan,
     bUseMultithreading ( bNUseMultithreading ),
     iMaxNumChannels ( iNewMaxNumChan ),
     iCurNumChannels ( 0 ),
+    bDisableRaw ( bNDisableRaw ),
     Socket ( this, iPortNumber, iQosNumber, strServerBindIP, bNEnableIPv6 ),
     Logging(),
     iFrameCount ( 0 ),
@@ -383,8 +385,11 @@ void CServer::OnNewConnection ( int iChID, int iTotChans, CHostAddress RecHostAd
     // must be the first message to be sent for a new connection)
     vecChannels[iChID].CreateClientIDMes ( iChID );
 
-    // inform the client that the server supports raw (uncompressed) audio
-    vecChannels[iChID].CreateRawAudioSupportedMes();
+    // if not disabled, inform the client that the server supports raw (uncompressed) audio
+    if ( !bDisableRaw )
+    {
+        vecChannels[iChID].CreateRawAudioSupportedMes();
+    }
 
     // Send an empty channel list in order to force clients to reset their
     // audio mixer state. This is required to trigger clients to re-send their

src/server.h

@@ -100,6 +100,7 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
               const QString&     strRecordingDirName,
               const bool         bNDisconnectAllClientsOnQuit,
               const bool         bNUseDoubleSystemFrameSize,
+              const bool         bNDisableRaw,
               const bool         bNUseMultithreading,
               const bool         bDisableRecording,
               const bool         bNDelayPan,
@@ -250,6 +251,9 @@ class CServer : public QObject, public CServerSlots<MAX_NUM_CHANNELS>
     CConvBuf<int16_t>  DoubleFrameSizeConvBufIn[MAX_NUM_CHANNELS];
     CConvBuf<int16_t>  DoubleFrameSizeConvBufOut[MAX_NUM_CHANNELS];
 
+    // needed for disabling raw audio transmission
+    bool bDisableRaw;
+
     CVector<QString> vstrChatColors;
     CVector<int>     vecChanIDsCurConChan;