seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-1188 VRFS-1189 check if audio paths exist

This commit is contained in:
Brian Smith 2014-02-20 20:46:09 -05:00
parent cb40419f76
commit 2369aa80a8
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/app/views/music_sessions/show.html.erb
View File

@ -57,8 +57,13 @@
<div class="session-status">SESSION IN PROGRESS</div>
<div class="recording-current"></div>
<audio controls preload="none" style="display:none;">
<source src="<%= @music_session.music_session.mount.url %>" type="<%= @music_session.music_session.mount.resolve_string(:mime_type) %>">
<% unless @music_session.music_session.mount.blank? %>
<source src="<%= @music_session.music_session.mount.url %>" type="<%= @music_session.music_session.mount.resolve_string(:mime_type) %>">
<% end %>
</audio>
<% if @music_session.music_session.mount.blank? %>
<div>No audio available</div>
<% end %>
<% else %>
<div class="session-status-ended">LIVE SESSION ENDED</div>
<% end %>
@ -105,7 +110,7 @@
var showMusicSession = new JK.ShowMusicSession(JK.app);
showMusicSession.initialize("<%= @music_session.id %>");
// remainder of this code is related to playing/pausing the recording
// remainder of this code is related to playing/pausing the session
var htmlAudio = $(".recording-controls").find('audio').get(0);
function formatTime(time) {

9
web/app/views/recordings/show.html.erb
View File

@ -61,9 +61,14 @@
</div>
<div class="recording-current">0:00</div>
<audio controls preload="none" style="display:none;">
<source src="<%= @claimed_recording.mix.mp3_url %>">
<source src="<%= @claimed_recording.mix.ogg_url %>">
<% if @claimed_recording.has_mix? %>
<source src="<%= @claimed_recording.download_url(@claimed_recording.id, 'mp3') %>">
<source src="<%= @claimed_recording.download_url(@claimed_recording.id, 'ogg') %>">
<% end %>
</audio>
<% if !@claimed_recording.has_mix? %>
<div>No audio available</div>
<% end %>
</div>
<div class="left white"><%= @claimed_recording.genre_id.capitalize %></div>
<div class="right white">