Merge branch 'develop' of github.com:shiguredo/sora-unity-sdk into de…

…velop
shiguredo · Nov 18, 2019 · e53309f · e53309f
2 parents f25fdea + f1a1852
commit e53309f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
  [![GitHub tag](https://img.shields.io/github/tag/shiguredo/sora-unity-sdk.svg)](https://github.com/shiguredo/sora-unity-sdk)
  [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+ [![Actions Status](https://github.com/shiguredo/sora-unity-sdk/workflows/build/badge.svg)](https://github.com/shiguredo/sora-unity-sdk/actions)
 
 Sora Unity SDK は [WebRTC SFU Sora](https://sora.shiguredo.jp/) の Unity クライアントアプリケーションを開発するためのライブラリです。
 
@@ -44,6 +45,7 @@ Sora Unity SDK に対する有償のサポートについては現在提供し
 - マイクから音声を取得し Unity アプリに出力
 - Unity アプリで Sora からの音声を受信
 - Unity アプリで Sora からの映像を受信
+- Unity アプリで Sora からの音声を再生
 - Sora から受信した音声を Unity アプリに出力
 - Sora から受信した映像を Unity アプリに出力
 - マルチストリームへの対応

diff --git a/cmake.sh b/cmake.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 INSTALL_DIR="`pwd`/_install"
 MODULE_PATH="`pwd`/cmake"
 

diff --git a/src/unity_audio_device.h b/src/unity_audio_device.h
@@ -201,7 +201,8 @@ class UnityAudioDevice : public webrtc::AudioDeviceModule {
     }
   }
   virtual bool PlayoutIsInitialized() const override {
-    auto result = adm_playout_ ? adm_->PlayoutIsInitialized() : is_playing_;
+    auto result =
+        adm_playout_ ? adm_->PlayoutIsInitialized() : (bool)is_playing_;
     RTC_LOG(LS_INFO) << "PlayoutIsInitialized: result=" << result;
     return result;
   }
@@ -224,7 +225,8 @@ class UnityAudioDevice : public webrtc::AudioDeviceModule {
     }
   }
   virtual bool RecordingIsInitialized() const override {
-    return adm_recording_ ? adm_->RecordingIsInitialized() : is_recording_;
+    return adm_recording_ ? adm_->RecordingIsInitialized()
+                          : (bool)is_recording_;
   }
 
   // Audio transport control
@@ -256,8 +258,7 @@ class UnityAudioDevice : public webrtc::AudioDeviceModule {
     }
   }
   virtual bool Playing() const override {
-    return adm_playout_ ? adm_->Playing() : is_playing_;
-    ;
+    return adm_playout_ ? adm_->Playing() : (bool)is_playing_;
   }
   virtual int32_t StartRecording() override {
     return adm_recording_ ? adm_->StartRecording() : 0;
@@ -266,7 +267,7 @@ class UnityAudioDevice : public webrtc::AudioDeviceModule {
     return adm_recording_ ? adm_->StopRecording() : 0;
   }
   virtual bool Recording() const override {
-    return adm_recording_ ? adm_->Recording() : is_recording_;
+    return adm_recording_ ? adm_->Recording() : (bool)is_recording_;
   }
 
   // Audio mixer initialization
@@ -346,7 +347,7 @@ class UnityAudioDevice : public webrtc::AudioDeviceModule {
     } else {
       // 今はステレオには対応しない
       //*available = true;
-      available = false;
+      *available = false;
       return 0;
     }
   }