Finished Music player, added new songs

Music player buttons work
Music player has bouncing green bars
Music player shows actual title of song
New songs that can be played

9 files changed, 94 insertions, 3 deletions

diff --git a/assets.lua b/assets.lua
index 12855aa..a3a9cd7 100644
--- a/assets.lua
+++ b/assets.lua
@@ -72,7 +72,11 @@ function loadAssets(id)
       battle3 = love.audio.newSource("assets/music/Without Silence.ogg"),
       fox = love.audio.newSource("assets/music/FOX.ogg"),
       tension1 = love.audio.newSource("assets/music/Storm Chasers.ogg"),
-      chill = love.audio.newSource("assets/music/How it Begins.ogg")
+      chill = love.audio.newSource("assets/music/How it Begins.ogg"),
+      rage = love.audio.newSource("assets/music/Fight or Flight.ogg"),
+      sophie = love.audio.newSource("assets/music/Close My Mouth.ogg"),
+      ohyeah = love.audio.newSource("assets/music/Down N Dirty.ogg"),
+      finale = love.audio.newSource("assets/music/Ich Grolle Nicht.ogg")
     }
   end
   if id == 6 then
@@ -84,7 +88,6 @@ function loadAssets(id)
     music.battle2:setLooping(true)
     music.battleNSA:setLooping(true)
     music.battleUndertale:setLooping(true)
-    music.chill:setLooping(false)
   end
   if id == 7 then
     window = {
@@ -105,6 +108,7 @@ function loadAssets(id)
       back = love.graphics.newImage("assets/button_back.png"),
       stop = love.graphics.newImage("assets/button_stop.png")
     }
