Updated to C++2.1 (#76)

Author: 4thlabs

.github/actions/configure/action.yml

@@ -20,7 +20,7 @@ runs:
       uses: robinraju/release-downloader@v1.4
       with:
         repository: "DolbyIO/comms-sdk-cpp"
-        tag: "2.0.0"
+        tag: "2.1.0"
         fileName: "${{ inputs.cpp-sdk }}"
         out-file-path: "cppsdk.zip"
 

.github/workflows/build-and-test.yml

@@ -10,10 +10,10 @@ jobs:
         os: [macos-latest, windows-latest]
         include:
           - os: macos-latest
-            sdk: cppsdk-2.0.0-macos64.zip
+            sdk: cppsdk-2.1.0-macos64.zip
             shell: bash
           - os: windows-latest
-            sdk: cppsdk-2.0.0-windows64.zip
+            sdk: cppsdk-2.1.0-windows64.zip
             shell: powershell
 
     steps:

.github/workflows/package.yml

@@ -11,11 +11,11 @@ jobs:
         os: [macos-latest, windows-latest]
         include:
           - os: macos-latest
-            sdk: cppsdk-2.0.0-macos64.zip
+            sdk: cppsdk-2.1.0-macos64.zip
             shell: bash
             runtime: DolbyIO.Comms.Sdk.Runtime.Osx
           - os: windows-latest
-            sdk: cppsdk-2.0.0-windows64.zip
+            sdk: cppsdk-2.1.0-windows64.zip
             shell: powershell
             runtime: DolbyIO.Comms.Sdk.Runtime.Win
 
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/configure
         with:
-          cpp-sdk: cppsdk-2.0.0-macos64.zip
+          cpp-sdk: cppsdk-2.1.0-macos64.zip
       - uses: actions/download-artifact@v3
         with:
           name: nugets

.github/workflows/pages.yml

@@ -28,7 +28,7 @@ jobs:
 
       - uses: ./.github/actions/configure
         with:
-          cpp-sdk: cppsdk-2.0.0-windows64.zip
+          cpp-sdk: cppsdk-2.1.0-windows64.zip
           shell: pwsh
 
       - name: Install Docfx

src/DolbyIO.Comms.Native/audio.cc

@@ -17,25 +17,25 @@ extern "C" {
 
   EXPORT_API int StartAudio() {
     return call { [&]() {
-      wait(sdk->conference().start_audio());
+      wait(sdk->audio().local().start());
     }}.result();
   }
 
   EXPORT_API int StopAudio() {
     return call { [&]() {
-      wait(sdk->conference().stop_audio());
+      wait(sdk->audio().local().stop());
     }}.result();
   }
 
     EXPORT_API int StartRemoteAudio(char* participant_id) {
     return call { [&]() {
-      wait(sdk->conference().start_remote_audio(std::string(participant_id)));
+      wait(sdk->audio().remote().start(std::string(participant_id)));
     }}.result();
   }
 
   EXPORT_API int StopRemoteAudio(char* participant_id) {
     return call { [&]() {
-      wait(sdk->conference().stop_remote_audio(std::string(participant_id)));
+      wait(sdk->audio().remote().stop(std::string(participant_id)));
     }}.result();
   }
 

src/DolbyIO.Comms.Native/conference.h

@@ -44,7 +44,6 @@ namespace dolbyio::comms::native {
   struct media_constraints {
     bool audio;
     //bool video;
-    bool audio_processing;
     bool send_only;
   };
 
@@ -166,7 +165,7 @@ namespace dolbyio::comms::native {
       dest->alias = strdup(src.alias.value_or(""));
       dest->is_new = src.is_new;
       dest->status = to_underlying(src.status);
-      dest->spatial_audio_style = to_underlying(src.spatial_audio_style);
+      dest->spatial_audio_style = to_underlying(src.spatial_audio_style.value_or(dolbyio::comms::spatial_audio_style::disabled));
 
       for (int i = 0; i < src.permissions.size(); i++) {
         dest->permissions[i] = to_underlying(src.permissions.at(i));
@@ -206,15 +205,13 @@ namespace dolbyio::comms::native {
       no_alloc_to_c(&dest->connection, src.connection);
 
       dest->constraints.audio = src.constraints.audio;
-      dest->constraints.audio_processing = src.constraints.audio_processing;
       dest->constraints.send_only = src.constraints.send_only;
     }
 
     static void to_cpp(typename Traits::cpp_type& dest, typename Traits::c_type* src) {
       no_alloc_to_cpp(dest.connection, &src->connection);
 
       dest.constraints.audio = src->constraints.audio;
-      dest.constraints.audio_processing = src->constraints.audio_processing;
       dest.constraints.send_only = src->constraints.send_only;
     }
   };

src/DolbyIO.Comms.Sdk/Native/Struct.cs

@@ -298,14 +298,6 @@ public class MediaConstraints
         [MarshalAs(UnmanagedType.U1)]
         public bool Audio = false;
 
-        /// <summary>
-        /// A boolean that enables and disables audio processing on the server side for the 
-        /// injected audio.
-        /// </summary>
-        /// <returns>If true, audio is processed.</returns>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool AudioProcessing = true;
-
         /// <summary>
         /// A boolean that allows a participant to join a conference as a sender. This
         /// is strictly intended for Server Side SDK applications that

src/DolbyIO.Comms.Tests/ConferenceTests.cs

@@ -59,7 +59,6 @@ public void Test_JoinOptions_ShouldMarshall()
             src.Connection.SpatialAudio = true;
 
             src.Constraints.Audio = true;
-            src.Constraints.AudioProcessing = true;
 
             JoinOptions dest = new JoinOptions();
             NativeTests.JoinOptionsTest(src, dest);
@@ -68,7 +67,6 @@ public void Test_JoinOptions_ShouldMarshall()
             Assert.Equal(src.Connection.ConferenceAccessToken, dest.Connection.ConferenceAccessToken);
             Assert.Equal(src.Connection.SpatialAudio, dest.Connection.SpatialAudio);
             Assert.Equal(src.Constraints.Audio, dest.Constraints.Audio);
-            Assert.Equal(src.Constraints.AudioProcessing, dest.Constraints.AudioProcessing);
         }
 
         [Fact]