Add OpenWebRTCLocalAudioSource with volume property

OpenWebRTC-SDK.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
     :git => "https://github.com/EricssonResearch/openwebrtc-ios-sdk.git",
     :tag => "0.4"
   }
-  s.source_files = "SDK/**/*.{h,m}"
+  s.source_files = "OpenWebRTC-SDK/**/*.{h,m}"
   s.resources = "Resources/**"
   s.dependency 'OpenWebRTC'
   #s.resource = { :http => "https://github.com/EricssonResearch/openwebrtc/blob/master/bridge/client/sdp.js" }

SDK/OpenWebRTC.h → OpenWebRTC-SDK/OpenWebRTC.h

@@ -32,6 +32,7 @@
 #import <OpenWebRTC-SDK/OpenWebRTCUtils.h>
 #import <OpenWebRTC-SDK/OpenWebRTCSettings.h>
 #import <OpenWebRTC-SDK/OpenWebRTCNativeHandler.h>
+#import <OpenWebRTC-SDK/OpenWebRTCLocalAudioSource.h>
 
 #import "owr.h"
 

OpenWebRTC-SDK/OpenWebRTCLocalAudioSource.h

@@ -0,0 +1,44 @@
+//
+//  OpenWebRTCLocalAudioSource.h
+//
+//  Copyright (c) 2016, Ericsson AB.
+//  All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without modification,
+//  are permitted provided that the following conditions are met:
+//
+//  1. Redistributions of source code must retain the above copyright notice, this
+//  list of conditions and the following disclaimer.
+//
+//  2. Redistributions in binary form must reproduce the above copyright notice, this
+//  list of conditions and the following disclaimer in the documentation and/or other
+//  materials provided with the distribution.
+
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+//  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+//  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+//  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+//  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+//  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+//  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+//  OF SUCH DAMAGE.
+//
+
+#ifndef OpenWebRTCLocalAudioSource_h
+#define OpenWebRTCLocalAudioSource_h
+
+typedef struct _OwrLocalMediaSource OwrLocalMediaSource;
+
+@interface OpenWebRTCLocalAudioSource : NSValue
+
+@property (readonly) const char *objCType;
+@property double volume;
+
+- (instancetype)initWithLocalMediaSource:(OwrLocalMediaSource *)localMediaSource;
+- (void)getValue:(void *)value;
+
+@end
+
+#endif /* OpenWebRTCLocalAudioSource_h */

OpenWebRTC-SDK/OpenWebRTCLocalAudioSource.m

@@ -0,0 +1,76 @@
+//
+//  OpenWebRTCLocalAudioSource.m
+//
+//  Copyright (c) 2016, Ericsson AB.
+//  All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without modification,
+//  are permitted provided that the following conditions are met:
+//
+//  1. Redistributions of source code must retain the above copyright notice, this
+//  list of conditions and the following disclaimer.
+//
+//  2. Redistributions in binary form must reproduce the above copyright notice, this
+//  list of conditions and the following disclaimer in the documentation and/or other
+//  materials provided with the distribution.
+
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+//  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+//  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+//  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+//  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+//  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+//  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+//  OF SUCH DAMAGE.
+//
+
+@import Foundation;
+
+#include "glib-object.h"
+#include "OpenWebRTCLocalAudioSource.h"
+
+@interface OpenWebRTCLocalAudioSource ()
+{
+    OwrLocalMediaSource *_mediaSource;
+}
+@end
+
+@implementation OpenWebRTCLocalAudioSource
+
+#pragma mark - Public methods
+
+- (instancetype)initWithLocalMediaSource:(OwrLocalMediaSource *)mediaSource {
+    if (self = [super init]) {
+        _mediaSource = mediaSource;
+        g_object_ref(mediaSource);
+    }
+
+    return self;
+}
+
+- (void)getValue:(void *)value {
+    *((void **)value) = _mediaSource;
+}
+
+- (const char *)objCType {
+    return @encode(OwrLocalMediaSource *);
+}
+
+- (void)dealloc {
+    g_object_unref(_mediaSource);
+    _mediaSource = nil;
+}
+
+- (double)volume {
+    double volume;
+    g_object_get(_mediaSource, "volume", &volume, NULL);
+    return volume;
+}
+
+- (void)setVolume:(double)localSourceVolume {
+    g_object_set(_mediaSource, "volume", localSourceVolume, NULL);
+}
+
+@end

