REST API: Added streamIndex to relevant channel APIs

sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml

@@ -29,6 +29,9 @@ AMModSettings:
       type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -37,12 +40,12 @@ AMModSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer     
+      type: integer
     cwKeyer:
       $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
-           
+
 AMModReport:
   description: AMMod
   properties:
@@ -54,4 +57,3 @@ AMModReport:
       type: integer
     channelSampleRate:
       type: integer
-   

sdrbase/resources/webapi/doc/swagger/include/ATVMod.yaml

@@ -53,6 +53,9 @@ ATVModSettings:
       type: string
     videoFileName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -61,10 +64,10 @@ ATVModSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer 
+      type: integer
-           
+
 ATVModReport:
   description: ATVMod
   properties:
@@ -74,4 +77,3 @@ ATVModReport:
       format: float
     channelSampleRate:
       type: integer
-   

sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml

@@ -30,6 +30,9 @@ BFMDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml

@@ -54,6 +54,9 @@ DSDDemodSettings:
     traceDecay:
       description: 0 to 255
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml

@@ -17,6 +17,9 @@ FileSourceSettings:
       type: integer
     title:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml

@@ -28,6 +28,9 @@ FreeDVDemodSettings:
       type: string
     freeDVMode:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml

@@ -27,7 +27,10 @@ FreeDVModSettings:
     modAFInput:
       type: integer
     gaugeInputElseModem:
-      type: integer      
+      type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml

@@ -41,6 +41,9 @@ FreqTrackerSettings:
     squelchGate:
       description: Squelch trigger gate in 10s of ms
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/LocalSink.yaml

@@ -12,6 +12,9 @@ LocalSinkSettings:
       type: integer
     filterChainHash:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/LocalSource.yaml

@@ -12,6 +12,9 @@ LocalSourceSettings:
       type: integer
     filterChainHash:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml

@@ -41,6 +41,9 @@ NFMDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml

@@ -32,9 +32,12 @@ NFMModSettings:
     title:
       type: string
     audioDeviceName:
-      type: string      
+      type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -43,12 +46,12 @@ NFMModSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer     
+      type: integer
     cwKeyer:
       $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
-    
+
 NFMModReport:
   description: NFMMod
   properties:
@@ -60,4 +63,3 @@ NFMModReport:
       type: integer
     channelSampleRate:
       type: integer
-    

sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml

@@ -21,6 +21,9 @@ RemoteSinkSettings:
       type: integer
     filterChainHash:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/RemoteSource.yaml

@@ -8,9 +8,12 @@ RemoteSourceSettings:
       description: "Remote USB data port"
       type: integer
     rgbColor:
-      type: integer                  
+      type: integer
     title:
-      type: string      
+      type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -19,10 +22,10 @@ RemoteSourceSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer 
+      type: integer
-      
+
 RemoteSourceReport:
   description: "Remote channel source report"
   properties:
@@ -46,7 +49,7 @@ RemoteSourceReport:
       type: integer
     tvUSec:
       description: "Counts timestamp microseconds"
-      type: integer     
+      type: integer
     nbOriginalBlocks:
       description: "Number of original blocks per frame"
       type: integer
@@ -58,11 +61,10 @@ RemoteSourceReport:
       type: integer
     sampleRate:
       description: "Stream nominal sample rate in S/s"
-      type: integer     
+      type: integer
     deviceCenterFreq:
       description: "Device center frequency in kHz"
       type: integer
     deviceSampleRate:
       description: "Device baseband sample rate in S/s"
-      type: integer     
+      type: integer
-      

sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml

@@ -48,6 +48,9 @@ SSBDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml

@@ -40,6 +40,9 @@ SSBModSettings:
       type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml

@@ -55,6 +55,9 @@ UDPSinkSettings:
       type: integer
     title:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml

@@ -49,6 +49,9 @@ UDPSourceSettings:
       format: uint16
     title:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/WFMDemod.yaml

@@ -25,6 +25,9 @@ WFMDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml

@@ -31,6 +31,9 @@ WFMModSettings:
       type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/AMMod.yaml

@@ -29,6 +29,9 @@ AMModSettings:
       type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -37,12 +40,12 @@ AMModSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer     
+      type: integer
     cwKeyer:
       $ref: "http://localhost:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
-           
+
 AMModReport:
   description: AMMod
   properties:
@@ -54,4 +57,3 @@ AMModReport:
       type: integer
     channelSampleRate:
       type: integer
-   

swagger/sdrangel/api/swagger/include/ATVMod.yaml

