修音乐室和一些bgm模块更新后的小错误

框架跟进a

Author: MrZ626

Zframework

@@ -442,7 +442,7 @@ local commands={}do
     commands.playbgm={
         code=function(bgm)
             if bgm~=""then
-                if bgm~=BGM.nowPlay then
+                if bgm~=BGM.getPlaying()[1] then
                     if BGM.play(bgm)then
                         log("Now playing: "..bgm)
                     else

parts/scenes/app_console.lua

@@ -20,7 +20,7 @@ pad={x=140,y=65,page=1,
         function()pad.page=4 end,
         function()pad.page=5 end,
         function()pad.page=6 end,
-        function()BGM.seek(0)BGM.play(BGM.nowPlay)end,
+        function()BGM.set('all','seek',0)BGM.play()end,
         function()BGM.stop()end,
     },
     funcAlpha=TABLE.new(0,8),

parts/scenes/launchpad.lua

@@ -17,12 +17,15 @@ local author={
 
 local scene={}
 
+local playing
 local selected--Music selected
 
 local bgmList=BGM.getList()
 if #bgmList==0 then bgmList={"[NO BGM]"}end
+
 function scene.sceneInit()
-    selected=TABLE.find(bgmList,BGM.nowPlay)or 1
+    playing=BGM.getPlaying()[1]
+    selected=TABLE.find(bgmList,playing)or 1
 end
 
 function scene.wheelMoved(_,y)
@@ -42,7 +45,8 @@ function scene.keyDown(key,isRep)
         end
     elseif not isRep then
         if key=='return'or key=='space'then
-            if BGM.nowPlay~=bgmList[S]then
+            playing=BGM.getPlaying()[1]
+            if playing~=bgmList[S]then
                 BGM.play(bgmList[S])
                 SFX.play('click')
             else
@@ -94,40 +98,40 @@ function scene.draw()
     if selected<#bgmList-1 then GC.print(bgmList[selected+2],322,350+110)end
 
     --Title
-    if BGM.nowPlay then
+    if playing then
         mDraw(TEXTURE.title,570,190,nil,.42)
         local a=-t%2.3/2.3
         GC.setColor(1,1,1,math.min(a,1))
         mDraw(TEXTURE.title_color,570,190,nil,.42+.062-.062*a)
     end
 
     --Music player
-    if BGM.nowPlay then
+    if playing then
         setFont(45)
-        GC.shadedPrint(BGM.nowPlay,710,508,'left',2)
+        GC.shadedPrint(playing,710,508,'left',2)
         GC.setColor(sin(t*.5)*.2+.8,sin(t*.7)*.2+.8,sin(t)*.2+.8)
-        GC.print(BGM.nowPlay,710,508)
+        GC.print(playing,710,508)
         setFont(35)
         GC.setColor(1,sin(t*2.6)*.5+.5,sin(t*2.6)*.5+.5)
-        GC.print(author[BGM.nowPlay]or"MrZ",670,465)
+        GC.print(author[playing]or"MrZ",670,465)
 
         setFont(20)
         GC.setColor(COLOR.Z)
-        local cur=BGM.playing:tell()
-        local dur=BGM.playing:getDuration()
+        local cur=BGM.tell()
+        local dur=BGM.getDuration()
         GC.print(STRING.time_simp(cur%dur).." / "..STRING.time_simp(dur),480,626)
     end
 end
 
 scene.widgetList={
     WIDGET.newText{name='title',  x=30,y=30,font=80,align='L'},
     WIDGET.newText{name='arrow',  x=270,y=360,font=45,align='L'},
-    WIDGET.newText{name='now',    x=700,y=500,font=50,align='R',hideF=function()return not BGM.nowPlay end},
+    WIDGET.newText{name='now',    x=700,y=500,font=50,align='R',hideF=function()return not playing end},
     WIDGET.newSlider{name='slide',x=480,y=600,w=400,
-        disp=function()return BGM.playing:tell()/BGM.playing:getDuration()%1 end,
+        disp=function()return BGM.tell()/BGM.getDuration()%1 end,
         show=false,
-        code=function(v)BGM.seek(v*BGM.playing:getDuration())end,
-        hideF=function()return not BGM.nowPlay end
+        code=function(v)BGM.set('all','seek',v*BGM.getDuration())end,
+        hideF=function()return not playing end
     },
     WIDGET.newSlider{name='bgm',  x=760,y=80,w=400,disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end},
     WIDGET.newButton{name='up',   x=200,y=250,w=120,sound=false,code=pressKey'up',hideF=function()return selected==1 end,font=60,fText=CHAR.key.up},