View difference between Paste ID: 0FM5hCx9 and XpyjPrDt

--- Made By HDR @MartinRefseth
+--# Made By HDR - @MartinRefseth #--
-sleep(0.2)
+--# Version 2.3 #--
-os.loadAPI("button")
+--# Thanks to Lyqyd for his Button API http://www.computercraft.info/forums2/index.php?/topic/14784-touchpoint-api/ #--
 os.loadAPI("touchpoint")
 for a,b in pairs(rs.getSides()) do
   if peripheral.getType(b) == 'monitor' then
    mon = peripheral.wrap(b)
    t = touchpoint.new(b)
    break
   end
 end
--- Functions/Buttons
+
-function fillTable()
+--# Functions
-   button.setTable("13", Thir, 2,12,3,5)
+function play()
-   button.setTable("Cat", Cat, 14,24,3,5)
+
-   button.setTable("Blocks", Blocks, 26,36,3,5)
+
-   button.setTable("Chirp", Chirp, 38,48,3,5)
+
-   button.setTable("Far", Far, 50,60,3,5)
+    print("Now Playing"," ",( title) )
-   button.setTable("Mall", Mall, 2,12,7,9)
+
-   button.setTable("Mellohi", Mellohi, 14,24,7,9)
+
-   button.setTable("Stal", Stal, 26,36,7,9)
+
-   button.setTable("Strad", Strad, 38,48,7,9)
+end
-   button.setTable("Ward", Ward, 50,60,7,9)
+
-   button.setTable("11", Elev, 2,12,11,13)
+
-   button.setTable("Wait", Wait, 14,24,11,13)
+   t:flash("13")
-   button.setTable("???", Question, 26,36,11,13)
+   title = "C418 - 13"
-   button.setTable("Gaia 1", GaiaOne, 38,48,11,13)
+   play()
-   button.setTable("Gaia 2", GaiaTwo, 50,60,11,13)
+
-   button.setTable("Still Alive", Slive, 20,30,15,17)
+
-   button.setTable("Radio Loop", Roop, 8,18,15,17)
+
-   button.setTable("Want You", WYG, 32,42,15,17)
+   t:flash("Cat")
-   button.setTable("Wanderer", Wander, 44,54,15,17)
+   title = "C418 - cat"
-   button.setTable("Stop", Stop, 26,36,19,20)
+   play()
-   button.setTable("Reboot", Reboot, 38,48,19,20)
+
-   button.setTable("Random", Random, 14,24,19,20)
+
-   button.screen()
+
    t:flash("Blocks")
    title = "C418 - blocks"
-function getClick()
+   play()
-   event,side,x,y = os.pullEvent("monitor_touch")
+end
-   button.checkxy(x,y)
+
 function Chirp()
    t:flash("Chirp")
--- Functions
+   title = "C418 - chirp"
    play()
-   button.flash("13")
+end
-   print("Loading 13")
+
- local title = "C418 - 13"
+
    t:flash("Far")
    title = "C418 - far"
    play()
 end
 
 function Mall()
    t:flash("Mall")
    title = "C418 - mall"
    play()
-   button.flash("Cat")
+
-   print("Loading Cat")
+
- local title = "C418 - cat"
+
    t:flash("Mellohi")
    title = "C418 - mellohi"
    play()
 end
 
 function Stal()
    t:flash("Stal")
    title = "C418 - stal"
    play()
-   button.flash("Blocks")
+
-   print("Loading Blocks")
+
 function Strad()
- local title = "C418 - blocks"
+   t:flash("Strad")
    title = "C418 - strad"
    play()
 end
 
 function Ward()
    t:flash("Ward")
-end
+   title = "C418 - ward"
    play()
 end
-   button.flash("Chirp")
+
-   print("Loading Chirp")
+
    t:flash("11")
- local title = "C418 - chirp"
+   title = "C418 - 11"
    play()
 end
 
 function Wait()
    t:flash("Wait")
    title = "C418 - wait"
