Merge pull request #4 from pauldemarco/master

Volume control from @pauldemarco
bluefireteam · Nov 18, 2017 · 4e9d9e8 · 4e9d9e8
2 parents 46c5988 + f1edfac
commit 4e9d9e8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 174 deletions.
diff --git a/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java b/android/src/main/java/bz/rxla/audioplayer/AudioplayerPlugin.java
@@ -43,7 +43,8 @@ public void onMethodCall(MethodCall call, MethodChannel.Result response) {
         String playerId = ((HashMap) call.arguments()).get("playerId").toString();
         if (call.method.equals("play")) {
             String url = ((HashMap) call.arguments()).get("url").toString();
-            Boolean resPlay = play(playerId, url);
+            double volume = (double)((HashMap) call.arguments()).get("volume");
+            Boolean resPlay = play(playerId, url, (float)volume);
             response.success(1);
         } else if (call.method.equals("pause")) {
             pause(playerId);
@@ -83,7 +84,7 @@ private void pause(String playerId) {
         handler.removeCallbacks(sendData);
     }
 
-    private Boolean play(final String playerId, String url) {
+    private Boolean play(final String playerId, String url, float volume) {
         MediaPlayer mediaPlayer = mediaPlayers.get(playerId);
         if (mediaPlayer == null) {
             mediaPlayer = new MediaPlayer();
@@ -107,6 +108,7 @@ private Boolean play(final String playerId, String url) {
 
         channel.invokeMethod("audio.onDuration", buildArguments(playerId, mediaPlayer.getDuration()));
 
+        mediaPlayer.setVolume(volume, volume);
         mediaPlayer.start();
 
         mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {

diff --git a/ios/Classes/AudioplayerPlugin.m b/ios/Classes/AudioplayerPlugin.m
@@ -66,9 +66,13 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
                                   result(0);
                                 if (call.arguments[@"isLocal"]==nil)
                                   result(0);
+                                if (call.arguments[@"volume"]==nil)
+                                  result(0);
                                 int isLocal = [call.arguments[@"isLocal"]intValue] ;
+                                float volume = (float)[call.arguments[@"volume"] doubleValue] ;
                                 NSLog(@"isLocal: %d %@",isLocal, call.arguments[@"isLocal"] );
-                                [self togglePlay:playerId url:url isLocal:isLocal];
+                                NSLog(@"volume: %f %@",volume, call.arguments[@"volume"] );
+                                [self togglePlay:playerId url:url isLocal:isLocal volume:volume];
                               },
                             @"pause":
                               ^{
@@ -104,6 +108,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 -(void) togglePlay: (NSString*) playerId
                url: (NSString*) url
            isLocal: (int) isLocal
+            volume: (float) volume
 {
   NSMutableDictionary * playerInfo = players[playerId];
   AVPlayer *player = playerInfo[@"player"];
@@ -167,6 +172,7 @@ -(void) togglePlay: (NSString*) playerId
     [ self pause:playerId ];
   } else {
     [ self updateDuration:playerId ];
+    [ player setVolume:volume ];
     [ player play];
     [playerInfo setObject:@true forKey:@"isPlaying"];
   }

diff --git a/ios/Classes/SwiftAudioplayerPlugin.swift b/ios/Classes/SwiftAudioplayerPlugin.swift
diff --git a/lib/audioplayer.dart b/lib/audioplayer.dart
@@ -11,7 +11,7 @@ class AudioPlayer {
   static final MethodChannel _channel = const MethodChannel('bz.rxla.flutter/audio')..setMethodCallHandler(platformCallHandler);
   static final uuid = new Uuid();
   static final players = new Map<String, AudioPlayer>();
-  static var logEnabled = true;
+  static var logEnabled = false;
 
   TimeChangeHandler durationHandler;
   TimeChangeHandler positionHandler;
@@ -24,8 +24,8 @@ class AudioPlayer {
     players[playerId] = this;
   }
 
-  Future<int> play(String url, {bool isLocal: false}) =>
-      _channel.invokeMethod('play', {"playerId": playerId, "url": url, "isLocal": isLocal});
+  Future<int> play(String url, {bool isLocal: false, double volume: 1.0}) =>
+      _channel.invokeMethod('play', {"playerId": playerId, "url": url, "isLocal": isLocal, 'volume': volume});
 
   Future<int> pause() => _channel.invokeMethod('pause', {"playerId": playerId});