diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index cfd22bd01..635859c5d 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1939,11 +1939,23 @@ margin-bottom: 20px;
  • instanceAudioGet
    • -
  • - instanceAudioInputSetPatch +
  • + instanceAudioInputCleanupPatch
    • -
  • - instanceAudioOutputSetPatch +
  • + instanceAudioInputDelete +
    • +
  • + instanceAudioInputPatch +
    • +
  • + instanceAudioOutputCleanupPatch +
    • +
  • + instanceAudioOutputDelete +
    • +
  • + instanceAudioOutputPatch
  • instanceChannels @@ -10803,10 +10815,775 @@ except ApiException as e:
    -
    -
    +
    +
    -

    instanceAudioInputSetPatch

    +

    instanceAudioInputCleanupPatch

    +

    +
    +
    +
    +

    +

    Remove registered parameters for devices not in list of available input devices for this instance

    +

    +
    + 
    /sdrangel/audio/input/cleanup
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/input/cleanup"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioInputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioInputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioInputCleanupPatchWithCompletionHandler: 
+              ^(SuccessResponse output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioInputCleanupPatch(callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioInputCleanupPatchExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+
+            try
+            {
+                SuccessResponse result = apiInstance.instanceAudioInputCleanupPatch();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioInputCleanupPatch: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+
+try {
+    $result = $api_instance->instanceAudioInputCleanupPatch();
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioInputCleanupPatch: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+
+eval { 
+    my $result = $api_instance->instanceAudioInputCleanupPatch();
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioInputCleanupPatch: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+
+try: 
+    api_response = api_instance.instance_audio_input_cleanup_patch()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioInputCleanupPatch: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + + + + +

    Responses

    +

    Status: 200 - Success.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioInputDelete

    +

    +
    +
    +
    +

    +

    Delete audio input device paramaters and return to defaults

    +

    +
    + 
    /sdrangel/audio/input/parameters
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X DELETE "http://localhost/sdrangel/audio/input/parameters"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+        try {
+            AudioInputDevice result = apiInstance.instanceAudioInputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+        try {
+            AudioInputDevice result = apiInstance.instanceAudioInputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    AudioInputDevice *body = ; // Audio input parameters. Index is used to identify the device.
+
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioInputDeleteWith:body
+              completionHandler: ^(AudioInputDevice output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var body = ; // {AudioInputDevice} Audio input parameters. Index is used to identify the device.
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioInputDelete(body, callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioInputDeleteExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+            var body = new AudioInputDevice(); // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+            try
+            {
+                AudioInputDevice result = apiInstance.instanceAudioInputDelete(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioInputDelete: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+$body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+try {
+    $result = $api_instance->instanceAudioInputDelete($body);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioInputDelete: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+my $body = SWGSDRangel::Object::AudioInputDevice->new(); # AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+eval { 
+    my $result = $api_instance->instanceAudioInputDelete(body => $body);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioInputDelete: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+body =  # AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+try: 
+    api_response = api_instance.instance_audio_input_delete(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioInputDelete: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + +
    Body parameters
    + + + + + + + + + +
    NameDescription
    body * + + + +
    +
    + + + +

    Responses

    +

    Status: 200 - Success. Returns default parameters.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 404 - Audio input device not found

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioInputPatch

    @@ -10815,29 +11592,29 @@ except ApiException as e:

    Set audio input device paramaters


    - 
    /sdrangel/audio/input/set
    + 
    /sdrangel/audio/input/parameters

    Usage and SDK Samples

    -
    - 
    curl -X PATCH "http://localhost/sdrangel/audio/input/set"
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/input/parameters"
    -
    + 
    import SWGSDRangel.*;
 import SWGSDRangel.auth.*;
 import SWGSDRangel.model.*;
@@ -10853,17 +11630,17 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioInputDevice result = apiInstance.instanceAudioInputSetPatch(body);
+            AudioInputDevice result = apiInstance.instanceAudioInputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioInputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    import SWGSDRangel.api.InstanceApi;
 
 public class InstanceApiExample {
@@ -10872,25 +11649,25 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioInputDevice result = apiInstance.instanceAudioInputSetPatch(body);
+            AudioInputDevice result = apiInstance.instanceAudioInputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioInputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    AudioInputDevice *body = ; // Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 InstanceApi *apiInstance = [[InstanceApi alloc] init];
 
-[apiInstance instanceAudioInputSetPatchWith:body
+[apiInstance instanceAudioInputPatchWith:body
               completionHandler: ^(AudioInputDevice output, NSError* error) {
                             if (output) {
                                 NSLog(@"%@", output);
@@ -10902,7 +11679,7 @@ InstanceApi *apiInstance = [[InstanceApi alloc] init];
    -
    + 
    var SdRangel = require('sd_rangel');
 
 var api = new SdRangel.InstanceApi()
@@ -10917,14 +11694,14 @@ var callback = function(error, data, response) {
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-api.instanceAudioInputSetPatch(body, callback);
+api.instanceAudioInputPatch(body, callback);
    - -
    + 
    using System;
 using System.Diagnostics;
 using SWGSDRangel.Api;
@@ -10933,7 +11710,7 @@ using SWGSDRangel.Model;
 
 namespace Example
 {
-    public class instanceAudioInputSetPatchExample
+    public class instanceAudioInputPatchExample
     {
         public void main()
         {
@@ -10943,12 +11720,12 @@ namespace Example
 
             try
             {
-                AudioInputDevice result = apiInstance.instanceAudioInputSetPatch(body);
+                AudioInputDevice result = apiInstance.instanceAudioInputPatch(body);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling InstanceApi.instanceAudioInputSetPatch: " + e.Message );
+                Debug.Print("Exception when calling InstanceApi.instanceAudioInputPatch: " + e.Message );
             }
         }
     }
@@ -10956,7 +11733,7 @@ namespace Example
    -
    + 
    <?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
@@ -10964,15 +11741,15 @@ $api_instance = new Swagger\Client\Api\InstanceApi();
 $body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 try {
-    $result = $api_instance->instanceAudioInputSetPatch($body);
+    $result = $api_instance->instanceAudioInputPatch($body);
     print_r($result);
 } catch (Exception $e) {
-    echo 'Exception when calling InstanceApi->instanceAudioInputSetPatch: ', $e->getMessage(), PHP_EOL;
+    echo 'Exception when calling InstanceApi->instanceAudioInputPatch: ', $e->getMessage(), PHP_EOL;
 }
 ?>
    -
    + 
    use Data::Dumper;
 use SWGSDRangel::Configuration;
 use SWGSDRangel::InstanceApi;
@@ -10981,15 +11758,15 @@ my $api_instance = SWGSDRangel::InstanceApi->new();
 my $body = SWGSDRangel::Object::AudioInputDevice->new(); # AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 eval { 
-    my $result = $api_instance->instanceAudioInputSetPatch(body => $body);
+    my $result = $api_instance->instanceAudioInputPatch(body => $body);
     print Dumper($result);
 };
 if ($@) {
-    warn "Exception when calling InstanceApi->instanceAudioInputSetPatch: $@\n";
+    warn "Exception when calling InstanceApi->instanceAudioInputPatch: $@\n";
 }
    -
    + 
    from __future__ import print_statement
 import time
 import swagger_sdrangel
@@ -11001,10 +11778,10 @@ api_instance = swagger_sdrangel.InstanceApi()
 body =  # AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 try: 
-    api_response = api_instance.instance_audio_input_set_patch(body)
+    api_response = api_instance.instance_audio_input_patch(body)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling InstanceApi->instanceAudioInputSetPatch: %s\n" % e)
    + print("Exception when calling InstanceApi->instanceAudioInputPatch: %s\n" % e)
    @@ -11044,12 +11821,12 @@ $(document).ready(function() { } var view = new JSONSchemaView(schema,2,{isBodyParam: true}); - var result = $('#d2e199_instanceAudioInputSetPatch_body'); + var result = $('#d2e199_instanceAudioInputPatch_body'); result.empty(); result.append(view.render()); }); -
    +
    @@ -11062,14 +11839,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11105,14 +11882,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11148,14 +11925,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11191,14 +11968,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    -
    -
    +
    +
    -

    instanceAudioOutputSetPatch

    +

    instanceAudioOutputCleanupPatch

    +

    +
    +
    +
    +

    +

    Remove registered parameters for devices not in list of available output devices for this instance

    +

    +
    + 
    /sdrangel/audio/output/cleanup
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/output/cleanup"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioOutputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioOutputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioOutputCleanupPatchWithCompletionHandler: 
+              ^(SuccessResponse output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioOutputCleanupPatch(callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioOutputCleanupPatchExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+
+            try
+            {
+                SuccessResponse result = apiInstance.instanceAudioOutputCleanupPatch();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputCleanupPatch: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+
+try {
+    $result = $api_instance->instanceAudioOutputCleanupPatch();
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioOutputCleanupPatch: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+
+eval { 
+    my $result = $api_instance->instanceAudioOutputCleanupPatch();
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioOutputCleanupPatch: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+
+try: 
+    api_response = api_instance.instance_audio_output_cleanup_patch()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioOutputCleanupPatch: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + + + + +

    Responses

    +

    Status: 200 - Success.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioOutputDelete

    +

    +
    +
    +
    +

    +

    Delete audio output device paramaters and return to defaults

    +

    +
    + 
    /sdrangel/audio/output/parameters
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X DELETE "http://localhost/sdrangel/audio/output/parameters"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+        try {
+            AudioOutputDevice result = apiInstance.instanceAudioOutputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+        try {
+            AudioOutputDevice result = apiInstance.instanceAudioOutputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    AudioOutputDevice *body = ; // Audio output parameters. Index is used to identify the device.
+
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioOutputDeleteWith:body
+              completionHandler: ^(AudioOutputDevice output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var body = ; // {AudioOutputDevice} Audio output parameters. Index is used to identify the device.
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioOutputDelete(body, callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioOutputDeleteExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+            var body = new AudioOutputDevice(); // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+            try
+            {
+                AudioOutputDevice result = apiInstance.instanceAudioOutputDelete(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputDelete: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+$body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+try {
+    $result = $api_instance->instanceAudioOutputDelete($body);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioOutputDelete: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+my $body = SWGSDRangel::Object::AudioOutputDevice->new(); # AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+eval { 
+    my $result = $api_instance->instanceAudioOutputDelete(body => $body);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioOutputDelete: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+body =  # AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+try: 
+    api_response = api_instance.instance_audio_output_delete(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioOutputDelete: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + +
    Body parameters
    + + + + + + + + + +
    NameDescription
    body * + + + +
    +
    + + + +

    Responses

    +

    Status: 200 - Success. Returns actual data in particular the actual sample rate.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 404 - Audio output device not found

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioOutputPatch

    @@ -11245,29 +12787,29 @@ $(document).ready(function() {

    Set audio output device parameters


    - 
    /sdrangel/audio/output/set
    + 
    /sdrangel/audio/output/parameters

    Usage and SDK Samples

    -
    - 
    curl -X PATCH "http://localhost/sdrangel/audio/output/set"
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/output/parameters"
    -
    + 
    import SWGSDRangel.*;
 import SWGSDRangel.auth.*;
 import SWGSDRangel.model.*;
@@ -11283,17 +12825,17 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioOutputDevice result = apiInstance.instanceAudioOutputSetPatch(body);
+            AudioOutputDevice result = apiInstance.instanceAudioOutputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioOutputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    import SWGSDRangel.api.InstanceApi;
 
 public class InstanceApiExample {
@@ -11302,25 +12844,25 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioOutputDevice result = apiInstance.instanceAudioOutputSetPatch(body);
+            AudioOutputDevice result = apiInstance.instanceAudioOutputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioOutputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    AudioOutputDevice *body = ; // Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 InstanceApi *apiInstance = [[InstanceApi alloc] init];
 
-[apiInstance instanceAudioOutputSetPatchWith:body
+[apiInstance instanceAudioOutputPatchWith:body
               completionHandler: ^(AudioOutputDevice output, NSError* error) {
                             if (output) {
                                 NSLog(@"%@", output);
@@ -11332,7 +12874,7 @@ InstanceApi *apiInstance = [[InstanceApi alloc] init];
    -
    + 
    var SdRangel = require('sd_rangel');
 
 var api = new SdRangel.InstanceApi()
@@ -11347,14 +12889,14 @@ var callback = function(error, data, response) {
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-api.instanceAudioOutputSetPatch(body, callback);
+api.instanceAudioOutputPatch(body, callback);
    - -
    + 
    using System;
 using System.Diagnostics;
 using SWGSDRangel.Api;
@@ -11363,7 +12905,7 @@ using SWGSDRangel.Model;
 
 namespace Example
 {
-    public class instanceAudioOutputSetPatchExample
+    public class instanceAudioOutputPatchExample
     {
         public void main()
         {
@@ -11373,12 +12915,12 @@ namespace Example
 
             try
             {
-                AudioOutputDevice result = apiInstance.instanceAudioOutputSetPatch(body);
+                AudioOutputDevice result = apiInstance.instanceAudioOutputPatch(body);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputSetPatch: " + e.Message );
+                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputPatch: " + e.Message );
             }
         }
     }
@@ -11386,7 +12928,7 @@ namespace Example
    -
    + 
    <?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
@@ -11394,15 +12936,15 @@ $api_instance = new Swagger\Client\Api\InstanceApi();
 $body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 try {
-    $result = $api_instance->instanceAudioOutputSetPatch($body);
+    $result = $api_instance->instanceAudioOutputPatch($body);
     print_r($result);
 } catch (Exception $e) {
-    echo 'Exception when calling InstanceApi->instanceAudioOutputSetPatch: ', $e->getMessage(), PHP_EOL;
+    echo 'Exception when calling InstanceApi->instanceAudioOutputPatch: ', $e->getMessage(), PHP_EOL;
 }
 ?>
    -
    + 
    use Data::Dumper;
 use SWGSDRangel::Configuration;
 use SWGSDRangel::InstanceApi;
@@ -11411,15 +12953,15 @@ my $api_instance = SWGSDRangel::InstanceApi->new();
 my $body = SWGSDRangel::Object::AudioOutputDevice->new(); # AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 eval { 
-    my $result = $api_instance->instanceAudioOutputSetPatch(body => $body);
+    my $result = $api_instance->instanceAudioOutputPatch(body => $body);
     print Dumper($result);
 };
 if ($@) {
-    warn "Exception when calling InstanceApi->instanceAudioOutputSetPatch: $@\n";
+    warn "Exception when calling InstanceApi->instanceAudioOutputPatch: $@\n";
 }
    -
    + 
    from __future__ import print_statement
 import time
 import swagger_sdrangel
@@ -11431,10 +12973,10 @@ api_instance = swagger_sdrangel.InstanceApi()
 body =  # AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 try: 
-    api_response = api_instance.instance_audio_output_set_patch(body)
+    api_response = api_instance.instance_audio_output_patch(body)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling InstanceApi->instanceAudioOutputSetPatch: %s\n" % e)
    + print("Exception when calling InstanceApi->instanceAudioOutputPatch: %s\n" % e)
    @@ -11474,12 +13016,12 @@ $(document).ready(function() { } var view = new JSONSchemaView(schema,2,{isBodyParam: true}); - var result = $('#d2e199_instanceAudioOutputSetPatch_body'); + var result = $('#d2e199_instanceAudioOutputPatch_body'); result.empty(); result.append(view.render()); }); -
    +
    @@ -11492,14 +13034,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11535,14 +13077,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11578,14 +13120,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11621,14 +13163,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -18555,7 +20097,7 @@ except ApiException as e:
    - Generated 2018-03-29T00:32:59.208+02:00 + Generated 2018-03-29T01:40:29.446+02:00
    diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 275ad9e2b..052ee876b 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -182,11 +182,12 @@ paths: $ref: "#/responses/Response_500" "501": $ref: "#/responses/Response_501" - /sdrangel/audio/input/set: + + /sdrangel/audio/input/parameters: x-swagger-router-controller: instance patch: description: Set audio input device paramaters - operationId: instanceAudioInputSetPatch + operationId: instanceAudioInputPatch tags: - Instance consumes: @@ -211,12 +212,57 @@ paths: $ref: "#/responses/Response_500" "501": $ref: "#/responses/Response_501" + delete: + description: Delete audio input device paramaters and return to defaults + operationId: instanceAudioInputDelete + tags: + - Instance + consumes: + - application/json + parameters: + - name: body + in: body + description: Audio input parameters. Index is used to identify the device. + required: true + schema: + $ref: "#/definitions/AudioInputDevice" + responses: + "200": + description: Success. Returns default parameters. + schema: + $ref: "#/definitions/AudioInputDevice" + "404": + description: Audio input device not found + schema: + $ref: "#/definitions/ErrorResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" - /sdrangel/audio/output/set: + + /sdrangel/audio/input/cleanup: + x-swagger-router-controller: instance + patch: + description: Remove registered parameters for devices not in list of available input devices for this instance + operationId: instanceAudioInputCleanupPatch + tags: + - Instance + responses: + "200": + description: Success. + schema: + $ref: "#/definitions/SuccessResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" + + /sdrangel/audio/output/parameters: x-swagger-router-controller: instance patch: description: Set audio output device parameters - operationId: instanceAudioOutputSetPatch + operationId: instanceAudioOutputPatch tags: - Instance consumes: @@ -241,6 +287,50 @@ paths: $ref: "#/responses/Response_500" "501": $ref: "#/responses/Response_501" + delete: + description: Delete audio output device paramaters and return to defaults + operationId: instanceAudioOutputDelete + tags: + - Instance + consumes: + - application/json + parameters: + - name: body + in: body + description: Audio output parameters. Index is used to identify the device. + required: true + schema: + $ref: "#/definitions/AudioOutputDevice" + responses: + "200": + description: Success. Returns actual data in particular the actual sample rate. + schema: + $ref: "#/definitions/AudioOutputDevice" + "404": + description: Audio output device not found + schema: + $ref: "#/definitions/ErrorResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" + + /sdrangel/audio/output/cleanup: + x-swagger-router-controller: instance + patch: + description: Remove registered parameters for devices not in list of available output devices for this instance + operationId: instanceAudioOutputCleanupPatch + tags: + - Instance + responses: + "200": + description: Success. + schema: + $ref: "#/definitions/SuccessResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" /sdrangel/location: x-swagger-router-controller: instance diff --git a/sdrbase/webapi/webapiadapterinterface.cpp b/sdrbase/webapi/webapiadapterinterface.cpp index 8ffc45338..7fdf79c9a 100644 --- a/sdrbase/webapi/webapiadapterinterface.cpp +++ b/sdrbase/webapi/webapiadapterinterface.cpp @@ -23,10 +23,10 @@ QString WebAPIAdapterInterface::instanceDevicesURL = "/sdrangel/devices"; QString WebAPIAdapterInterface::instanceChannelsURL = "/sdrangel/channels"; QString WebAPIAdapterInterface::instanceLoggingURL = "/sdrangel/logging"; QString WebAPIAdapterInterface::instanceAudioURL = "/sdrangel/audio"; -QString WebAPIAdapterInterface::instanceAudioInputSetURL = "/sdrangel/audio/input/set"; -QString WebAPIAdapterInterface::instanceAudioOutputSetURL = "/sdrangel/audio/output/set"; -QString WebAPIAdapterInterface::instanceAudioInputUnsetURL = "/sdrangel/audio/input/unset"; -QString WebAPIAdapterInterface::instanceAudioOutputUnsetURL = "/sdrangel/audio/output/unset"; +QString WebAPIAdapterInterface::instanceAudioInputParametersURL = "/sdrangel/audio/input/parameters"; +QString WebAPIAdapterInterface::instanceAudioOutputParametersURL = "/sdrangel/audio/output/parameters"; +QString WebAPIAdapterInterface::instanceAudioInputCleanupURL = "/sdrangel/audio/input/cleanup"; +QString WebAPIAdapterInterface::instanceAudioOutputCleanupURL = "/sdrangel/audio/output/cleanup"; QString WebAPIAdapterInterface::instanceLocationURL = "/sdrangel/location"; QString WebAPIAdapterInterface::instanceDVSerialURL = "/sdrangel/dvserial"; QString WebAPIAdapterInterface::instancePresetsURL = "/sdrangel/presets"; diff --git a/sdrbase/webapi/webapiadapterinterface.h b/sdrbase/webapi/webapiadapterinterface.h index 9fa8e1dad..d76dd8492 100644 --- a/sdrbase/webapi/webapiadapterinterface.h +++ b/sdrbase/webapi/webapiadapterinterface.h @@ -153,7 +153,7 @@ public: } /** - * Handler of /sdrangel/audio/input (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels + * Handler of /sdrangel/audio/input/parameters (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels * returns the Http status code (default 501: not implemented) */ virtual int instanceAudioInputPatch( @@ -167,7 +167,7 @@ public: } /** - * Handler of /sdrangel/audio/output (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels + * Handler of /sdrangel/audio/output/parameters (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels * returns the Http status code (default 501: not implemented) */ virtual int instanceAudioOutputPatch( @@ -180,6 +180,58 @@ public: return 501; } + /** + * Handler of /sdrangel/audio/input/parameters (DELETE) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels + * returns the Http status code (default 501: not implemented) + */ + virtual int instanceAudioInputDelete( + SWGSDRangel::SWGAudioInputDevice& response __attribute__((unused)), + SWGSDRangel::SWGErrorResponse& error) + { + error.init(); + *error.getMessage() = QString("Function not implemented"); + return 501; + } + + /** + * Handler of /sdrangel/audio/output/paramaters (DELETE) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels + * returns the Http status code (default 501: not implemented) + */ + virtual int instanceAudioOutputDelete( + SWGSDRangel::SWGAudioOutputDevice& response __attribute__((unused)), + SWGSDRangel::SWGErrorResponse& error) + { + error.init(); + *error.getMessage() = QString("Function not implemented"); + return 501; + } + + /** + * Handler of /sdrangel/audio/input/cleanup (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels + * returns the Http status code (default 501: not implemented) + */ + virtual int instanceAudioInputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response __attribute__((unused)), + SWGSDRangel::SWGErrorResponse& error) + { + error.init(); + *error.getMessage() = QString("Function not implemented"); + return 501; + } + + /** + * Handler of /sdrangel/audio/output/cleanup (PATCH) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels + * returns the Http status code (default 501: not implemented) + */ + virtual int instanceAudioOutputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response __attribute__((unused)), + SWGSDRangel::SWGErrorResponse& error) + { + error.init(); + *error.getMessage() = QString("Function not implemented"); + return 501; + } + /** * Handler of /sdrangel/location (GET) swagger/sdrangel/code/html2/index.html#api-Default-instanceChannels * returns the Http status code (default 501: not implemented) @@ -568,10 +620,10 @@ public: static QString instanceChannelsURL; static QString instanceLoggingURL; static QString instanceAudioURL; - static QString instanceAudioInputSetURL; - static QString instanceAudioOutputSetURL; - static QString instanceAudioInputUnsetURL; - static QString instanceAudioOutputUnsetURL; + static QString instanceAudioInputParametersURL; + static QString instanceAudioOutputParametersURL; + static QString instanceAudioInputCleanupURL; + static QString instanceAudioOutputCleanupURL; static QString instanceLocationURL; static QString instanceDVSerialURL; static QString instancePresetsURL; diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 3ed016cde..8423b1a83 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -84,10 +84,14 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http instanceLoggingService(request, response); } else if (path == WebAPIAdapterInterface::instanceAudioURL) { instanceAudioService(request, response); - } else if (path == WebAPIAdapterInterface::instanceAudioInputSetURL) { - instanceAudioInputSetService(request, response); - } else if (path == WebAPIAdapterInterface::instanceAudioOutputSetURL) { - instanceAudioOutputSetService(request, response); + } else if (path == WebAPIAdapterInterface::instanceAudioInputParametersURL) { + instanceAudioInputParametersService(request, response); + } else if (path == WebAPIAdapterInterface::instanceAudioOutputParametersURL) { + instanceAudioOutputParametersService(request, response); + } else if (path == WebAPIAdapterInterface::instanceAudioInputCleanupURL) { + instanceAudioInputCleanupService(request, response); + } else if (path == WebAPIAdapterInterface::instanceAudioOutputCleanupURL) { + instanceAudioOutputCleanupService(request, response); } else if (path == WebAPIAdapterInterface::instanceLocationURL) { instanceLocationService(request, response); } else if (path == WebAPIAdapterInterface::instanceDVSerialURL) { @@ -328,24 +332,24 @@ void WebAPIRequestMapper::instanceAudioService(qtwebapp::HttpRequest& request, q } } -void WebAPIRequestMapper::instanceAudioInputSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) +void WebAPIRequestMapper::instanceAudioInputParametersService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) { // TODO SWGSDRangel::SWGErrorResponse errorResponse; response.setHeader("Content-Type", "application/json"); - if (request.getMethod() == "PATCH") + QString jsonStr = request.getBody(); + QJsonObject jsonObject; + + if (parseJsonBody(jsonStr, jsonObject, response)) { - QString jsonStr = request.getBody(); - QJsonObject jsonObject; + SWGSDRangel::SWGAudioInputDevice normalResponse; + resetAudioInputDevice(normalResponse); + QStringList audioInputDeviceKeys; - if (parseJsonBody(jsonStr, jsonObject, response)) + if (validateAudioInputDevice(normalResponse, jsonObject, audioInputDeviceKeys)) { - SWGSDRangel::SWGAudioInputDevice normalResponse; - resetAudioInputDevice(normalResponse); - QStringList audioInputDeviceKeys; - - if (validateAudioInputDevice(normalResponse, jsonObject, audioInputDeviceKeys)) + if (request.getMethod() == "PATCH") { int status = m_adapter->instanceAudioInputPatch( normalResponse, @@ -359,48 +363,61 @@ void WebAPIRequestMapper::instanceAudioInputSetService(qtwebapp::HttpRequest& re response.write(errorResponse.asJson().toUtf8()); } } + else if (request.getMethod() == "DELETE") + { + int status = m_adapter->instanceAudioInputDelete( + normalResponse, + errorResponse); + response.setStatus(status); + + if (status/100 == 2) { + response.write(normalResponse.asJson().toUtf8()); + } else { + response.write(errorResponse.asJson().toUtf8()); + } + } else { - response.setStatus(400,"Invalid JSON request"); + response.setStatus(405,"Invalid HTTP method"); errorResponse.init(); - *errorResponse.getMessage() = "Invalid JSON request"; + *errorResponse.getMessage() = "Invalid HTTP method"; response.write(errorResponse.asJson().toUtf8()); } } else { - response.setStatus(400,"Invalid JSON format"); + response.setStatus(400,"Invalid JSON request"); errorResponse.init(); - *errorResponse.getMessage() = "Invalid JSON format"; + *errorResponse.getMessage() = "Invalid JSON request"; response.write(errorResponse.asJson().toUtf8()); } } else { - response.setStatus(405,"Invalid HTTP method"); + response.setStatus(400,"Invalid JSON format"); errorResponse.init(); - *errorResponse.getMessage() = "Invalid HTTP method"; + *errorResponse.getMessage() = "Invalid JSON format"; response.write(errorResponse.asJson().toUtf8()); } } -void WebAPIRequestMapper::instanceAudioOutputSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) +void WebAPIRequestMapper::instanceAudioOutputParametersService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) { SWGSDRangel::SWGErrorResponse errorResponse; response.setHeader("Content-Type", "application/json"); - if (request.getMethod() == "PATCH") + QString jsonStr = request.getBody(); + QJsonObject jsonObject; + + if (parseJsonBody(jsonStr, jsonObject, response)) { - QString jsonStr = request.getBody(); - QJsonObject jsonObject; + SWGSDRangel::SWGAudioOutputDevice normalResponse; + resetAudioOutputDevice(normalResponse); + QStringList audioOutputDeviceKeys; - if (parseJsonBody(jsonStr, jsonObject, response)) + if (validateAudioOutputDevice(normalResponse, jsonObject, audioOutputDeviceKeys)) { - SWGSDRangel::SWGAudioOutputDevice normalResponse; - resetAudioOutputDevice(normalResponse); - QStringList audioOutputDeviceKeys; - - if (validateAudioOutputDevice(normalResponse, jsonObject, audioOutputDeviceKeys)) + if (request.getMethod() == "PATCH") { int status = m_adapter->instanceAudioOutputPatch( normalResponse, @@ -414,19 +431,86 @@ void WebAPIRequestMapper::instanceAudioOutputSetService(qtwebapp::HttpRequest& r response.write(errorResponse.asJson().toUtf8()); } } + else if (request.getMethod() == "DELETE") + { + int status = m_adapter->instanceAudioOutputDelete( + normalResponse, + errorResponse); + response.setStatus(status); + + if (status/100 == 2) { + response.write(normalResponse.asJson().toUtf8()); + } else { + response.write(errorResponse.asJson().toUtf8()); + } + } else { - response.setStatus(400,"Invalid JSON request"); + response.setStatus(405,"Invalid HTTP method"); errorResponse.init(); - *errorResponse.getMessage() = "Invalid JSON request"; + *errorResponse.getMessage() = "Invalid HTTP method"; response.write(errorResponse.asJson().toUtf8()); } } else { - response.setStatus(400,"Invalid JSON format"); + response.setStatus(400,"Invalid JSON request"); errorResponse.init(); - *errorResponse.getMessage() = "Invalid JSON format"; + *errorResponse.getMessage() = "Invalid JSON request"; + response.write(errorResponse.asJson().toUtf8()); + } + } + else + { + response.setStatus(400,"Invalid JSON format"); + errorResponse.init(); + *errorResponse.getMessage() = "Invalid JSON format"; + response.write(errorResponse.asJson().toUtf8()); + } +} + +void WebAPIRequestMapper::instanceAudioInputCleanupService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) +{ + SWGSDRangel::SWGErrorResponse errorResponse; + response.setHeader("Content-Type", "application/json"); + + if (request.getMethod() == "PATCH") + { + SWGSDRangel::SWGSuccessResponse normalResponse; + + int status = m_adapter->instanceAudioInputCleanupPatch(normalResponse, errorResponse); + response.setStatus(status); + + if (status/100 == 2) { + response.write(normalResponse.asJson().toUtf8()); + } else { + response.write(errorResponse.asJson().toUtf8()); + } + } + else + { + response.setStatus(405,"Invalid HTTP method"); + errorResponse.init(); + *errorResponse.getMessage() = "Invalid HTTP method"; + response.write(errorResponse.asJson().toUtf8()); + } +} + +void WebAPIRequestMapper::instanceAudioOutputCleanupService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) +{ + SWGSDRangel::SWGErrorResponse errorResponse; + response.setHeader("Content-Type", "application/json"); + + if (request.getMethod() == "PATCH") + { + SWGSDRangel::SWGSuccessResponse normalResponse; + + int status = m_adapter->instanceAudioOutputCleanupPatch(normalResponse, errorResponse); + response.setStatus(status); + + if (status/100 == 2) { + response.write(normalResponse.asJson().toUtf8()); + } else { response.write(errorResponse.asJson().toUtf8()); } } diff --git a/sdrbase/webapi/webapirequestmapper.h b/sdrbase/webapi/webapirequestmapper.h index 9162ed154..33a598d30 100644 --- a/sdrbase/webapi/webapirequestmapper.h +++ b/sdrbase/webapi/webapirequestmapper.h @@ -52,8 +52,10 @@ private: void instanceChannelsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void instanceLoggingService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void instanceAudioService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); - void instanceAudioInputSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); - void instanceAudioOutputSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); + void instanceAudioInputParametersService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); + void instanceAudioOutputParametersService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); + void instanceAudioInputCleanupService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); + void instanceAudioOutputCleanupService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void instanceLocationService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void instanceDVSerialService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void instancePresetsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp index 016a32d38..53246a3b8 100644 --- a/sdrgui/webapi/webapiadaptergui.cpp +++ b/sdrgui/webapi/webapiadaptergui.cpp @@ -394,6 +394,88 @@ int WebAPIAdapterGUI::instanceAudioOutputPatch( return 200; } +int WebAPIAdapterGUI::instanceAudioInputDelete( + SWGSDRangel::SWGAudioInputDevice& response, + SWGSDRangel::SWGErrorResponse& error) +{ + AudioDeviceManager::InputDeviceInfo inputDeviceInfo; + QString deviceName; + int deviceIndex = response.getIndex(); + + if (!m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputDeviceName(deviceIndex, deviceName)) + { + error.init(); + *error.getMessage() = QString("There is no audio input device at index %1").arg(deviceIndex); + return 404; + } + + m_mainWindow.m_dspEngine->getAudioDeviceManager()->unsetInputDeviceInfo(deviceIndex); + m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputDeviceInfo(deviceName, inputDeviceInfo); + + response.setSampleRate(inputDeviceInfo.sampleRate); + response.setVolume(inputDeviceInfo.volume); + + return 200; +} + +int WebAPIAdapterGUI::instanceAudioOutputDelete( + SWGSDRangel::SWGAudioOutputDevice& response, + SWGSDRangel::SWGErrorResponse& error) +{ + AudioDeviceManager::OutputDeviceInfo outputDeviceInfo; + QString deviceName; + int deviceIndex = response.getIndex(); + + if (!m_mainWindow.m_dspEngine->getAudioDeviceManager()->getOutputDeviceName(deviceIndex, deviceName)) + { + error.init(); + *error.getMessage() = QString("There is no audio output device at index %1").arg(deviceIndex); + return 404; + } + + m_mainWindow.m_dspEngine->getAudioDeviceManager()->unsetInputDeviceInfo(deviceIndex); + m_mainWindow.m_dspEngine->getAudioDeviceManager()->getOutputDeviceInfo(deviceName, outputDeviceInfo); + + response.setSampleRate(outputDeviceInfo.sampleRate); + response.setCopyToUdp(outputDeviceInfo.copyToUDP == 0 ? 0 : 1); + response.setUdpUsesRtp(outputDeviceInfo.udpUseRTP == 0 ? 0 : 1); + response.setUdpChannelMode(outputDeviceInfo.udpChannelMode % 4); + + if (response.getUdpAddress()) { + *response.getUdpAddress() = outputDeviceInfo.udpAddress; + } else { + response.setUdpAddress(new QString(outputDeviceInfo.udpAddress)); + } + + response.setUdpPort(outputDeviceInfo.udpPort % (1<<16)); + + return 200; +} + +int WebAPIAdapterGUI::instanceAudioInputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) +{ + m_mainWindow.m_dspEngine->getAudioDeviceManager()->inputInfosCleanup(); + + response.init(); + *response.getMessage() = QString("Unregistered parameters for devices not in list of available input devices for this instance"); + + return 200; +} + +int WebAPIAdapterGUI::instanceAudioOutputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) +{ + m_mainWindow.m_dspEngine->getAudioDeviceManager()->outputInfosCleanup(); + + response.init(); + *response.getMessage() = QString("Unregistered parameters for devices not in list of available output devices for this instance"); + + return 200; +} + int WebAPIAdapterGUI::instanceLocationGet( SWGSDRangel::SWGLocationInformation& response, SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) diff --git a/sdrgui/webapi/webapiadaptergui.h b/sdrgui/webapi/webapiadaptergui.h index 29a6250bd..0f8fde22e 100644 --- a/sdrgui/webapi/webapiadaptergui.h +++ b/sdrgui/webapi/webapiadaptergui.h @@ -73,6 +73,22 @@ public: const QStringList& audioOutputKeys, SWGSDRangel::SWGErrorResponse& error); + virtual int instanceAudioInputDelete( + SWGSDRangel::SWGAudioInputDevice& response, + SWGSDRangel::SWGErrorResponse& error); + + virtual int instanceAudioOutputDelete( + SWGSDRangel::SWGAudioOutputDevice& response, + SWGSDRangel::SWGErrorResponse& error); + + virtual int instanceAudioInputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error); + + virtual int instanceAudioOutputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error); + virtual int instanceLocationGet( SWGSDRangel::SWGLocationInformation& response, SWGSDRangel::SWGErrorResponse& error); diff --git a/sdrsrv/webapi/webapiadaptersrv.cpp b/sdrsrv/webapi/webapiadaptersrv.cpp index 9ec6d7312..269b268a0 100644 --- a/sdrsrv/webapi/webapiadaptersrv.cpp +++ b/sdrsrv/webapi/webapiadaptersrv.cpp @@ -395,6 +395,88 @@ int WebAPIAdapterSrv::instanceAudioOutputPatch( return 200; } +int WebAPIAdapterSrv::instanceAudioInputDelete( + SWGSDRangel::SWGAudioInputDevice& response, + SWGSDRangel::SWGErrorResponse& error) +{ + AudioDeviceManager::InputDeviceInfo inputDeviceInfo; + QString deviceName; + int deviceIndex = response.getIndex(); + + if (!m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDeviceName(deviceIndex, deviceName)) + { + error.init(); + *error.getMessage() = QString("There is no audio input device at index %1").arg(deviceIndex); + return 404; + } + + m_mainCore.m_dspEngine->getAudioDeviceManager()->unsetInputDeviceInfo(deviceIndex); + m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDeviceInfo(deviceName, inputDeviceInfo); + + response.setSampleRate(inputDeviceInfo.sampleRate); + response.setVolume(inputDeviceInfo.volume); + + return 200; +} + +int WebAPIAdapterSrv::instanceAudioOutputDelete( + SWGSDRangel::SWGAudioOutputDevice& response, + SWGSDRangel::SWGErrorResponse& error) +{ + AudioDeviceManager::OutputDeviceInfo outputDeviceInfo; + QString deviceName; + int deviceIndex = response.getIndex(); + + if (!m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDeviceName(deviceIndex, deviceName)) + { + error.init(); + *error.getMessage() = QString("There is no audio output device at index %1").arg(deviceIndex); + return 404; + } + + m_mainCore.m_dspEngine->getAudioDeviceManager()->unsetInputDeviceInfo(deviceIndex); + m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDeviceInfo(deviceName, outputDeviceInfo); + + response.setSampleRate(outputDeviceInfo.sampleRate); + response.setCopyToUdp(outputDeviceInfo.copyToUDP == 0 ? 0 : 1); + response.setUdpUsesRtp(outputDeviceInfo.udpUseRTP == 0 ? 0 : 1); + response.setUdpChannelMode(outputDeviceInfo.udpChannelMode % 4); + + if (response.getUdpAddress()) { + *response.getUdpAddress() = outputDeviceInfo.udpAddress; + } else { + response.setUdpAddress(new QString(outputDeviceInfo.udpAddress)); + } + + response.setUdpPort(outputDeviceInfo.udpPort % (1<<16)); + + return 200; +} + +int WebAPIAdapterSrv::instanceAudioInputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) +{ + m_mainCore.m_dspEngine->getAudioDeviceManager()->inputInfosCleanup(); + + response.init(); + *response.getMessage() = QString("Unregistered parameters for devices not in list of available input devices for this instance"); + + return 200; +} + +int WebAPIAdapterSrv::instanceAudioOutputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) +{ + m_mainCore.m_dspEngine->getAudioDeviceManager()->outputInfosCleanup(); + + response.init(); + *response.getMessage() = QString("Unregistered parameters for devices not in list of available output devices for this instance"); + + return 200; +} + int WebAPIAdapterSrv::instanceLocationGet( SWGSDRangel::SWGLocationInformation& response, SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) diff --git a/sdrsrv/webapi/webapiadaptersrv.h b/sdrsrv/webapi/webapiadaptersrv.h index 62d9bcc6a..ff1c74bfa 100644 --- a/sdrsrv/webapi/webapiadaptersrv.h +++ b/sdrsrv/webapi/webapiadaptersrv.h @@ -73,6 +73,22 @@ public: const QStringList& audioOutputKeys, SWGSDRangel::SWGErrorResponse& error); + virtual int instanceAudioInputDelete( + SWGSDRangel::SWGAudioInputDevice& response, + SWGSDRangel::SWGErrorResponse& error); + + virtual int instanceAudioOutputDelete( + SWGSDRangel::SWGAudioOutputDevice& response, + SWGSDRangel::SWGErrorResponse& error); + + virtual int instanceAudioInputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error); + + virtual int instanceAudioOutputCleanupPatch( + SWGSDRangel::SWGSuccessResponse& response, + SWGSDRangel::SWGErrorResponse& error); + virtual int instanceLocationGet( SWGSDRangel::SWGLocationInformation& response, SWGSDRangel::SWGErrorResponse& error); diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index 3a9eb191a..e2a9f5d88 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -182,11 +182,12 @@ paths: $ref: "#/responses/Response_500" "501": $ref: "#/responses/Response_501" - /sdrangel/audio/input/set: + + /sdrangel/audio/input/parameters: x-swagger-router-controller: instance patch: description: Set audio input device paramaters - operationId: instanceAudioInputSetPatch + operationId: instanceAudioInputPatch tags: - Instance consumes: @@ -211,12 +212,57 @@ paths: $ref: "#/responses/Response_500" "501": $ref: "#/responses/Response_501" + delete: + description: Delete audio input device paramaters and return to defaults + operationId: instanceAudioInputDelete + tags: + - Instance + consumes: + - application/json + parameters: + - name: body + in: body + description: Audio input parameters. Index is used to identify the device. + required: true + schema: + $ref: "#/definitions/AudioInputDevice" + responses: + "200": + description: Success. Returns default parameters. + schema: + $ref: "#/definitions/AudioInputDevice" + "404": + description: Audio input device not found + schema: + $ref: "#/definitions/ErrorResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" - /sdrangel/audio/output/set: + + /sdrangel/audio/input/cleanup: + x-swagger-router-controller: instance + patch: + description: Remove registered parameters for devices not in list of available input devices for this instance + operationId: instanceAudioInputCleanupPatch + tags: + - Instance + responses: + "200": + description: Success. + schema: + $ref: "#/definitions/SuccessResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" + + /sdrangel/audio/output/parameters: x-swagger-router-controller: instance patch: description: Set audio output device parameters - operationId: instanceAudioOutputSetPatch + operationId: instanceAudioOutputPatch tags: - Instance consumes: @@ -241,6 +287,50 @@ paths: $ref: "#/responses/Response_500" "501": $ref: "#/responses/Response_501" + delete: + description: Delete audio output device paramaters and return to defaults + operationId: instanceAudioOutputDelete + tags: + - Instance + consumes: + - application/json + parameters: + - name: body + in: body + description: Audio output parameters. Index is used to identify the device. + required: true + schema: + $ref: "#/definitions/AudioOutputDevice" + responses: + "200": + description: Success. Returns actual data in particular the actual sample rate. + schema: + $ref: "#/definitions/AudioOutputDevice" + "404": + description: Audio output device not found + schema: + $ref: "#/definitions/ErrorResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" + + /sdrangel/audio/output/cleanup: + x-swagger-router-controller: instance + patch: + description: Remove registered parameters for devices not in list of available output devices for this instance + operationId: instanceAudioOutputCleanupPatch + tags: + - Instance + responses: + "200": + description: Success. + schema: + $ref: "#/definitions/SuccessResponse" + "500": + $ref: "#/responses/Response_500" + "501": + $ref: "#/responses/Response_501" /sdrangel/location: x-swagger-router-controller: instance diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index cfd22bd01..635859c5d 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1939,11 +1939,23 @@ margin-bottom: 20px;
  • instanceAudioGet
    • -
  • - instanceAudioInputSetPatch +
  • + instanceAudioInputCleanupPatch
    • -
  • - instanceAudioOutputSetPatch +
  • + instanceAudioInputDelete +
    • +
  • + instanceAudioInputPatch +
    • +
  • + instanceAudioOutputCleanupPatch +
    • +
  • + instanceAudioOutputDelete +
    • +
  • + instanceAudioOutputPatch
  • instanceChannels @@ -10803,10 +10815,775 @@ except ApiException as e:
    • -
    -
    +
    +
    -

    instanceAudioInputSetPatch

    +

    instanceAudioInputCleanupPatch

    +

    +
    +
    +
    +

    +

    Remove registered parameters for devices not in list of available input devices for this instance

    +

    +
    + 
    /sdrangel/audio/input/cleanup
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/input/cleanup"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioInputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioInputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioInputCleanupPatchWithCompletionHandler: 
+              ^(SuccessResponse output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioInputCleanupPatch(callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioInputCleanupPatchExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+
+            try
+            {
+                SuccessResponse result = apiInstance.instanceAudioInputCleanupPatch();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioInputCleanupPatch: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+
+try {
+    $result = $api_instance->instanceAudioInputCleanupPatch();
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioInputCleanupPatch: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+
+eval { 
+    my $result = $api_instance->instanceAudioInputCleanupPatch();
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioInputCleanupPatch: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+
+try: 
+    api_response = api_instance.instance_audio_input_cleanup_patch()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioInputCleanupPatch: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + + + + +

    Responses

    +

    Status: 200 - Success.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioInputDelete

    +

    +
    +
    +
    +

    +

    Delete audio input device paramaters and return to defaults

    +

    +
    + 
    /sdrangel/audio/input/parameters
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X DELETE "http://localhost/sdrangel/audio/input/parameters"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+        try {
+            AudioInputDevice result = apiInstance.instanceAudioInputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+        try {
+            AudioInputDevice result = apiInstance.instanceAudioInputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    AudioInputDevice *body = ; // Audio input parameters. Index is used to identify the device.
+
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioInputDeleteWith:body
+              completionHandler: ^(AudioInputDevice output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var body = ; // {AudioInputDevice} Audio input parameters. Index is used to identify the device.
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioInputDelete(body, callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioInputDeleteExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+            var body = new AudioInputDevice(); // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+            try
+            {
+                AudioInputDevice result = apiInstance.instanceAudioInputDelete(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioInputDelete: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+$body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+try {
+    $result = $api_instance->instanceAudioInputDelete($body);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioInputDelete: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+my $body = SWGSDRangel::Object::AudioInputDevice->new(); # AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+eval { 
+    my $result = $api_instance->instanceAudioInputDelete(body => $body);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioInputDelete: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+body =  # AudioInputDevice | Audio input parameters. Index is used to identify the device.
+
+try: 
+    api_response = api_instance.instance_audio_input_delete(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioInputDelete: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + +
    Body parameters
    + + + + + + + + + +
    NameDescription
    body * + + + +
    +
    + + + +

    Responses

    +

    Status: 200 - Success. Returns default parameters.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 404 - Audio input device not found

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioInputPatch

    @@ -10815,29 +11592,29 @@ except ApiException as e:

    Set audio input device paramaters


    - 
    /sdrangel/audio/input/set
    + 
    /sdrangel/audio/input/parameters

    Usage and SDK Samples

    -
    - 
    curl -X PATCH "http://localhost/sdrangel/audio/input/set"
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/input/parameters"
    -
    + 
    import SWGSDRangel.*;
 import SWGSDRangel.auth.*;
 import SWGSDRangel.model.*;
@@ -10853,17 +11630,17 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioInputDevice result = apiInstance.instanceAudioInputSetPatch(body);
+            AudioInputDevice result = apiInstance.instanceAudioInputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioInputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    import SWGSDRangel.api.InstanceApi;
 
 public class InstanceApiExample {
@@ -10872,25 +11649,25 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioInputDevice body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioInputDevice result = apiInstance.instanceAudioInputSetPatch(body);
+            AudioInputDevice result = apiInstance.instanceAudioInputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioInputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioInputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    AudioInputDevice *body = ; // Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 InstanceApi *apiInstance = [[InstanceApi alloc] init];
 
-[apiInstance instanceAudioInputSetPatchWith:body
+[apiInstance instanceAudioInputPatchWith:body
               completionHandler: ^(AudioInputDevice output, NSError* error) {
                             if (output) {
                                 NSLog(@"%@", output);
@@ -10902,7 +11679,7 @@ InstanceApi *apiInstance = [[InstanceApi alloc] init];
    -
    + 
    var SdRangel = require('sd_rangel');
 
 var api = new SdRangel.InstanceApi()
@@ -10917,14 +11694,14 @@ var callback = function(error, data, response) {
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-api.instanceAudioInputSetPatch(body, callback);
+api.instanceAudioInputPatch(body, callback);
    - -
    + 
    using System;
 using System.Diagnostics;
 using SWGSDRangel.Api;
@@ -10933,7 +11710,7 @@ using SWGSDRangel.Model;
 
 namespace Example
 {
-    public class instanceAudioInputSetPatchExample
+    public class instanceAudioInputPatchExample
     {
         public void main()
         {
@@ -10943,12 +11720,12 @@ namespace Example
 
             try
             {
-                AudioInputDevice result = apiInstance.instanceAudioInputSetPatch(body);
+                AudioInputDevice result = apiInstance.instanceAudioInputPatch(body);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling InstanceApi.instanceAudioInputSetPatch: " + e.Message );
+                Debug.Print("Exception when calling InstanceApi.instanceAudioInputPatch: " + e.Message );
             }
         }
     }
@@ -10956,7 +11733,7 @@ namespace Example
    -
    + 
    <?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
@@ -10964,15 +11741,15 @@ $api_instance = new Swagger\Client\Api\InstanceApi();
 $body = ; // AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 try {
-    $result = $api_instance->instanceAudioInputSetPatch($body);
+    $result = $api_instance->instanceAudioInputPatch($body);
     print_r($result);
 } catch (Exception $e) {
-    echo 'Exception when calling InstanceApi->instanceAudioInputSetPatch: ', $e->getMessage(), PHP_EOL;
+    echo 'Exception when calling InstanceApi->instanceAudioInputPatch: ', $e->getMessage(), PHP_EOL;
 }
 ?>
    -
    + 
    use Data::Dumper;
 use SWGSDRangel::Configuration;
 use SWGSDRangel::InstanceApi;
@@ -10981,15 +11758,15 @@ my $api_instance = SWGSDRangel::InstanceApi->new();
 my $body = SWGSDRangel::Object::AudioInputDevice->new(); # AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 eval { 
-    my $result = $api_instance->instanceAudioInputSetPatch(body => $body);
+    my $result = $api_instance->instanceAudioInputPatch(body => $body);
     print Dumper($result);
 };
 if ($@) {
-    warn "Exception when calling InstanceApi->instanceAudioInputSetPatch: $@\n";
+    warn "Exception when calling InstanceApi->instanceAudioInputPatch: $@\n";
 }
    -
    + 
    from __future__ import print_statement
 import time
 import swagger_sdrangel
@@ -11001,10 +11778,10 @@ api_instance = swagger_sdrangel.InstanceApi()
 body =  # AudioInputDevice | Audio input parameters. Index is used to identify the device. Only settable fields are considered.
 
 try: 
-    api_response = api_instance.instance_audio_input_set_patch(body)
+    api_response = api_instance.instance_audio_input_patch(body)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling InstanceApi->instanceAudioInputSetPatch: %s\n" % e)
    + print("Exception when calling InstanceApi->instanceAudioInputPatch: %s\n" % e)
    @@ -11044,12 +11821,12 @@ $(document).ready(function() { } var view = new JSONSchemaView(schema,2,{isBodyParam: true}); - var result = $('#d2e199_instanceAudioInputSetPatch_body'); + var result = $('#d2e199_instanceAudioInputPatch_body'); result.empty(); result.append(view.render()); }); -
    +
    @@ -11062,14 +11839,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11105,14 +11882,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11148,14 +11925,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11191,14 +11968,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    -
    -
    +
    +
    -

    instanceAudioOutputSetPatch

    +

    instanceAudioOutputCleanupPatch

    +

    +
    +
    +
    +

    +

    Remove registered parameters for devices not in list of available output devices for this instance

    +

    +
    + 
    /sdrangel/audio/output/cleanup
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/output/cleanup"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioOutputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        try {
+            SuccessResponse result = apiInstance.instanceAudioOutputCleanupPatch();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputCleanupPatch");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioOutputCleanupPatchWithCompletionHandler: 
+              ^(SuccessResponse output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioOutputCleanupPatch(callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioOutputCleanupPatchExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+
+            try
+            {
+                SuccessResponse result = apiInstance.instanceAudioOutputCleanupPatch();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputCleanupPatch: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+
+try {
+    $result = $api_instance->instanceAudioOutputCleanupPatch();
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioOutputCleanupPatch: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+
+eval { 
+    my $result = $api_instance->instanceAudioOutputCleanupPatch();
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioOutputCleanupPatch: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+
+try: 
+    api_response = api_instance.instance_audio_output_cleanup_patch()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioOutputCleanupPatch: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + + + + +

    Responses

    +

    Status: 200 - Success.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioOutputDelete

    +

    +
    +
    +
    +

    +

    Delete audio output device paramaters and return to defaults

    +

    +
    + 
    /sdrangel/audio/output/parameters
    +

    +

    Usage and SDK Samples

    +

    + + +
    +
    + 
    curl -X DELETE "http://localhost/sdrangel/audio/output/parameters"
    +
    +
    + 
    import SWGSDRangel.*;
+import SWGSDRangel.auth.*;
+import SWGSDRangel.model.*;
+import SWGSDRangel.api.InstanceApi;
+
+import java.io.File;
+import java.util.*;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        
+        InstanceApi apiInstance = new InstanceApi();
+        AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+        try {
+            AudioOutputDevice result = apiInstance.instanceAudioOutputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    import SWGSDRangel.api.InstanceApi;
+
+public class InstanceApiExample {
+
+    public static void main(String[] args) {
+        InstanceApi apiInstance = new InstanceApi();
+        AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+        try {
+            AudioOutputDevice result = apiInstance.instanceAudioOutputDelete(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputDelete");
+            e.printStackTrace();
+        }
+    }
+}
    +
    + +
    + 
    AudioOutputDevice *body = ; // Audio output parameters. Index is used to identify the device.
+
+InstanceApi *apiInstance = [[InstanceApi alloc] init];
+
+[apiInstance instanceAudioOutputDeleteWith:body
+              completionHandler: ^(AudioOutputDevice output, NSError* error) {
+                            if (output) {
+                                NSLog(@"%@", output);
+                            }
+                            if (error) {
+                                NSLog(@"Error: %@", error);
+                            }
+                        }];
+
    +
    + +
    + 
    var SdRangel = require('sd_rangel');
+
+var api = new SdRangel.InstanceApi()
+
+var body = ; // {AudioOutputDevice} Audio output parameters. Index is used to identify the device.
+
+
+var callback = function(error, data, response) {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+};
+api.instanceAudioOutputDelete(body, callback);
+
    +
    + + +
    + 
    using System;
+using System.Diagnostics;
+using SWGSDRangel.Api;
+using SWGSDRangel.Client;
+using SWGSDRangel.Model;
+
+namespace Example
+{
+    public class instanceAudioOutputDeleteExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new InstanceApi();
+            var body = new AudioOutputDevice(); // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+            try
+            {
+                AudioOutputDevice result = apiInstance.instanceAudioOutputDelete(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputDelete: " + e.Message );
+            }
+        }
+    }
+}
+
    +
    + +
    + 
    <?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+$api_instance = new Swagger\Client\Api\InstanceApi();
+$body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+try {
+    $result = $api_instance->instanceAudioOutputDelete($body);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling InstanceApi->instanceAudioOutputDelete: ', $e->getMessage(), PHP_EOL;
+}
+?>
    +
    + +
    + 
    use Data::Dumper;
+use SWGSDRangel::Configuration;
+use SWGSDRangel::InstanceApi;
+
+my $api_instance = SWGSDRangel::InstanceApi->new();
+my $body = SWGSDRangel::Object::AudioOutputDevice->new(); # AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+eval { 
+    my $result = $api_instance->instanceAudioOutputDelete(body => $body);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling InstanceApi->instanceAudioOutputDelete: $@\n";
+}
    +
    + +
    + 
    from __future__ import print_statement
+import time
+import swagger_sdrangel
+from swagger_sdrangel.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = swagger_sdrangel.InstanceApi()
+body =  # AudioOutputDevice | Audio output parameters. Index is used to identify the device.
+
+try: 
+    api_response = api_instance.instance_audio_output_delete(body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling InstanceApi->instanceAudioOutputDelete: %s\n" % e)
    +
    +
    + +

    Parameters

    + + + +
    Body parameters
    + + + + + + + + + +
    NameDescription
    body * + + + +
    +
    + + + +

    Responses

    +

    Status: 200 - Success. Returns actual data in particular the actual sample rate.

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 404 - Audio output device not found

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 500 - Error

    + + + +
    +
    +
    + +
    + +
    +
    + +

    Status: 501 - Function not implemented

    + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    instanceAudioOutputPatch

    @@ -11245,29 +12787,29 @@ $(document).ready(function() {

    Set audio output device parameters


    - 
    /sdrangel/audio/output/set
    + 
    /sdrangel/audio/output/parameters

    Usage and SDK Samples

    -
    - 
    curl -X PATCH "http://localhost/sdrangel/audio/output/set"
    +
    + 
    curl -X PATCH "http://localhost/sdrangel/audio/output/parameters"
    -
    + 
    import SWGSDRangel.*;
 import SWGSDRangel.auth.*;
 import SWGSDRangel.model.*;
@@ -11283,17 +12825,17 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioOutputDevice result = apiInstance.instanceAudioOutputSetPatch(body);
+            AudioOutputDevice result = apiInstance.instanceAudioOutputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioOutputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    import SWGSDRangel.api.InstanceApi;
 
 public class InstanceApiExample {
@@ -11302,25 +12844,25 @@ public class InstanceApiExample {
         InstanceApi apiInstance = new InstanceApi();
         AudioOutputDevice body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
         try {
-            AudioOutputDevice result = apiInstance.instanceAudioOutputSetPatch(body);
+            AudioOutputDevice result = apiInstance.instanceAudioOutputPatch(body);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceAudioOutputSetPatch");
+            System.err.println("Exception when calling InstanceApi#instanceAudioOutputPatch");
             e.printStackTrace();
         }
     }
 }
    -
    + 
    AudioOutputDevice *body = ; // Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 InstanceApi *apiInstance = [[InstanceApi alloc] init];
 
-[apiInstance instanceAudioOutputSetPatchWith:body
+[apiInstance instanceAudioOutputPatchWith:body
               completionHandler: ^(AudioOutputDevice output, NSError* error) {
                             if (output) {
                                 NSLog(@"%@", output);
@@ -11332,7 +12874,7 @@ InstanceApi *apiInstance = [[InstanceApi alloc] init];
    -
    + 
    var SdRangel = require('sd_rangel');
 
 var api = new SdRangel.InstanceApi()
@@ -11347,14 +12889,14 @@ var callback = function(error, data, response) {
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-api.instanceAudioOutputSetPatch(body, callback);
+api.instanceAudioOutputPatch(body, callback);
    - -
    + 
    using System;
 using System.Diagnostics;
 using SWGSDRangel.Api;
@@ -11363,7 +12905,7 @@ using SWGSDRangel.Model;
 
 namespace Example
 {
-    public class instanceAudioOutputSetPatchExample
+    public class instanceAudioOutputPatchExample
     {
         public void main()
         {
@@ -11373,12 +12915,12 @@ namespace Example
 
             try
             {
-                AudioOutputDevice result = apiInstance.instanceAudioOutputSetPatch(body);
+                AudioOutputDevice result = apiInstance.instanceAudioOutputPatch(body);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputSetPatch: " + e.Message );
+                Debug.Print("Exception when calling InstanceApi.instanceAudioOutputPatch: " + e.Message );
             }
         }
     }
@@ -11386,7 +12928,7 @@ namespace Example
    -
    + 
    <?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
@@ -11394,15 +12936,15 @@ $api_instance = new Swagger\Client\Api\InstanceApi();
 $body = ; // AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 try {
-    $result = $api_instance->instanceAudioOutputSetPatch($body);
+    $result = $api_instance->instanceAudioOutputPatch($body);
     print_r($result);
 } catch (Exception $e) {
-    echo 'Exception when calling InstanceApi->instanceAudioOutputSetPatch: ', $e->getMessage(), PHP_EOL;
+    echo 'Exception when calling InstanceApi->instanceAudioOutputPatch: ', $e->getMessage(), PHP_EOL;
 }
 ?>
    -
    + 
    use Data::Dumper;
 use SWGSDRangel::Configuration;
 use SWGSDRangel::InstanceApi;
@@ -11411,15 +12953,15 @@ my $api_instance = SWGSDRangel::InstanceApi->new();
 my $body = SWGSDRangel::Object::AudioOutputDevice->new(); # AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 eval { 
-    my $result = $api_instance->instanceAudioOutputSetPatch(body => $body);
+    my $result = $api_instance->instanceAudioOutputPatch(body => $body);
     print Dumper($result);
 };
 if ($@) {
-    warn "Exception when calling InstanceApi->instanceAudioOutputSetPatch: $@\n";
+    warn "Exception when calling InstanceApi->instanceAudioOutputPatch: $@\n";
 }
    -
    + 
    from __future__ import print_statement
 import time
 import swagger_sdrangel
@@ -11431,10 +12973,10 @@ api_instance = swagger_sdrangel.InstanceApi()
 body =  # AudioOutputDevice | Audio output parameters. Index is used to identify the device. Only settable fields are considered.
 
 try: 
-    api_response = api_instance.instance_audio_output_set_patch(body)
+    api_response = api_instance.instance_audio_output_patch(body)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling InstanceApi->instanceAudioOutputSetPatch: %s\n" % e)
    + print("Exception when calling InstanceApi->instanceAudioOutputPatch: %s\n" % e)
    @@ -11474,12 +13016,12 @@ $(document).ready(function() { } var view = new JSONSchemaView(schema,2,{isBodyParam: true}); - var result = $('#d2e199_instanceAudioOutputSetPatch_body'); + var result = $('#d2e199_instanceAudioOutputPatch_body'); result.empty(); result.append(view.render()); }); -
    +
    @@ -11492,14 +13034,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11535,14 +13077,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11578,14 +13120,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -11621,14 +13163,14 @@ $(document).ready(function() {
    -
    -
    +
    +
    - +
    @@ -18555,7 +20097,7 @@ except ApiException as e:
    - Generated 2018-03-29T00:32:59.208+02:00 + Generated 2018-03-29T01:40:29.446+02:00
    diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp index 31ba25920..cd301ae6d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp @@ -81,9 +81,9 @@ SWGInstanceApi::instanceAudioGetCallback(SWGHttpRequestWorker * worker) { } void -SWGInstanceApi::instanceAudioInputSetPatch(SWGAudioInputDevice& body) { +SWGInstanceApi::instanceAudioInputCleanupPatch() { QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/input/set"); + fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/input/cleanup"); @@ -91,6 +91,58 @@ SWGInstanceApi::instanceAudioInputSetPatch(SWGAudioInputDevice& body) { SWGHttpRequestInput input(fullPath, "PATCH"); + + + + foreach(QString key, this->defaultHeaders.keys()) { + input.headers.insert(key, this->defaultHeaders.value(key)); + } + + connect(worker, + &SWGHttpRequestWorker::on_execution_finished, + this, + &SWGInstanceApi::instanceAudioInputCleanupPatchCallback); + + worker->execute(&input); +} + +void +SWGInstanceApi::instanceAudioInputCleanupPatchCallback(SWGHttpRequestWorker * worker) { + QString msg; + QString error_str = worker->error_str; + QNetworkReply::NetworkError error_type = worker->error_type; + + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + QString json(worker->response); + SWGSuccessResponse* output = static_cast(create(json, QString("SWGSuccessResponse"))); + worker->deleteLater(); + + if (worker->error_type == QNetworkReply::NoError) { + emit instanceAudioInputCleanupPatchSignal(output); + } else { + emit instanceAudioInputCleanupPatchSignalE(output, error_type, error_str); + emit instanceAudioInputCleanupPatchSignalEFull(worker, error_type, error_str); + } +} + +void +SWGInstanceApi::instanceAudioInputDelete(SWGAudioInputDevice& body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/input/parameters"); + + + + SWGHttpRequestWorker *worker = new SWGHttpRequestWorker(); + SWGHttpRequestInput input(fullPath, "DELETE"); + + QString output = body.asJson(); input.request_body.append(output); @@ -104,13 +156,13 @@ SWGInstanceApi::instanceAudioInputSetPatch(SWGAudioInputDevice& body) { connect(worker, &SWGHttpRequestWorker::on_execution_finished, this, - &SWGInstanceApi::instanceAudioInputSetPatchCallback); + &SWGInstanceApi::instanceAudioInputDeleteCallback); worker->execute(&input); } void -SWGInstanceApi::instanceAudioInputSetPatchCallback(SWGHttpRequestWorker * worker) { +SWGInstanceApi::instanceAudioInputDeleteCallback(SWGHttpRequestWorker * worker) { QString msg; QString error_str = worker->error_str; QNetworkReply::NetworkError error_type = worker->error_type; @@ -128,17 +180,17 @@ SWGInstanceApi::instanceAudioInputSetPatchCallback(SWGHttpRequestWorker * worker worker->deleteLater(); if (worker->error_type == QNetworkReply::NoError) { - emit instanceAudioInputSetPatchSignal(output); + emit instanceAudioInputDeleteSignal(output); } else { - emit instanceAudioInputSetPatchSignalE(output, error_type, error_str); - emit instanceAudioInputSetPatchSignalEFull(worker, error_type, error_str); + emit instanceAudioInputDeleteSignalE(output, error_type, error_str); + emit instanceAudioInputDeleteSignalEFull(worker, error_type, error_str); } } void -SWGInstanceApi::instanceAudioOutputSetPatch(SWGAudioOutputDevice& body) { +SWGInstanceApi::instanceAudioInputPatch(SWGAudioInputDevice& body) { QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/output/set"); + fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/input/parameters"); @@ -159,13 +211,120 @@ SWGInstanceApi::instanceAudioOutputSetPatch(SWGAudioOutputDevice& body) { connect(worker, &SWGHttpRequestWorker::on_execution_finished, this, - &SWGInstanceApi::instanceAudioOutputSetPatchCallback); + &SWGInstanceApi::instanceAudioInputPatchCallback); worker->execute(&input); } void -SWGInstanceApi::instanceAudioOutputSetPatchCallback(SWGHttpRequestWorker * worker) { +SWGInstanceApi::instanceAudioInputPatchCallback(SWGHttpRequestWorker * worker) { + QString msg; + QString error_str = worker->error_str; + QNetworkReply::NetworkError error_type = worker->error_type; + + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + QString json(worker->response); + SWGAudioInputDevice* output = static_cast(create(json, QString("SWGAudioInputDevice"))); + worker->deleteLater(); + + if (worker->error_type == QNetworkReply::NoError) { + emit instanceAudioInputPatchSignal(output); + } else { + emit instanceAudioInputPatchSignalE(output, error_type, error_str); + emit instanceAudioInputPatchSignalEFull(worker, error_type, error_str); + } +} + +void +SWGInstanceApi::instanceAudioOutputCleanupPatch() { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/output/cleanup"); + + + + SWGHttpRequestWorker *worker = new SWGHttpRequestWorker(); + SWGHttpRequestInput input(fullPath, "PATCH"); + + + + + + foreach(QString key, this->defaultHeaders.keys()) { + input.headers.insert(key, this->defaultHeaders.value(key)); + } + + connect(worker, + &SWGHttpRequestWorker::on_execution_finished, + this, + &SWGInstanceApi::instanceAudioOutputCleanupPatchCallback); + + worker->execute(&input); +} + +void +SWGInstanceApi::instanceAudioOutputCleanupPatchCallback(SWGHttpRequestWorker * worker) { + QString msg; + QString error_str = worker->error_str; + QNetworkReply::NetworkError error_type = worker->error_type; + + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + QString json(worker->response); + SWGSuccessResponse* output = static_cast(create(json, QString("SWGSuccessResponse"))); + worker->deleteLater(); + + if (worker->error_type == QNetworkReply::NoError) { + emit instanceAudioOutputCleanupPatchSignal(output); + } else { + emit instanceAudioOutputCleanupPatchSignalE(output, error_type, error_str); + emit instanceAudioOutputCleanupPatchSignalEFull(worker, error_type, error_str); + } +} + +void +SWGInstanceApi::instanceAudioOutputDelete(SWGAudioOutputDevice& body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/output/parameters"); + + + + SWGHttpRequestWorker *worker = new SWGHttpRequestWorker(); + SWGHttpRequestInput input(fullPath, "DELETE"); + + + + QString output = body.asJson(); + input.request_body.append(output); + + + + foreach(QString key, this->defaultHeaders.keys()) { + input.headers.insert(key, this->defaultHeaders.value(key)); + } + + connect(worker, + &SWGHttpRequestWorker::on_execution_finished, + this, + &SWGInstanceApi::instanceAudioOutputDeleteCallback); + + worker->execute(&input); +} + +void +SWGInstanceApi::instanceAudioOutputDeleteCallback(SWGHttpRequestWorker * worker) { QString msg; QString error_str = worker->error_str; QNetworkReply::NetworkError error_type = worker->error_type; @@ -183,10 +342,65 @@ SWGInstanceApi::instanceAudioOutputSetPatchCallback(SWGHttpRequestWorker * worke worker->deleteLater(); if (worker->error_type == QNetworkReply::NoError) { - emit instanceAudioOutputSetPatchSignal(output); + emit instanceAudioOutputDeleteSignal(output); } else { - emit instanceAudioOutputSetPatchSignalE(output, error_type, error_str); - emit instanceAudioOutputSetPatchSignalEFull(worker, error_type, error_str); + emit instanceAudioOutputDeleteSignalE(output, error_type, error_str); + emit instanceAudioOutputDeleteSignalEFull(worker, error_type, error_str); + } +} + +void +SWGInstanceApi::instanceAudioOutputPatch(SWGAudioOutputDevice& body) { + QString fullPath; + fullPath.append(this->host).append(this->basePath).append("/sdrangel/audio/output/parameters"); + + + + SWGHttpRequestWorker *worker = new SWGHttpRequestWorker(); + SWGHttpRequestInput input(fullPath, "PATCH"); + + + + QString output = body.asJson(); + input.request_body.append(output); + + + + foreach(QString key, this->defaultHeaders.keys()) { + input.headers.insert(key, this->defaultHeaders.value(key)); + } + + connect(worker, + &SWGHttpRequestWorker::on_execution_finished, + this, + &SWGInstanceApi::instanceAudioOutputPatchCallback); + + worker->execute(&input); +} + +void +SWGInstanceApi::instanceAudioOutputPatchCallback(SWGHttpRequestWorker * worker) { + QString msg; + QString error_str = worker->error_str; + QNetworkReply::NetworkError error_type = worker->error_type; + + if (worker->error_type == QNetworkReply::NoError) { + msg = QString("Success! %1 bytes").arg(worker->response.length()); + } + else { + msg = "Error: " + worker->error_str; + } + + + QString json(worker->response); + SWGAudioOutputDevice* output = static_cast(create(json, QString("SWGAudioOutputDevice"))); + worker->deleteLater(); + + if (worker->error_type == QNetworkReply::NoError) { + emit instanceAudioOutputPatchSignal(output); + } else { + emit instanceAudioOutputPatchSignalE(output, error_type, error_str); + emit instanceAudioOutputPatchSignalEFull(worker, error_type, error_str); } } diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h index dad11e8a8..3554b2d4a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h @@ -31,6 +31,7 @@ #include "SWGPresetImport.h" #include "SWGPresetTransfer.h" #include "SWGPresets.h" +#include "SWGSuccessResponse.h" #include @@ -49,8 +50,12 @@ public: QMap defaultHeaders; void instanceAudioGet(); - void instanceAudioInputSetPatch(SWGAudioInputDevice& body); - void instanceAudioOutputSetPatch(SWGAudioOutputDevice& body); + void instanceAudioInputCleanupPatch(); + void instanceAudioInputDelete(SWGAudioInputDevice& body); + void instanceAudioInputPatch(SWGAudioInputDevice& body); + void instanceAudioOutputCleanupPatch(); + void instanceAudioOutputDelete(SWGAudioOutputDevice& body); + void instanceAudioOutputPatch(SWGAudioOutputDevice& body); void instanceChannels(qint32 tx); void instanceDVSerialPatch(qint32 dvserial); void instanceDelete(); @@ -71,8 +76,12 @@ public: private: void instanceAudioGetCallback (SWGHttpRequestWorker * worker); - void instanceAudioInputSetPatchCallback (SWGHttpRequestWorker * worker); - void instanceAudioOutputSetPatchCallback (SWGHttpRequestWorker * worker); + void instanceAudioInputCleanupPatchCallback (SWGHttpRequestWorker * worker); + void instanceAudioInputDeleteCallback (SWGHttpRequestWorker * worker); + void instanceAudioInputPatchCallback (SWGHttpRequestWorker * worker); + void instanceAudioOutputCleanupPatchCallback (SWGHttpRequestWorker * worker); + void instanceAudioOutputDeleteCallback (SWGHttpRequestWorker * worker); + void instanceAudioOutputPatchCallback (SWGHttpRequestWorker * worker); void instanceChannelsCallback (SWGHttpRequestWorker * worker); void instanceDVSerialPatchCallback (SWGHttpRequestWorker * worker); void instanceDeleteCallback (SWGHttpRequestWorker * worker); @@ -93,8 +102,12 @@ private: signals: void instanceAudioGetSignal(SWGAudioDevices* summary); - void instanceAudioInputSetPatchSignal(SWGAudioInputDevice* summary); - void instanceAudioOutputSetPatchSignal(SWGAudioOutputDevice* summary); + void instanceAudioInputCleanupPatchSignal(SWGSuccessResponse* summary); + void instanceAudioInputDeleteSignal(SWGAudioInputDevice* summary); + void instanceAudioInputPatchSignal(SWGAudioInputDevice* summary); + void instanceAudioOutputCleanupPatchSignal(SWGSuccessResponse* summary); + void instanceAudioOutputDeleteSignal(SWGAudioOutputDevice* summary); + void instanceAudioOutputPatchSignal(SWGAudioOutputDevice* summary); void instanceChannelsSignal(SWGInstanceChannelsResponse* summary); void instanceDVSerialPatchSignal(SWGDVSeralDevices* summary); void instanceDeleteSignal(SWGInstanceSummaryResponse* summary); @@ -114,8 +127,12 @@ signals: void instanceSummarySignal(SWGInstanceSummaryResponse* summary); void instanceAudioGetSignalE(SWGAudioDevices* summary, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceAudioInputSetPatchSignalE(SWGAudioInputDevice* summary, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceAudioOutputSetPatchSignalE(SWGAudioOutputDevice* summary, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioInputCleanupPatchSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioInputDeleteSignalE(SWGAudioInputDevice* summary, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioInputPatchSignalE(SWGAudioInputDevice* summary, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioOutputCleanupPatchSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioOutputDeleteSignalE(SWGAudioOutputDevice* summary, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioOutputPatchSignalE(SWGAudioOutputDevice* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceChannelsSignalE(SWGInstanceChannelsResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceDVSerialPatchSignalE(SWGDVSeralDevices* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceDeleteSignalE(SWGInstanceSummaryResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); @@ -135,8 +152,12 @@ signals: void instanceSummarySignalE(SWGInstanceSummaryResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceAudioGetSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceAudioInputSetPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceAudioOutputSetPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioInputCleanupPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioInputDeleteSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioInputPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioOutputCleanupPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioOutputDeleteSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); + void instanceAudioOutputPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceChannelsSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceDVSerialPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceDeleteSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);