@@ -53,6 +53,9 @@ ATVModSettings:
       type: string
     videoFileName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -61,10 +64,10 @@ ATVModSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer 
+      type: integer
-           
+
 ATVModReport:
   description: ATVMod
   properties:
@@ -74,4 +77,3 @@ ATVModReport:
       format: float
     channelSampleRate:
       type: integer
-   

swagger/sdrangel/api/swagger/include/BFMDemod.yaml

@@ -30,6 +30,9 @@ BFMDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/DSDDemod.yaml

@@ -54,6 +54,9 @@ DSDDemodSettings:
     traceDecay:
       description: 0 to 255
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/FileSource.yaml

@@ -17,6 +17,9 @@ FileSourceSettings:
       type: integer
     title:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml

@@ -28,6 +28,9 @@ FreeDVDemodSettings:
       type: string
     freeDVMode:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/FreeDVMod.yaml

@@ -27,7 +27,10 @@ FreeDVModSettings:
     modAFInput:
       type: integer
     gaugeInputElseModem:
-      type: integer      
+      type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/FreqTracker.yaml

@@ -41,6 +41,9 @@ FreqTrackerSettings:
     squelchGate:
       description: Squelch trigger gate in 10s of ms
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/LocalSink.yaml

@@ -12,6 +12,9 @@ LocalSinkSettings:
       type: integer
     filterChainHash:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/LocalSource.yaml

@@ -12,6 +12,9 @@ LocalSourceSettings:
       type: integer
     filterChainHash:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/NFMDemod.yaml

@@ -41,6 +41,9 @@ NFMDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/NFMMod.yaml

@@ -32,9 +32,12 @@ NFMModSettings:
     title:
       type: string
     audioDeviceName:
-      type: string      
+      type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -43,12 +46,12 @@ NFMModSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer     
+      type: integer
     cwKeyer:
       $ref: "http://localhost:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
-    
+
 NFMModReport:
   description: NFMMod
   properties:
@@ -60,4 +63,3 @@ NFMModReport:
       type: integer
     channelSampleRate:
       type: integer
-    

swagger/sdrangel/api/swagger/include/RemoteSink.yaml

@@ -21,6 +21,9 @@ RemoteSinkSettings:
       type: integer
     filterChainHash:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/RemoteSource.yaml

@@ -8,9 +8,12 @@ RemoteSourceSettings:
       description: "Remote USB data port"
       type: integer
     rgbColor:
-      type: integer                  
+      type: integer
     title:
-      type: string      
+      type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -19,10 +22,10 @@ RemoteSourceSettings:
     reverseAPIPort:
       type: integer
     reverseAPIDeviceIndex:
-      type: integer      
+      type: integer
     reverseAPIChannelIndex:
-      type: integer 
+      type: integer
-      
+
 RemoteSourceReport:
   description: "Remote channel source report"
   properties:
@@ -46,7 +49,7 @@ RemoteSourceReport:
       type: integer
     tvUSec:
       description: "Counts timestamp microseconds"
-      type: integer     
+      type: integer
     nbOriginalBlocks:
       description: "Number of original blocks per frame"
       type: integer
@@ -58,11 +61,10 @@ RemoteSourceReport:
       type: integer
     sampleRate:
       description: "Stream nominal sample rate in S/s"
-      type: integer     
+      type: integer
     deviceCenterFreq:
       description: "Device center frequency in kHz"
       type: integer
     deviceSampleRate:
       description: "Device baseband sample rate in S/s"
-      type: integer     
+      type: integer
-      

swagger/sdrangel/api/swagger/include/SSBDemod.yaml

@@ -48,6 +48,9 @@ SSBDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/SSBMod.yaml

@@ -40,6 +40,9 @@ SSBModSettings:
       type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/UDPSink.yaml

@@ -55,6 +55,9 @@ UDPSinkSettings:
       type: integer
     title:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/UDPSource.yaml

@@ -49,6 +49,9 @@ UDPSourceSettings:
       format: uint16
     title:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/WFMDemod.yaml

@@ -25,6 +25,9 @@ WFMDemodSettings:
       type: string
     audioDeviceName:
       type: string
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/WFMMod.yaml

@@ -31,6 +31,9 @@ WFMModSettings:
       type: string
     modAFInput:
       type: integer
+    streamIndex:
+      description: MIMO channel. Not relevant when connected to SI (single Rx).
+      type: integer
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/code/qt5/client/SWGAMModSettings.cpp

