LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 04:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not error in newVideo when optionally loading audio with love.audio disabled (fixes #1206)

Browse Source
This commit is contained in:
Bart van Strien
2016-08-15 17:12:36 +02:00
parent 3e678fc462
commit 9998e761a4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.lua
+6 -2
View File
@@ -352,13 +352,17 @@ function love.graphics.newVideo(file, loadaudio)
local video = love.graphics._newVideo(file) local video = love.graphics._newVideo(file)
local source, success local source, success
if loadaudio ~= false then if loadaudio ~= false and love.audio then
success, source = pcall(love.audio.newSource, video:getStream():getFilename()) success, source = pcall(love.audio.newSource, video:getStream():getFilename())
end end
if success then if success then
video:setSource(source) video:setSource(source)
elseif loadaudio == true then elseif loadaudio == true then
error("Video had no audio track", 2) if love.audio then
error("Video had no audio track", 2)
else
error("love.audio was not loaded", 2)
end
else else
video:getStream():setSync() video:getStream():setSync()
end end