resolved #90

Author: Commandcracker

client/lib/youcubeapi.lua

@@ -293,7 +293,7 @@ function Speaker.new(speaker)
 
     function self:validate()
         if not decoder then
-            error("This ComputerCraft version dos not support DFPWM")
+            return "This ComputerCraft version dos not support DFPWM"
         end
     end
 
@@ -329,12 +329,14 @@ function Tape.new(tape)
 
     function self:validate()
         if not self.tape.isReady() then
-            error("You need to insert a tape")
+            return "You need to insert a tape"
         end
     end
 
     function self:setVolume(volume)
-        self.tape.setVolume(volume)
+        if volume then
+            self.tape.setVolume(volume)
+        end
     end
 
     function self:play(chunk)
@@ -590,7 +592,7 @@ return {
     --- "Metadata" - [YouCube API](https://commandcracker.github.io/YouCube/) Version
     _API_VERSION = "0.0.0-poc.1.0.0",
     --- "Metadata" - Library Version
-    _VERSION     = "0.0.0-poc.1.1.0",
+    _VERSION     = "0.0.0-poc.1.2.0",
     --- "Metadata" - Description
     _DESCRIPTION = "Library for accessing YouCub's API",
     --- "Metadata" - Homepage / Url

client/youcube.lua

@@ -7,7 +7,7 @@ Github Repository: https://github.com/Commandcracker/YouCube
 License: GPL-3.0
 ]]
 
-local _VERSION = "0.0.0-poc.0.4.0"
+local _VERSION = "0.0.0-poc.0.5.0"
 
 -- Libraries - OpenLibrarieLoader v1.0.0 --
 
@@ -161,16 +161,30 @@ local youcubeapi = libs.youcubeapi.API.new()
 
 local audiodevices = {}
 
-if #speakers == 0 then
-    for _, tape in pairs(tapes) do
-        table.insert(audiodevices, libs.youcubeapi.Tape.new(tape))
-    end
-else
-    for _, speaker in pairs(speakers) do
-        table.insert(audiodevices, libs.youcubeapi.Speaker.new(speaker))
+for _, speaker in pairs(speakers) do
+    table.insert(audiodevices, libs.youcubeapi.Speaker.new(speaker))
+end
+
+for _, tape in pairs(tapes) do
+    table.insert(audiodevices, libs.youcubeapi.Tape.new(tape))
+end
+
+local last_error
+local valid_audiodevices = {}
+
+for i, audiodevice in pairs(audiodevices) do
+    local _error = audiodevice:validate()
+    if _error ~= nil then
+        last_error = _error
+    else
+        table.insert(valid_audiodevices, audiodevice)
     end
 end
 
+if #valid_audiodevices == 0 then
+    error(last_error)
+end
+
 -- update check --
 
 local function get_versions()
@@ -283,7 +297,7 @@ local function update_checker()
 end
 
 local function play_audio(buffer, title)
-    for _, audiodevice in pairs(audiodevices) do
+    for _, audiodevice in pairs(valid_audiodevices) do
         audiodevice:reset()
         audiodevice:setLabel(title)
         audiodevice:setVolume(args.volume)
@@ -299,7 +313,7 @@ local function play_audio(buffer, title)
 
         if chunk == "" then
             local play_functions = {}
-            for _, audiodevice in pairs(audiodevices) do
+            for _, audiodevice in pairs(valid_audiodevices) do
                 table.insert(play_functions, function()
                     audiodevice:play()
                 end)
@@ -310,7 +324,7 @@ local function play_audio(buffer, title)
         end
 
         local write_functions = {}
-        for _, audiodevice in pairs(audiodevices) do
+        for _, audiodevice in pairs(valid_audiodevices) do
             table.insert(write_functions, function()
                 audiodevice:write(chunk)
             end)
@@ -515,9 +529,6 @@ local function play_playlist(playlist)
 end
 
 local function main()
-    for _, audiodevice in pairs(audiodevices) do
-        audiodevice:validate()
-    end
     youcubeapi:detect_bestest_server(args.server, args.verbose)
     pcall(update_checker)
 

versions.json

@@ -9,7 +9,7 @@
         "version": "0.0.0-poc.0.4.0",
         "libraries": {
             "youcubeapi": {
-                "version": "0.0.0-poc.1.1.0"
+                "version": "0.0.0-poc.1.2.0"
             },
             "numberformatter": {
                 "version": "1.1.0"