From bbdc02063dc3e34204258c5597e77be283e50b31 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 12 Nov 2014 00:15:13 +0300
Subject: [PATCH] Fixed audio player mime, empty volume

---
 app/js/directives.js                   | 2 +-
 app/partials/desktop/audio_player.html | 2 +-
 app/partials/mobile/audio_player.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/js/directives.js b/app/js/directives.js
index 0b53b771..6d75cf97 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -2018,7 +2018,7 @@ angular.module('myApp.directives', ['myApp.filters'])
     var audioVolume = 0.5;
 
     Storage.get('audio_volume').then(function (newAudioVolume) {
-      if (newAudioVolume >= 0.0 && newAudioVolume <= 1.0) {
+      if (newAudioVolume > 0 && newAudioVolume <= 1.0) {
         audioVolume = newAudioVolume;
       }
     });
diff --git a/app/partials/desktop/audio_player.html b/app/partials/desktop/audio_player.html
index 550f7015..9ce4444e 100644
--- a/app/partials/desktop/audio_player.html
+++ b/app/partials/desktop/audio_player.html
@@ -35,6 +35,6 @@
 	  </div>
 	</div>
 	<audio ng-if="audio.url" media-player="mediaPlayer.player">
-	  <source ng-src="{{::audio.url}}" type="audio/ogg" volume="{{::volume}}" />
+	  <source ng-src="{{::audio.url}}" type="{{audio.mime_type || 'audio/ogg'}}" volume="{{::volume}}" />
 	</audio>
 </div>
\ No newline at end of file
diff --git a/app/partials/mobile/audio_player.html b/app/partials/mobile/audio_player.html
index 9b38ae36..fde47006 100644
--- a/app/partials/mobile/audio_player.html
+++ b/app/partials/mobile/audio_player.html
@@ -34,6 +34,6 @@
 	  </div>
 	</div>
 	<audio ng-if="audio.url" media-player="mediaPlayer.player">
-	  <source ng-src="{{::audio.url}}" type="audio/ogg" volume="{{::volume}}" />
+	  <source ng-src="{{::audio.url}}" type="{{audio.mime_type || 'audio/ogg'}}" volume="{{::volume}}" />
 	</audio>
 </div>
\ No newline at end of file