Revert "Merge pull request #16183 from mcav/alarm-volume"

This reverts commit bb7e44e, reversing
changes made to 6274b36.

apps/clock/js/panels/alarm_edit/main.js

@@ -5,7 +5,6 @@ var Alarm = require('alarm');
 var AlarmList = require('panels/alarm/alarm_list');
 var AlarmManager = require('alarm_manager');
 var ClockView = require('panels/alarm/clock_view');
-var AudioManager = require('audio_manager');
 var FormButton = require('form_button');
 var Sounds = require('sounds');
 var Utils = require('utils');
@@ -30,8 +29,7 @@ var AlarmEdit = function() {
   }, this);
 
   this.inputs = {
-    name: this.element.querySelector('#alarm-name'),
-    volume: this.element.querySelector('#alarm-volume-input')
+    name: this.element.querySelector('#alarm-name')
   };
 
   this.buttons = {};
@@ -94,7 +92,6 @@ var AlarmEdit = function() {
   this.selects.repeat.addEventListener('change', handleDomEvent);
   this.buttons.delete.addEventListener('click', handleDomEvent);
   this.inputs.name.addEventListener('keypress', this.handleNameInput);
-  this.inputs.volume.addEventListener('change', this);
 
   // If the phone locks during preview, pause the sound.
   // TODO: When this is no longer a singleton, unbind the listener.
@@ -150,7 +147,7 @@ Utils.extend(AlarmEdit.prototype, {
     hour24State: null,
     is12hFormat: false
   },
-  ringtonePlayer: AudioManager.createAudioPlayer(),
+  previewRingtonePlayer: null,
 
   handleNameInput: function(evt) {
     // If the user presses enter on the name label, dismiss the
@@ -216,10 +213,6 @@ Utils.extend(AlarmEdit.prototype, {
       case this.selects.repeat:
         this.alarm.repeat = this.buttons.repeat.value;
         break;
-      case this.inputs.volume:
-        // Alarm Volume is applied to all alarms.
-        AudioManager.setAlarmVolume(this.getAlarmVolumeValue());
-        break;
     }
   },
 
@@ -245,7 +238,6 @@ Utils.extend(AlarmEdit.prototype, {
     // to be "undefined" rather than "".
     this.element.dataset.id = this.alarm.id || '';
     this.inputs.name.value = this.alarm.label;
-    this.inputs.volume.value = AudioManager.getAlarmVolume();
 
     // Init time, repeat, sound, snooze selection menu.
     this.initTimeSelect();
@@ -279,12 +271,25 @@ Utils.extend(AlarmEdit.prototype, {
   },
 
   previewSound: function aev_previewSound() {
+    var ringtonePlayer = this.previewRingtonePlayer;
+    if (!ringtonePlayer) {
+      this.previewRingtonePlayer = new Audio();
+      ringtonePlayer = this.previewRingtonePlayer;
+    } else {
+      ringtonePlayer.pause();
+    }
+
     var ringtoneName = this.getSoundSelect();
-    this.ringtonePlayer.playRingtone(ringtoneName);
+    var previewRingtone = 'shared/resources/media/alarms/' + ringtoneName;
+    ringtonePlayer.mozAudioChannelType = 'alarm';
+    ringtonePlayer.src = previewRingtone;
+    ringtonePlayer.play();
   },
 
   stopPreviewSound: function aev_stopPreviewSound() {
-    this.ringtonePlayer.pause();
+    if (this.previewRingtonePlayer) {
+      this.previewRingtonePlayer.pause();
+    }
   },
 
   initVibrateSelect: function aev_initVibrateSelect() {
@@ -307,10 +312,6 @@ Utils.extend(AlarmEdit.prototype, {
     return this.buttons.repeat.value;
   },
 
-  getAlarmVolumeValue: function() {
-    return parseFloat(this.inputs.volume.value);
-  },
-
   save: function aev_save(callback) {
     if (this.element.dataset.id !== '') {
       this.alarm.id = parseInt(this.element.dataset.id, 10);
@@ -327,7 +328,6 @@ Utils.extend(AlarmEdit.prototype, {
     this.alarm.sound = this.getSoundSelect();
     this.alarm.vibrate = this.getVibrateSelect();
     this.alarm.snooze = parseInt(this.getSnoozeSelect(), 10);
-    AudioManager.setAlarmVolume(this.getAlarmVolumeValue());
 
     if (!error) {
       this.alarm.cancel();

apps/clock/js/panels/alarm_edit/panel.html

@@ -61,14 +61,6 @@ <h1 id="alarm-title">
       <option data-l10n-id="nMinutes" data-l10n-args='{"n": "20"}' value="20">20 minutes</option>
     </select>
   </li>
-  <li>
-    <label class="alarm-volume-lbl"
-           id="alarm-volume-lbl"
-           data-l10n-id="alarm-volume-label">Alarm Volume</label>
-    <!-- 0.0625 is 1/16th, which matches the step size in System Settings. -->
-    <input id="alarm-volume-input" step="0.0625" min="0" value="1" max="1"
-           type="range">
-  </li>
   <li id="delete-menu">
     <button id="alarm-delete" class="danger full" data-l10n-id="delete">Delete</button>
   </li>

apps/clock/js/panels/timer/main.js

@@ -11,7 +11,6 @@ var Sounds = require('sounds');
 var mozL10n = require('l10n');
 var FormButton = require('form_button');
 var html = require('text!panels/timer/panel.html');
-var AudioManager = require('audio_manager');
 
 var priv = new WeakMap();
 
@@ -55,8 +54,6 @@ Timer.Panel = function(element) {
     }
   });
 
-  this.ringtonePlayer = AudioManager.createAudioPlayer();
-
   Timer.singleton(function(err, timer) {
     this.timer = timer;
     timer.on('end', this.dialog.bind(this));
@@ -203,15 +200,26 @@ Timer.Panel.prototype.toggle = function(show, hide) {
  * previewAlarm Plays the currently selected alarm value on a loop.
  */
 Timer.Panel.prototype.previewAlarm = function() {
+  if (!this.ringtonePlayer) {
+    this.ringtonePlayer = new Audio();
+    this.ringtonePlayer.mozAudioChannelType = 'alarm';
+    this.ringtonePlayer.loop = true;
+  }
+  this.ringtonePlayer.pause();
+
   var ringtoneName = Utils.getSelectedValueByIndex(this.nodes.sound);
-  this.ringtonePlayer.playRingtone(ringtoneName);
+  var previewRingtone = 'shared/resources/media/alarms/' + ringtoneName;
+  this.ringtonePlayer.src = previewRingtone;
+  this.ringtonePlayer.play();
 };
 
 /**
  * pauseAlarm stops the alarm if it is playing
  */
 Timer.Panel.prototype.pauseAlarm = function() {
-  this.ringtonePlayer.pause();
+  if (this.ringtonePlayer) {
+    this.ringtonePlayer.pause();
+  }
 };
 
 /**

apps/clock/js/ring_view.js

@@ -3,16 +3,13 @@ define(function(require) {
 
 var Utils = require('utils');
 var mozL10n = require('l10n');
-var AudioManager = require('audio_manager');
 var _ = mozL10n.get;
 
 var messageHandlerMapping;
 
 function RingView(opts = {}) {
   Utils.extend(this, {
-    ringtonePlayer: AudioManager.createAudioPlayer({
-      interruptHandler: this
-    }),
+    ringtonePlayer: null,
     vibrateInterval: null,
     screenLock: null,
     message: {},
@@ -163,9 +160,15 @@ RingView.prototype.display = function rv_display() {
 RingView.prototype.ring = function rv_ring(state) {
   if (state) {
     if (this.notificationOptions.sound) {
-      this.ringtonePlayer.playRingtone(this.notificationOptions.sound);
+      var ringtonePlayer = this.ringtonePlayer = new Audio();
+      ringtonePlayer.addEventListener('mozinterruptbegin', this);
+      ringtonePlayer.mozAudioChannelType = 'alarm';
+      ringtonePlayer.loop = true;
+      ringtonePlayer.src = 'shared/resources/media/alarms/' +
+        this.notificationOptions.sound;
+      ringtonePlayer.play();
     }
-  } else {
+  } else if (this.ringtonePlayer) {
     this.ringtonePlayer.pause();
   }
 };

apps/clock/js/utils.js

@@ -159,8 +159,7 @@ Utils.extend = function(initialObject, extensions) {
   for (var i = 0; i < extensions.length; i++) {
     var extender = extensions[i];
     for (var prop in extender) {
-      var descriptor = Object.getOwnPropertyDescriptor(extender, prop);
-      if (descriptor && descriptor.value !== undefined) {
+      if (Object.prototype.hasOwnProperty.call(extender, prop)) {
         initialObject[prop] = extender[prop];
       }
     }