Fix audio-only for video.js

This commit is contained in:
Omar Roth 2018-01-16 14:02:35 -06:00
parent 9e4d0bd3a5
commit f09f971af7
2 changed files with 15 additions and 14 deletions

View file

@ -2,8 +2,8 @@ require "http/client"
require "json" require "json"
require "kemal" require "kemal"
require "pg" require "pg"
require "xml"
require "time" require "time"
require "xml"
PG_DB = DB.open "postgres://kemal:kemal@localhost:5432/invidious" PG_DB = DB.open "postgres://kemal:kemal@localhost:5432/invidious"
CONTEXT = OpenSSL::SSL::Context::Client.insecure CONTEXT = OpenSSL::SSL::Context::Client.insecure
@ -124,7 +124,6 @@ end
get "/watch" do |env| get "/watch" do |env|
id = env.params.query["v"] id = env.params.query["v"]
listen = env.params.query["listen"]? || "false" listen = env.params.query["listen"]? || "false"
speed = env.params.query["speed"]? && env.params.query["speed"].to_f? ? env.params.query["speed"].to_f : 1
env.params.query.delete_all("listen") env.params.query.delete_all("listen")

View file

@ -2,8 +2,8 @@
<%= video.info["title"] + " - " %> <%= video.info["title"] + " - " %>
<% end %> <% end %>
<video id="player" class="video-js" data-setup="{}" style="width:100%" controls> <% if listen == "true" %>
<% if listen == "true" %> <audio id="player" class="video-js" data-setup="{}" style="width:100%" controls>
<% adaptive_fmts.each do |fmt| %> <% adaptive_fmts.each do |fmt| %>
<% url = fmt["url"] %> <% url = fmt["url"] %>
<% type = fmt["type"].to_s.split(";")[0] %> <% type = fmt["type"].to_s.split(";")[0] %>
@ -11,12 +11,14 @@
<source src="<%= url %>" type="<%= type %>"> <source src="<%= url %>" type="<%= type %>">
<% end %> <% end %>
<% end %> <% end %>
<% else %> </audio>
<% else %>
<video id="player" class="video-js" data-setup="{}" style="width:100%" controls>
<% fmt_stream.each do |fmt| %> <% fmt_stream.each do |fmt| %>
<source src="<%= fmt["url"] %>" type="<%= fmt["type"].split(";")[0] %>"> <source src="<%= fmt["url"] %>" type="<%= fmt["type"].split(";")[0] %>">
<% end %> <% end %>
<% end %>
</video> </video>
<% end %>
<script> <script>
var options = { var options = {