Synchronise stream volume with app volume

README.md

@@ -3,7 +3,7 @@ Rdio for Nuvola Player 3
 
 Integration of Rdio into your linux desktop via
 [Nuvola Player](https://github.com/tiliado/nuvolaplayer).
- 
+
 Support
 -------
 
@@ -19,6 +19,7 @@ Installation
 
 Copyright
 ---------
+  - Copyright 2015 Jordan Klassen <[email protected]>
   - Copyright 2015 Aaron Cripps <[email protected]>
   - Copyright 2014 Jiří Janoušek <[email protected]>
   - Copyright 2014 Martin Pöhlmann <[email protected]>

integrate.js

@@ -3,6 +3,7 @@
  * Copyright 2014 Martin Pöhlmann <[email protected]>
  * Copyright 2014 Jiří Janoušek <[email protected]>
  * Copyright 2015 Aaron Cripps <[email protected]>
+ * Copyright 2015 Jordan Klassen <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -75,7 +76,7 @@
 		}
 
 		var state = PlaybackState.UNKNOWN;
-		
+
 		try
 		{
 			var playingTrack = R.Services.Player.model.get("playingTrack").attributes;
@@ -116,6 +117,23 @@
 		player.setCanPlay(canPlay);
 		player.setCanPause(canPause);
 
+		// synchronise stream volume with app volume
+		if (state == PlaybackState.PLAYING) {
+			try {
+				var playerVolume = R.Services.Player.volume();
+				var streamVolume = R.Services.Player._audio._element.volume;
+				if (streamVolume != null) {
+					streamVolume = Math.sqrt(streamVolume);
+					if (Math.abs(streamVolume - playerVolume) >= 0.01) {
+						R.Services.Player.volume(streamVolume);
+					}
+				}
+			}
+			catch (e) {
+				// do nothing
+			}
+		}
+
 		// Schedule the next update
 		setTimeout(this.update.bind(this), 500);
 	}