SDK/OpenWebRTCNativeHandler.m → OpenWebRTC-SDK/OpenWebRTCNativeHandler.m

@@ -26,6 +26,9 @@
 //  OF SUCH DAMAGE.
 //
 
+@import Foundation;
+
+#import "OpenWebRTCLocalAudioSource.h"
 #import "OpenWebRTCNativeHandler.h"
 #import "OpenWebRTCUtils.h"
 
@@ -36,6 +39,7 @@
 #include "owr_audio_payload.h"
 #include "owr_audio_renderer.h"
 #include "owr_media_session.h"
+#include "owr_local_media_source.h"
 #include "owr_transport_agent.h"
 #include "owr_video_payload.h"
 #include "owr_video_renderer.h"
@@ -1145,23 +1149,32 @@ static void got_local_sources(GList *sources)
         OwrMediaSource *source = NULL;
         OwrMediaType media_type;
         OwrMediaType source_type;
+        NSValue *source_value;
+        NSString *media_type_name;
 
         source = sources->data;
         g_assert(OWR_IS_MEDIA_SOURCE(source));
 
         g_object_get(source, "name", &name, "type", &source_type, "media-type", &media_type, NULL);
+
+        if (media_type == OWR_MEDIA_TYPE_AUDIO) {
+            source_value = [[OpenWebRTCLocalAudioSource alloc] initWithLocalMediaSource:OWR_LOCAL_MEDIA_SOURCE(source)];
+            media_type_name = @"audio";
+        } else {
+            /* We ref the sources because we want them to stay around. On iOS they will never be
+             * unplugged, I expect, but it's safer this way. */
+            g_object_ref(source);
+            source_value = [NSValue valueWithPointer:source];
+            media_type_name = @"video";
+        }
 
-        /* We ref the sources because we want them to stay around. On iOS they will never be
-         * unplugged, I expect, but it's safer this way. */
-        g_object_ref(source);
-
-        g_print("[%s/%s] %s\n", media_type == OWR_MEDIA_TYPE_AUDIO ? "audio" : "video",
+        g_print("[%s/%s] %s\n", media_type_name,
                 source_type == OWR_SOURCE_TYPE_CAPTURE ? "capture" : source_type == OWR_SOURCE_TYPE_TEST ? "test" : "unknown",
                 name);
 
         [staticSelf.localSourceArray addObject:@{@"name": [NSString stringWithUTF8String:name],
-                                 @"source": [NSValue valueWithPointer:source],
-                                 @"mediaType": media_type == OWR_MEDIA_TYPE_AUDIO ? @"audio" : @"video"
+                                 @"source": source_value,
+                                 @"mediaType": media_type_name
                                  }];
 
         if (!have_video && media_type == OWR_MEDIA_TYPE_VIDEO && source_type == OWR_SOURCE_TYPE_CAPTURE) {

SDK/OpenWebRTCSettings.m → OpenWebRTC-SDK/OpenWebRTCSettings.m

@@ -26,6 +26,8 @@
 //  OF SUCH DAMAGE.
 //
 
+@import Foundation;
+
 #import "OpenWebRTCSettings.h"
 
 @implementation OpenWebRTCSettings

SDK/OpenWebRTCUtils.m → OpenWebRTC-SDK/OpenWebRTCUtils.m

@@ -26,6 +26,8 @@
 //  OF SUCH DAMAGE.
 //
 
+@import Foundation;
+
 #import "OpenWebRTCUtils.h"
 
 @import JavaScriptCore;