重构bgm模块

Zframework/bgm.lua

@@ -1,44 +1,37 @@
 local lastLoaded={}
 local maxLoadedCount=3
+local nameList={}
 local SourceObjList={}
 local volume=1
 
 local BGM={
     default=false,
-    getList=function()error("Cannot getList before initialize!")end,
-    getCount=function()return 0 end,
-    play=NULL,
-    stop=NULL,
     onChange=NULL,
     --nowPlay=[str:playing ID]
     --playing=[src:playing SRC]
     --lastPlayed=[str:lastPlayed ID]
 }
-local function task_fadeOut(src)
-    while true do
-        coroutine.yield()
-        local v=src:getVolume()-.025*volume
-        src:setVolume(v>0 and v or 0)
-        if v<=0 then
-            src:pause()
-            return true
+
+function BGM.getList()return nameList end
+function BGM.getCount()return #nameList end
+local function _addFile(name,path)
+    if not SourceObjList[name]then
+        table.insert(nameList,name)
+        SourceObjList[name]={path=path,source=false}
     end
 end
+function BGM.load(name,path)
+    if type(name)=='table'then
+        for k,v in next,name do
+            _addFile(k,v)
         end
-local function task_fadeIn(src)
-    while true do
-        coroutine.yield()
-        local v=volume
-        v=math.min(v,src:getVolume()+.025*v)
-        src:setVolume(v)
-        if v>=volume then
-            return true
+    else
+        _addFile(name,path)
     end
+    table.sort(nameList)
+    LOG(BGM.getCount().." BGM files added")
 end
-end
-local function check_curFadeOut(task,code,src)
-    return task.code==code and task.args[1]==src
-end
+
 local function _tryReleaseSources()
     local n=#lastLoaded
     while #lastLoaded>maxLoadedCount do
@@ -75,27 +68,38 @@ function BGM.setVol(v)
         end
     end
 end
-function BGM.init(list)
-    BGM.init=nil
 
-    local simpList={}
-    for _,v in next,list do
-        table.insert(simpList,v.name)
-        SourceObjList[v.name]={path=v.path,source=false}
+local function task_fadeOut(src)
+    while true do
+        coroutine.yield()
+        local v=src:getVolume()-.025*volume
+        src:setVolume(v>0 and v or 0)
+        if v<=0 then
+            src:pause()
+            return true
+        end
+    end
+end
+local function task_fadeIn(src)
+    while true do
+        coroutine.yield()
+        local v=volume
+        v=math.min(v,src:getVolume()+.025*v)
+        src:setVolume(v)
+        if v>=volume then
+            return true
+        end
+    end
+end
+local function check_curFadeOut(task,code,src)
+    return task.code==code and task.args[1]==src
 end
-    table.sort(simpList)
-    function BGM.getList()return simpList end
-    local count=#simpList
-    LOG(count.." BGM files added")
-    function BGM.getCount()return count end
-
 local function _tryLoad(name)
     if SourceObjList[name]then
         if SourceObjList[name].source then
             return true
         elseif love.filesystem.getInfo(SourceObjList[name].path)then
             SourceObjList[name].source=love.audio.newSource(SourceObjList[name].path,'stream')
-                SourceObjList[name].source:setLooping(true)
             SourceObjList[name].source:setVolume(0)
             table.insert(lastLoaded,1,name)
             _tryReleaseSources()
@@ -119,7 +123,7 @@ function BGM.init(list)
     if name and SourceObjList[name].source then
         if BGM.nowPlay~=name then
             if BGM.nowPlay then
-                    if not STRING.sArg(args,'-so')then
+                if not args:sArg('-sdout')then
                     TASK.new(task_fadeOut,BGM.playing)
                 else
                     BGM.playing:pause()
@@ -130,13 +134,14 @@ function BGM.init(list)
 
             BGM.nowPlay=name
             BGM.playing=SourceObjList[name].source
-                if not STRING.sArg(args,'-si')then
+            if not args:sArg('-sdin')then
                 BGM.playing:setVolume(0)
                 TASK.new(task_fadeIn,BGM.playing)
             else
                 BGM.playing:setVolume(volume)
                 BGM.playing:play()
             end
+            SourceObjList[name].source:setLooping(not args:sArg('-noloop'))
             BGM.lastPlayed=BGM.nowPlay
             BGM.playing:seek(0)
             BGM.playing:play()
@@ -165,7 +170,7 @@ function BGM.init(list)
 function BGM.stop(args)
     args=args or""
     TASK.removeTask_code(task_fadeIn)
-        if not STRING.sArg(args,'-s')then
+    if not args:sArg('-s')then
         if BGM.nowPlay then
             TASK.new(task_fadeOut,BGM.playing)
         end
@@ -174,5 +179,4 @@ function BGM.init(list)
     end
     BGM.nowPlay,BGM.playing=nil
 end
-end
 return BGM

main.lua

@@ -333,11 +333,11 @@ SFX.init((function()--[Warning] Not loading files here, just get the list of sou
     end
     return L
 end)())
-BGM.init((function()
+BGM.load((function()
     local L={}
     for _,v in next,fs.getDirectoryItems('media/music')do
         if isSafeFile('media/music/'..v,"Dangerous file : %SAVE%/media/music/"..v)then
-            table.insert(L,{name=v:sub(1,-5),path='media/music/'..v})
+            L[v:sub(1,-5)]='media/music/'..v
         end
     end
     return L