@@ -50,6 +50,8 @@ SWGAMModSettings::SWGAMModSettings() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -92,6 +94,8 @@ SWGAMModSettings::init() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -124,6 +128,7 @@ SWGAMModSettings::cleanup() {
     }
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -168,6 +173,8 @@ SWGAMModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&mod_af_input, pJson["modAFInput"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -229,6 +236,9 @@ SWGAMModSettings::asJsonObject() {
     if(m_mod_af_input_isSet){
         obj->insert("modAFInput", QJsonValue(mod_af_input));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -361,6 +371,16 @@ SWGAMModSettings::setModAfInput(qint32 mod_af_input) {
     this->m_mod_af_input_isSet = true;
 }
 
+qint32
+SWGAMModSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGAMModSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGAMModSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -459,6 +479,9 @@ SWGAMModSettings::isSet(){
         if(m_mod_af_input_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGAMModSettings.h

@@ -76,6 +76,9 @@ public:
     qint32 getModAfInput();
     void setModAfInput(qint32 mod_af_input);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -131,6 +134,9 @@ private:
     qint32 mod_af_input;
     bool m_mod_af_input_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGATVModSettings.cpp

@@ -74,6 +74,8 @@ SWGATVModSettings::SWGATVModSettings() {
     m_image_file_name_isSet = false;
     video_file_name = nullptr;
     m_video_file_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -138,6 +140,8 @@ SWGATVModSettings::init() {
     m_image_file_name_isSet = false;
     video_file_name = new QString("");
     m_video_file_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -184,6 +188,7 @@ SWGATVModSettings::cleanup() {
         delete video_file_name;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -249,6 +254,8 @@ SWGATVModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&video_file_name, pJson["videoFileName"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -344,6 +351,9 @@ SWGATVModSettings::asJsonObject() {
     if(video_file_name != nullptr && *video_file_name != QString("")){
         toJsonValue(QString("videoFileName"), video_file_name, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -593,6 +603,16 @@ SWGATVModSettings::setVideoFileName(QString* video_file_name) {
     this->m_video_file_name_isSet = true;
 }
 
+qint32
+SWGATVModSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGATVModSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGATVModSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -717,6 +737,9 @@ SWGATVModSettings::isSet(){
         if(video_file_name && *video_file_name != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGATVModSettings.h

@@ -111,6 +111,9 @@ public:
     QString* getVideoFileName();
     void setVideoFileName(QString* video_file_name);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -199,6 +202,9 @@ private:
     QString* video_file_name;
     bool m_video_file_name_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp

@@ -52,6 +52,8 @@ SWGBFMDemodSettings::SWGBFMDemodSettings() {
     m_title_isSet = false;
     audio_device_name = nullptr;
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -94,6 +96,8 @@ SWGBFMDemodSettings::init() {
     m_title_isSet = false;
     audio_device_name = new QString("");
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -125,6 +129,7 @@ SWGBFMDemodSettings::cleanup() {
         delete audio_device_name;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -168,6 +173,8 @@ SWGBFMDemodSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -230,6 +237,9 @@ SWGBFMDemodSettings::asJsonObject() {
     if(audio_device_name != nullptr && *audio_device_name != QString("")){
         toJsonValue(QString("audioDeviceName"), audio_device_name, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -369,6 +379,16 @@ SWGBFMDemodSettings::setAudioDeviceName(QString* audio_device_name) {
     this->m_audio_device_name_isSet = true;
 }
 
+qint32
+SWGBFMDemodSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGBFMDemodSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGBFMDemodSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -460,6 +480,9 @@ SWGBFMDemodSettings::isSet(){
         if(audio_device_name && *audio_device_name != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.h

@@ -78,6 +78,9 @@ public:
     QString* getAudioDeviceName();
     void setAudioDeviceName(QString* audio_device_name);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -133,6 +136,9 @@ private:
     QString* audio_device_name;
     bool m_audio_device_name_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp

@@ -72,6 +72,8 @@ SWGDSDDemodSettings::SWGDSDDemodSettings() {
     m_trace_stroke_isSet = false;
     trace_decay = 0;
     m_trace_decay_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -134,6 +136,8 @@ SWGDSDDemodSettings::init() {
     m_trace_stroke_isSet = false;
     trace_decay = 0;
     m_trace_decay_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -175,6 +179,7 @@ SWGDSDDemodSettings::cleanup() {
 
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -238,6 +243,8 @@ SWGDSDDemodSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&trace_decay, pJson["traceDecay"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -330,6 +337,9 @@ SWGDSDDemodSettings::asJsonObject() {
     if(m_trace_decay_isSet){
         obj->insert("traceDecay", QJsonValue(trace_decay));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -569,6 +579,16 @@ SWGDSDDemodSettings::setTraceDecay(qint32 trace_decay) {
     this->m_trace_decay_isSet = true;
 }
 
+qint32
+SWGDSDDemodSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGDSDDemodSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGDSDDemodSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -690,6 +710,9 @@ SWGDSDDemodSettings::isSet(){
         if(m_trace_decay_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h

@@ -108,6 +108,9 @@ public:
     qint32 getTraceDecay();
     void setTraceDecay(qint32 trace_decay);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -193,6 +196,9 @@ private:
     qint32 trace_decay;
     bool m_trace_decay_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp

@@ -42,6 +42,8 @@ SWGFileSourceSettings::SWGFileSourceSettings() {
     m_rgb_color_isSet = false;
     title = nullptr;
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -74,6 +76,8 @@ SWGFileSourceSettings::init() {
     m_rgb_color_isSet = false;
     title = new QString("");
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -100,6 +104,7 @@ SWGFileSourceSettings::cleanup() {
         delete title;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -133,6 +138,8 @@ SWGFileSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -180,6 +187,9 @@ SWGFileSourceSettings::asJsonObject() {
     if(title != nullptr && *title != QString("")){
         toJsonValue(QString("title"), title, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -269,6 +279,16 @@ SWGFileSourceSettings::setTitle(QString* title) {
     this->m_title_isSet = true;
 }
 
+qint32
+SWGFileSourceSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGFileSourceSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGFileSourceSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -345,6 +365,9 @@ SWGFileSourceSettings::isSet(){
         if(title && *title != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h

@@ -63,6 +63,9 @@ public:
     QString* getTitle();
     void setTitle(QString* title);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -103,6 +106,9 @@ private:
     QString* title;
     bool m_title_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp

@@ -48,6 +48,8 @@ SWGFreeDVDemodSettings::SWGFreeDVDemodSettings() {
     m_audio_device_name_isSet = false;
     free_dv_mode = 0;
     m_free_dv_mode_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -86,6 +88,8 @@ SWGFreeDVDemodSettings::init() {
     m_audio_device_name_isSet = false;
     free_dv_mode = 0;
     m_free_dv_mode_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -115,6 +119,7 @@ SWGFreeDVDemodSettings::cleanup() {
     }
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -154,6 +159,8 @@ SWGFreeDVDemodSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&free_dv_mode, pJson["freeDVMode"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -210,6 +217,9 @@ SWGFreeDVDemodSettings::asJsonObject() {
     if(m_free_dv_mode_isSet){
         obj->insert("freeDVMode", QJsonValue(free_dv_mode));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -329,6 +339,16 @@ SWGFreeDVDemodSettings::setFreeDvMode(qint32 free_dv_mode) {
     this->m_free_dv_mode_isSet = true;
 }
 
+qint32
+SWGFreeDVDemodSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGFreeDVDemodSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGFreeDVDemodSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -414,6 +434,9 @@ SWGFreeDVDemodSettings::isSet(){
         if(m_free_dv_mode_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h

@@ -72,6 +72,9 @@ public:
     qint32 getFreeDvMode();
     void setFreeDvMode(qint32 free_dv_mode);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -121,6 +124,9 @@ private:
     qint32 free_dv_mode;
     bool m_free_dv_mode_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.cpp

@@ -52,6 +52,8 @@ SWGFreeDVModSettings::SWGFreeDVModSettings() {
     m_mod_af_input_isSet = false;
     gauge_input_else_modem = 0;
     m_gauge_input_else_modem_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -96,6 +98,8 @@ SWGFreeDVModSettings::init() {
     m_mod_af_input_isSet = false;
     gauge_input_else_modem = 0;
     m_gauge_input_else_modem_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -129,6 +133,7 @@ SWGFreeDVModSettings::cleanup() {
 
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -175,6 +180,8 @@ SWGFreeDVModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&gauge_input_else_modem, pJson["gaugeInputElseModem"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -239,6 +246,9 @@ SWGFreeDVModSettings::asJsonObject() {
     if(m_gauge_input_else_modem_isSet){
         obj->insert("gaugeInputElseModem", QJsonValue(gauge_input_else_modem));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -381,6 +391,16 @@ SWGFreeDVModSettings::setGaugeInputElseModem(qint32 gauge_input_else_modem) {
     this->m_gauge_input_else_modem_isSet = true;
 }
 
+qint32
+SWGFreeDVModSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGFreeDVModSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGFreeDVModSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -482,6 +502,9 @@ SWGFreeDVModSettings::isSet(){
         if(m_gauge_input_else_modem_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGFreeDVModSettings.h

@@ -79,6 +79,9 @@ public:
     qint32 getGaugeInputElseModem();
     void setGaugeInputElseModem(qint32 gauge_input_else_modem);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -137,6 +140,9 @@ private:
     qint32 gauge_input_else_modem;
     bool m_gauge_input_else_modem_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp

@@ -54,6 +54,8 @@ SWGFreqTrackerSettings::SWGFreqTrackerSettings() {
     m_rrc_rolloff_isSet = false;
     squelch_gate = 0;
     m_squelch_gate_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -98,6 +100,8 @@ SWGFreqTrackerSettings::init() {
     m_rrc_rolloff_isSet = false;
     squelch_gate = 0;
     m_squelch_gate_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -128,6 +132,7 @@ SWGFreqTrackerSettings::cleanup() {
 
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -173,6 +178,8 @@ SWGFreqTrackerSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&squelch_gate, pJson["squelchGate"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -238,6 +245,9 @@ SWGFreqTrackerSettings::asJsonObject() {
     if(m_squelch_gate_isSet){
         obj->insert("squelchGate", QJsonValue(squelch_gate));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -387,6 +397,16 @@ SWGFreqTrackerSettings::setSquelchGate(qint32 squelch_gate) {
     this->m_squelch_gate_isSet = true;
 }
 
+qint32
+SWGFreqTrackerSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGFreqTrackerSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGFreqTrackerSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -481,6 +501,9 @@ SWGFreqTrackerSettings::isSet(){
         if(m_squelch_gate_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.h

@@ -81,6 +81,9 @@ public:
     qint32 getSquelchGate();
     void setSquelchGate(qint32 squelch_gate);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -139,6 +142,9 @@ private:
     qint32 squelch_gate;
     bool m_squelch_gate_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp

@@ -38,6 +38,8 @@ SWGLocalSinkSettings::SWGLocalSinkSettings() {
     m_log2_decim_isSet = false;
     filter_chain_hash = 0;
     m_filter_chain_hash_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -66,6 +68,8 @@ SWGLocalSinkSettings::init() {
     m_log2_decim_isSet = false;
     filter_chain_hash = 0;
     m_filter_chain_hash_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -88,6 +92,7 @@ SWGLocalSinkSettings::cleanup() {
 
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -117,6 +122,8 @@ SWGLocalSinkSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&filter_chain_hash, pJson["filterChainHash"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -158,6 +165,9 @@ SWGLocalSinkSettings::asJsonObject() {
     if(m_filter_chain_hash_isSet){
         obj->insert("filterChainHash", QJsonValue(filter_chain_hash));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -227,6 +237,16 @@ SWGLocalSinkSettings::setFilterChainHash(qint32 filter_chain_hash) {
     this->m_filter_chain_hash_isSet = true;
 }
 
+qint32
+SWGLocalSinkSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGLocalSinkSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGLocalSinkSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -297,6 +317,9 @@ SWGLocalSinkSettings::isSet(){
         if(m_filter_chain_hash_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.h

@@ -57,6 +57,9 @@ public:
     qint32 getFilterChainHash();
     void setFilterChainHash(qint32 filter_chain_hash);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -91,6 +94,9 @@ private:
     qint32 filter_chain_hash;
     bool m_filter_chain_hash_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.cpp

@@ -38,6 +38,8 @@ SWGLocalSourceSettings::SWGLocalSourceSettings() {
     m_log2_interp_isSet = false;
     filter_chain_hash = 0;
     m_filter_chain_hash_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -66,6 +68,8 @@ SWGLocalSourceSettings::init() {
     m_log2_interp_isSet = false;
     filter_chain_hash = 0;
     m_filter_chain_hash_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -88,6 +92,7 @@ SWGLocalSourceSettings::cleanup() {
 
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -117,6 +122,8 @@ SWGLocalSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&filter_chain_hash, pJson["filterChainHash"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -158,6 +165,9 @@ SWGLocalSourceSettings::asJsonObject() {
     if(m_filter_chain_hash_isSet){
         obj->insert("filterChainHash", QJsonValue(filter_chain_hash));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -227,6 +237,16 @@ SWGLocalSourceSettings::setFilterChainHash(qint32 filter_chain_hash) {
     this->m_filter_chain_hash_isSet = true;
 }
 
+qint32
+SWGLocalSourceSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGLocalSourceSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGLocalSourceSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -297,6 +317,9 @@ SWGLocalSourceSettings::isSet(){
         if(m_filter_chain_hash_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGLocalSourceSettings.h

@@ -57,6 +57,9 @@ public:
     qint32 getFilterChainHash();
     void setFilterChainHash(qint32 filter_chain_hash);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -91,6 +94,9 @@ private:
     qint32 filter_chain_hash;
     bool m_filter_chain_hash_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp

@@ -58,6 +58,8 @@ SWGNFMDemodSettings::SWGNFMDemodSettings() {
     m_title_isSet = false;
     audio_device_name = nullptr;
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -106,6 +108,8 @@ SWGNFMDemodSettings::init() {
     m_title_isSet = false;
     audio_device_name = new QString("");
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -140,6 +144,7 @@ SWGNFMDemodSettings::cleanup() {
         delete audio_device_name;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -189,6 +194,8 @@ SWGNFMDemodSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -260,6 +267,9 @@ SWGNFMDemodSettings::asJsonObject() {
     if(audio_device_name != nullptr && *audio_device_name != QString("")){
         toJsonValue(QString("audioDeviceName"), audio_device_name, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -429,6 +439,16 @@ SWGNFMDemodSettings::setAudioDeviceName(QString* audio_device_name) {
     this->m_audio_device_name_isSet = true;
 }
 
+qint32
+SWGNFMDemodSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGNFMDemodSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGNFMDemodSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -529,6 +549,9 @@ SWGNFMDemodSettings::isSet(){
         if(audio_device_name && *audio_device_name != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.h

@@ -87,6 +87,9 @@ public:
     QString* getAudioDeviceName();
     void setAudioDeviceName(QString* audio_device_name);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -151,6 +154,9 @@ private:
     QString* audio_device_name;
     bool m_audio_device_name_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGNFMModSettings.cpp

@@ -56,6 +56,8 @@ SWGNFMModSettings::SWGNFMModSettings() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -104,6 +106,8 @@ SWGNFMModSettings::init() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -139,6 +143,7 @@ SWGNFMModSettings::cleanup() {
     }
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -189,6 +194,8 @@ SWGNFMModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&mod_af_input, pJson["modAFInput"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -259,6 +266,9 @@ SWGNFMModSettings::asJsonObject() {
     if(m_mod_af_input_isSet){
         obj->insert("modAFInput", QJsonValue(mod_af_input));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -421,6 +431,16 @@ SWGNFMModSettings::setModAfInput(qint32 mod_af_input) {
     this->m_mod_af_input_isSet = true;
 }
 
+qint32
+SWGNFMModSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGNFMModSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGNFMModSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -528,6 +548,9 @@ SWGNFMModSettings::isSet(){
         if(m_mod_af_input_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGNFMModSettings.h

@@ -85,6 +85,9 @@ public:
     qint32 getModAfInput();
     void setModAfInput(qint32 mod_af_input);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -149,6 +152,9 @@ private:
     qint32 mod_af_input;
     bool m_mod_af_input_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp

@@ -44,6 +44,8 @@ SWGRemoteSinkSettings::SWGRemoteSinkSettings() {
     m_log2_decim_isSet = false;
     filter_chain_hash = 0;
     m_filter_chain_hash_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -78,6 +80,8 @@ SWGRemoteSinkSettings::init() {
     m_log2_decim_isSet = false;
     filter_chain_hash = 0;
     m_filter_chain_hash_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -105,6 +109,7 @@ SWGRemoteSinkSettings::cleanup() {
 
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -140,6 +145,8 @@ SWGRemoteSinkSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&filter_chain_hash, pJson["filterChainHash"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -190,6 +197,9 @@ SWGRemoteSinkSettings::asJsonObject() {
     if(m_filter_chain_hash_isSet){
         obj->insert("filterChainHash", QJsonValue(filter_chain_hash));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -289,6 +299,16 @@ SWGRemoteSinkSettings::setFilterChainHash(qint32 filter_chain_hash) {
     this->m_filter_chain_hash_isSet = true;
 }
 
+qint32
+SWGRemoteSinkSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGRemoteSinkSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGRemoteSinkSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -368,6 +388,9 @@ SWGRemoteSinkSettings::isSet(){
         if(m_filter_chain_hash_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.h

@@ -66,6 +66,9 @@ public:
     qint32 getFilterChainHash();
     void setFilterChainHash(qint32 filter_chain_hash);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -109,6 +112,9 @@ private:
     qint32 filter_chain_hash;
     bool m_filter_chain_hash_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.cpp

@@ -36,6 +36,8 @@ SWGRemoteSourceSettings::SWGRemoteSourceSettings() {
     m_rgb_color_isSet = false;
     title = nullptr;
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -62,6 +64,8 @@ SWGRemoteSourceSettings::init() {
     m_rgb_color_isSet = false;
     title = new QString("");
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -85,6 +89,7 @@ SWGRemoteSourceSettings::cleanup() {
         delete title;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -112,6 +117,8 @@ SWGRemoteSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -150,6 +157,9 @@ SWGRemoteSourceSettings::asJsonObject() {
     if(title != nullptr && *title != QString("")){
         toJsonValue(QString("title"), title, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -209,6 +219,16 @@ SWGRemoteSourceSettings::setTitle(QString* title) {
     this->m_title_isSet = true;
 }
 
+qint32
+SWGRemoteSourceSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGRemoteSourceSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGRemoteSourceSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -276,6 +296,9 @@ SWGRemoteSourceSettings::isSet(){
         if(title && *title != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGRemoteSourceSettings.h

@@ -54,6 +54,9 @@ public:
     QString* getTitle();
     void setTitle(QString* title);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -85,6 +88,9 @@ private:
     QString* title;
     bool m_title_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp

@@ -62,6 +62,8 @@ SWGSSBDemodSettings::SWGSSBDemodSettings() {
     m_title_isSet = false;
     audio_device_name = nullptr;
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -114,6 +116,8 @@ SWGSSBDemodSettings::init() {
     m_title_isSet = false;
     audio_device_name = new QString("");
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -150,6 +154,7 @@ SWGSSBDemodSettings::cleanup() {
         delete audio_device_name;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -203,6 +208,8 @@ SWGSSBDemodSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -280,6 +287,9 @@ SWGSSBDemodSettings::asJsonObject() {
     if(audio_device_name != nullptr && *audio_device_name != QString("")){
         toJsonValue(QString("audioDeviceName"), audio_device_name, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -469,6 +479,16 @@ SWGSSBDemodSettings::setAudioDeviceName(QString* audio_device_name) {
     this->m_audio_device_name_isSet = true;
 }
 
+qint32
+SWGSSBDemodSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGSSBDemodSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGSSBDemodSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -575,6 +595,9 @@ SWGSSBDemodSettings::isSet(){
         if(audio_device_name && *audio_device_name != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.h

@@ -93,6 +93,9 @@ public:
     QString* getAudioDeviceName();
     void setAudioDeviceName(QString* audio_device_name);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -163,6 +166,9 @@ private:
     QString* audio_device_name;
     bool m_audio_device_name_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGSSBModSettings.cpp

@@ -62,6 +62,8 @@ SWGSSBModSettings::SWGSSBModSettings() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -116,6 +118,8 @@ SWGSSBModSettings::init() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -154,6 +158,7 @@ SWGSSBModSettings::cleanup() {
     }
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -210,6 +215,8 @@ SWGSSBModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&mod_af_input, pJson["modAFInput"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -289,6 +296,9 @@ SWGSSBModSettings::asJsonObject() {
     if(m_mod_af_input_isSet){
         obj->insert("modAFInput", QJsonValue(mod_af_input));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -481,6 +491,16 @@ SWGSSBModSettings::setModAfInput(qint32 mod_af_input) {
     this->m_mod_af_input_isSet = true;
 }
 
+qint32
+SWGSSBModSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGSSBModSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGSSBModSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -597,6 +617,9 @@ SWGSSBModSettings::isSet(){
         if(m_mod_af_input_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGSSBModSettings.h

@@ -94,6 +94,9 @@ public:
     qint32 getModAfInput();
     void setModAfInput(qint32 mod_af_input);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -167,6 +170,9 @@ private:
     qint32 mod_af_input;
     bool m_mod_af_input_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp

@@ -66,6 +66,8 @@ SWGUDPSinkSettings::SWGUDPSinkSettings() {
     m_rgb_color_isSet = false;
     title = nullptr;
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -122,6 +124,8 @@ SWGUDPSinkSettings::init() {
     m_rgb_color_isSet = false;
     title = new QString("");
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -160,6 +164,7 @@ SWGUDPSinkSettings::cleanup() {
         delete title;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -217,6 +222,8 @@ SWGUDPSinkSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -300,6 +307,9 @@ SWGUDPSinkSettings::asJsonObject() {
     if(title != nullptr && *title != QString("")){
         toJsonValue(QString("title"), title, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -509,6 +519,16 @@ SWGUDPSinkSettings::setTitle(QString* title) {
     this->m_title_isSet = true;
 }
 
+qint32
+SWGUDPSinkSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGUDPSinkSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGUDPSinkSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -621,6 +641,9 @@ SWGUDPSinkSettings::isSet(){
         if(title && *title != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h

@@ -99,6 +99,9 @@ public:
     QString* getTitle();
     void setTitle(QString* title);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -175,6 +178,9 @@ private:
     QString* title;
     bool m_title_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.cpp

@@ -66,6 +66,8 @@ SWGUDPSourceSettings::SWGUDPSourceSettings() {
     m_udp_port_isSet = false;
     title = nullptr;
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -122,6 +124,8 @@ SWGUDPSourceSettings::init() {
     m_udp_port_isSet = false;
     title = new QString("");
     m_title_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -160,6 +164,7 @@ SWGUDPSourceSettings::cleanup() {
         delete title;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -217,6 +222,8 @@ SWGUDPSourceSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -300,6 +307,9 @@ SWGUDPSourceSettings::asJsonObject() {
     if(title != nullptr && *title != QString("")){
         toJsonValue(QString("title"), title, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -509,6 +519,16 @@ SWGUDPSourceSettings::setTitle(QString* title) {
     this->m_title_isSet = true;
 }
 
+qint32
+SWGUDPSourceSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGUDPSourceSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGUDPSourceSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -621,6 +641,9 @@ SWGUDPSourceSettings::isSet(){
         if(title && *title != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGUDPSourceSettings.h

@@ -99,6 +99,9 @@ public:
     QString* getTitle();
     void setTitle(QString* title);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -175,6 +178,9 @@ private:
     QString* title;
     bool m_title_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp

@@ -46,6 +46,8 @@ SWGWFMDemodSettings::SWGWFMDemodSettings() {
     m_title_isSet = false;
     audio_device_name = nullptr;
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -82,6 +84,8 @@ SWGWFMDemodSettings::init() {
     m_title_isSet = false;
     audio_device_name = new QString("");
     m_audio_device_name_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -110,6 +114,7 @@ SWGWFMDemodSettings::cleanup() {
         delete audio_device_name;
     }
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -147,6 +152,8 @@ SWGWFMDemodSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -200,6 +207,9 @@ SWGWFMDemodSettings::asJsonObject() {
     if(audio_device_name != nullptr && *audio_device_name != QString("")){
         toJsonValue(QString("audioDeviceName"), audio_device_name, obj, QString("QString"));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -309,6 +319,16 @@ SWGWFMDemodSettings::setAudioDeviceName(QString* audio_device_name) {
     this->m_audio_device_name_isSet = true;
 }
 
+qint32
+SWGWFMDemodSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGWFMDemodSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGWFMDemodSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -391,6 +411,9 @@ SWGWFMDemodSettings::isSet(){
         if(audio_device_name && *audio_device_name != QString("")){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.h

@@ -69,6 +69,9 @@ public:
     QString* getAudioDeviceName();
     void setAudioDeviceName(QString* audio_device_name);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -115,6 +118,9 @@ private:
     QString* audio_device_name;
     bool m_audio_device_name_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

swagger/sdrangel/code/qt5/client/SWGWFMModSettings.cpp

@@ -52,6 +52,8 @@ SWGWFMModSettings::SWGWFMModSettings() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -96,6 +98,8 @@ SWGWFMModSettings::init() {
     m_audio_device_name_isSet = false;
     mod_af_input = 0;
     m_mod_af_input_isSet = false;
+    stream_index = 0;
+    m_stream_index_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -129,6 +133,7 @@ SWGWFMModSettings::cleanup() {
     }
 
 
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -175,6 +180,8 @@ SWGWFMModSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&mod_af_input, pJson["modAFInput"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -239,6 +246,9 @@ SWGWFMModSettings::asJsonObject() {
     if(m_mod_af_input_isSet){
         obj->insert("modAFInput", QJsonValue(mod_af_input));
     }
+    if(m_stream_index_isSet){
+        obj->insert("streamIndex", QJsonValue(stream_index));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -381,6 +391,16 @@ SWGWFMModSettings::setModAfInput(qint32 mod_af_input) {
     this->m_mod_af_input_isSet = true;
 }
 
+qint32
+SWGWFMModSettings::getStreamIndex() {
+    return stream_index;
+}
+void
+SWGWFMModSettings::setStreamIndex(qint32 stream_index) {
+    this->stream_index = stream_index;
+    this->m_stream_index_isSet = true;
+}
+
 qint32
 SWGWFMModSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -482,6 +502,9 @@ SWGWFMModSettings::isSet(){
         if(m_mod_af_input_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_stream_index_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

swagger/sdrangel/code/qt5/client/SWGWFMModSettings.h

@@ -79,6 +79,9 @@ public:
     qint32 getModAfInput();
     void setModAfInput(qint32 mod_af_input);
 
+    qint32 getStreamIndex();
+    void setStreamIndex(qint32 stream_index);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -137,6 +140,9 @@ private:
     qint32 mod_af_input;
     bool m_mod_af_input_isSet;
 
+    qint32 stream_index;
+    bool m_stream_index_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;