+    but.but = but.pause
   end
   if id == 9 then
     chat = {
diff --git a/assets/music/Close My Mouth.ogg b/assets/music/Close My Mouth.ogg
new file mode 100644
index 0000000..137d034
--- /dev/null
+++ b/assets/music/Close My Mouth.ogg
diff --git a/assets/music/Down N Dirty.ogg b/assets/music/Down N Dirty.ogg
new file mode 100644
index 0000000..eb1ebc5
--- /dev/null
+++ b/assets/music/Down N Dirty.ogg
diff --git a/assets/music/Fight or Flight.ogg b/assets/music/Fight or Flight.ogg
new file mode 100644
index 0000000..be7a50b
--- /dev/null
+++ b/assets/music/Fight or Flight.ogg
diff --git a/assets/music/Ich Grolle Nicht.ogg b/assets/music/Ich Grolle Nicht.ogg
new file mode 100644
index 0000000..55d647c
--- /dev/null
+++ b/assets/music/Ich Grolle Nicht.ogg
diff --git a/files.lua b/files.lua
index ea05f0c..1192333 100644
--- a/files.lua
+++ b/files.lua
@@ -87,8 +87,40 @@ function updateFiles()
           openFileWindow(8)
         elseif files == f.music then
           if i == 1 and mplay.m ~= music.chill then
+            if mplay.m ~= 0 then
+              mplay.m:stop()
+            end
             mplay.m = music.chill
             mplay.p = true
+            mplay.title = "How it Begins - Kevin Macleod"
+          elseif i == 2 and mplay.m ~= music.rage then
+            if mplay.m ~= 0 then
+              mplay.m:stop()
+            end
+            mplay.m = music.rage
+            mplay.p = true
+            mplay.title = "Fight or Flight - Ethan Meixsell"
+          elseif i == 3 and mplay.m ~= music.sophie then
+            if mplay.m ~= 0 then
+              mplay.m:stop()
+            end
+            mplay.m = music.sophie
+            mplay.p = true
+            mplay.title = "Close My Mouth - Silent Partner"
+          elseif i == 4 and mplay.m ~= music.ohyeah then
+            if mplay.m ~= 0 then
+              mplay.m:stop()
+            end
+            mplay.m = music.ohyeah
+            mplay.p = true
+            mplay.title = "Down N' Dirty - Jingle Punks"
+          elseif i == 5 and mplay.m ~= music.finale then
+            if mplay.m ~= 0 then
+              mplay.m:stop()
+            end
+            mplay.m = music.finale
+            mplay.p = true
+            mplay.title = "Ich Grolle Nicht - Ron Meixsell"
           end
           openFileWindow(9)
         end
diff --git a/main.lua b/main.lua
index 3892cc3..182f9b2 100644
--- a/main.lua
+++ b/main.lua
@@ -94,6 +94,7 @@ function love.mousereleased(x, y, button)
   end
   file.p = false
   mplay.drag = false
+  mplay.pr = false
 end
 function love.draw()
   if scene == 1 then
diff --git a/var.lua b/var.lua
index 0ae4270..b215df8 100644
--- a/var.lua
+++ b/var.lua
@@ -238,6 +238,9 @@ function loadVar()
   f.music = {}
   f.music[1] = {name="chill.mp3",x=0,y=0,hl=false}
   f.music[2] = {name="rage.mp3",x=0,y=0,hl=false}
+  f.music[3] = {name="sophie.mp3",x=0,y=0,hl=false}
+  f.music[4] = {name="oyeah.mp3",x=0,y=0,hl=false}
+  f.music[5] = {name="finale.mp3",x=0,y=0,hl=false}
   f.videos = {}
   f.videos[1] = {name="wtf.avi",x=0,y=0,hl=false}
   f.videos[2] = {name="lol.avi",x=0,y=0,hl=false}
@@ -257,6 +260,9 @@ function loadVar()
   mplay.drag = false
   mplay.m = 0
   mplay.p = false
+  mplay.pr = false
+  mplay.title = "Nothing"
+  mplay.bar = {}
 end
 function loadPre()
   love.graphics.setDefaultFilter("nearest", "nearest")
diff --git a/viewer.lua b/viewer.lua
index fd3e116..506c406 100644
--- a/viewer.lua
+++ b/viewer.lua
@@ -13,18 +13,66 @@ function drawMusic()
   drawControls(8+38,win[9].h-34-8)
   drawDownBox(10+38+38+38,win[9].h-34+5,118,5,2)
   drawUpBox(mplay.volx,mplay.voly,10,25,2)
+  love.graphics.setColor(0,256,0)
+  love.graphics.setFont(pixeloperators)
+  love.graphics.print(mplay.title, 10,82)
+  if mplay.p == true then
+    for i=1,10 do
+      if mplay.bar[i] == nil then
+        mplay.bar[i] = {}
+        mplay.bar[i].h = 20
+        mplay.bar[i].ht = 20
+      else
+        if mplay.bar[i].h > mplay.bar[i].ht then
+          mplay.bar[i].h = mplay.bar[i].h - 1
+        elseif mplay.bar[i].h < mplay.bar[i].ht then
+          mplay.bar[i].h = mplay.bar[i].h + 1
+        elseif mplay.bar[i].h == mplay.bar[i].ht then
+          mplay.bar[i].ht = math.random(0,40)
+        end
+        love.graphics.rectangle("fill",(23*i)-13,33,21,mplay.bar[i].h)
+      end
+    end
+  end
+  love.graphics.setFont(pressstart)
 end
 function drawControls(x,y)
   love.graphics.setColor(256,256,256)
   drawUpBox(x,y,32,32,2)
-  love.graphics.draw(but.play, x, y)
+  love.graphics.draw(but.but, x, y)
   drawUpBox(x+38,y,32,32,2)
   love.graphics.draw(but.stop, x+38, y)
   drawUpBox(x-38,y,32,32,2)
   love.graphics.draw(but.back, x-38, y)
 end
 function updateMusic()
+  if mouseClick(win[9].x+8+38,win[9].y+win[9].h-34-8,32,32) == true and mplay.m ~= 0 and mplay.pr == false then
+    if but.but == but.pause then
+      mplay.m:pause()
+      mplay.p = false
+      but.but = but.play
+      win[9].update = true
+    elseif but.but == but.play then
+      mplay.p = true
+      but.but = but.pause
+      win[9].update = true
+    end
+    mplay.pr = true
+  elseif mouseClick(win[9].x+8+38-38,win[9].y+win[9].h-34-8,32,32) == true and mplay.m ~= 0 and mplay.pr == false then
+    mplay.m:rewind()
+    mplay.p = true
+    but.but = but.pause
+    win[9].update = true
+    mplay.pr = true
+  elseif mouseClick(win[9].x+8+38+38,win[9].y+win[9].h-34-8,32,32) == true and mplay.m ~= 0 and mplay.pr == false then
+    mplay.m:stop()
+    mplay.p = false
+    but.but = but.play
+    win[9].update = true
+    mplay.pr = true
+  end
   if mplay.p == true and mplay.m ~= 0 then
+    win[9].update = true
     mplay.m:play()
   end
   if win[9].ex == true and mplay.m ~= 0 then