Merge pull request #31 from sanbornhnewyyz/feature/getAdaptationState

Feature/get adaptation state
shaka-project · Mar 11, 2015 · 3a92f42 · 3a92f42
2 parents fd26657 + 34e3aba
commit 3a92f42
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -14,3 +14,4 @@
 # Please keep the list sorted.
 
 Google Inc. <*@google.com>
+Sanborn Hilland <sanbornh@rogers.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -24,5 +24,6 @@
 
 Joey Parrish <joeyparrish@google.com>
 Natalie Harris <natalieharris@google.com>
+Sanborn Hilland <sanbornh@rogers.com>
 Timothy Drews <tdrews@google.com>
 Vasanth Polipelli <vasanthap@google.com>
diff --git a/lib/player/player.js b/lib/player/player.js
@@ -1008,6 +1008,15 @@ shaka.player.Player.prototype.enableAdaptation = function(enabled) {
 };
 
 
+/**
+ * @return {boolean} Return true if automatic bitrate adaptation enabled.
+ * @export
+ */
+shaka.player.Player.prototype.getAdaptationEnabled = function() {
+  return this.adaptationEnabled_;
+};
+
+
 /**
  * @return {number} Current playback time in seconds.
  * @export
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,4 @@
		# Please keep the list sorted.

		Google Inc. <*@google.com>
		Sanborn Hilland <sanbornh@rogers.com>