-end
+   play()
 end
 
-   button.flash("Far")
+--#Stops All Music
-   print("Loading Far")
+
    t:flash("Stop")
- local title = "C418 - far"
+
    peripheral.find("drive", disk.stopAudio)
 end
 function Reboot()
    t:flash("Reboot")
    print("Rebooting")
    peripheral.find("drive", disk.stopAudio)
    mon.clear()
    os.reboot()
 end
-   button.flash("Mall")
+
-   print("Loading Mall")
+-- A list of all possible songs --# Thanks to http://pastebin.com/u/MechWipf for the Random function #--
 local Songs = {
- local title = "C418 - mall"
+
     Elev, Wait, Question, GaiaOne, GaiaTwo, Roop, Slive, WYG, Wander
 }
 
 function Random()
     t:flash("Random")
     peripheral.find("drive", disk.stopAudio)
     local maxSongs = #Songs -- the "#" gets the length of the list
     local randomNumber = math.random( maxSongs )
     Songs[randomNumber]() -- call the choosen song directly out of the list
-   button.flash("Mellohi")
+
-   print("Loading Mellohi")
+
 --#OverWrites Part Of Touchpoint API#--
- local title = "C418 - mellohi"
+    t.draw = function(self)
       local function cT(text)
         x,y = term.getSize()
         x1,y1 = term.getCursorPos()
         term.setCursorPos((math.floor(x/2) - (math.floor(#text/2))), y1)
         term.write(text)
      end
                 local old = term.redirect(self.mon)
                 term.setTextColor(colors.white)
                 term.setBackgroundColor(colors.gray)
-   button.flash("Stal")
+                term.clear()
-   print("Loading Stal")
+                term.setCursorPos(1,1)
                 term.setTextColor(colors.orange)
- local title = "C418 - stal"
+                cT("HDR's Music System V2.3")
                 for name, buttonData in pairs(self.buttonList) do
                         if buttonData.active then
                                 term.setBackgroundColor(buttonData.activeColor)
                                 term.setTextColor(buttonData.activeText)
                         else
                                 term.setBackgroundColor(buttonData.inactiveColor)
                                 term.setTextColor(buttonData.inactiveText)
                         end
                         for i = buttonData.yMin, buttonData.yMax do
-   button.flash("Strad")
+                                term.setCursorPos(buttonData.xMin, i)
-   print("Loading Strad")
+                                term.write(buttonData.label[i - buttonData.yMin + 1])
                         end
- local title = "C418 - strad"
+                end
                 if old then
                         term.redirect(old)
                 else
                         term.restore()
                 end
         end
 
 --# Buttons
 t:add("13", Thir, 3,3,13,5, colors.cyan, colors.lime, colors.orange, colors.orange)
-   button.flash("Ward")
+t:add("Cat", Cat, 15,3,25,5, colors.cyan, colors.lime, colors.orange, colors.orange)
-   print("Loading Ward")
+t:add("Blocks", Blocks, 27,3,37,5, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Chirp", Chirp, 3,7,13,9, colors.cyan, colors.lime, colors.orange, colors.orange)
- local title = "C418 - ward"
+t:add("Far", Far, 15,7,25,9, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Mall", Mall, 27,7,37,9, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Mellohi", Mellohi, 3,11,13,13, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Stal", Stal, 15,11,25,13, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Strad", Strad, 27,11,37,13, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Ward", Ward, 3,15,13,17, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("11", Elev, 15,15,25,17, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Wait", Wait, 27,15,37,17, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Random", Random, 3,19,13,19, colors.cyan, colors.lime, colors.orange, colors.orange)
 t:add("Stop", Stop, 15,19,25,19, colors.cyan, colors.lime, colors.orange, colors.orange)
-   button.flash("11")
+t:add("Reboot", Reboot, 27,19,37,19, colors.cyan, colors.lime, colors.orange, colors.orange)
-   print("Loading 11")
+t:run()