Add return to menu button

Resets Drop back to the startup menu and clears all music. Closes #32

Author: xNul

audio.lua

@@ -16,6 +16,7 @@ local song_id = 0
 local song_name = nil
 local is_paused = false
 local current_song = nil
+local decoder = nil
 local time_count = 0
 local music_list = nil
 local loop_toggle = false
@@ -27,6 +28,7 @@ function audio.update()
   -- plays first song
   if current_song == nil then
     love.audio.setVolume(0.5)
+    gui.volume:activate("volume2")
     audio.changeSong(1)
   end
 
@@ -172,6 +174,39 @@ function audio.play()
   current_song:play()
 end
 
+function audio.stop()
+  current_song:stop()
+  if microphone_active then
+    microphone_device:stop()
+    microphone_active = false
+  end
+end
+
+function audio.reload()
+  if current_song ~= nil then audio.stop() end
+  
+  decoder_buffer = 2048
+  seconds_per_buffer = 0
+  queue_size = 0
+  sample_sum = 0
+  decoder_array = {0,0,0,0,0,0,0}
+  decoder_array[0] = 0
+  sample_count = {0,0,0,0,0,0,0}
+  sample_count[0] = 0
+  check_old = 0
+  end_of_song = false
+  song_id = 0
+  song_name = nil
+  is_paused = false
+  current_song = nil
+  time_count = 0
+  music_list = nil
+  decoder = nil
+  loop_toggle = false
+  shuffle_toggle = false
+  microphone_active = false
+end
+
 function audio.toggleLoop()
   loop_toggle = not loop_toggle
 end

gui.lua

@@ -1,4 +1,4 @@
-local gui = {leftPanel = {}, rightPanel = {}, scrubbar = {}, left = {}, playback = {}, right = {}, shuffle = {}, loop = {}, volume = {}, fullscreen = {}, graphics = {}, timestamp_start = {}, timestamp_end = {}, scrubhead = {}}
+local gui = {leftPanel = {}, rightPanel = {}, scrubbar = {}, left = {}, playback = {}, right = {}, shuffle = {}, loop = {}, volume = {}, fullscreen = {}, menu = {}, graphics = {}, timestamp_start = {}, timestamp_end = {}, scrubhead = {}}
 local scrubbar_x1 = 0
 local scrubbar_y1 = 0
 local scrubbar_x2 = 0
@@ -17,6 +17,8 @@ local volume_quad = "volume2"
 local fullscreen_x = 0
 local fullscreen_quad = "fullscreen"
 local click_area_y = 0
+local menu_x = 0
+local menu_y = 0
 local scrubhead_radius = 0
 local timestamp_start_x = 0
 local timestamp_start_y = 0
@@ -76,10 +78,11 @@ function gui.load()
   sprite_quads["volume1"] = love.graphics.newQuad(480, 240, 240, 240, mc_image_width, mc_image_height)
   sprite_quads["volume2"] = love.graphics.newQuad(720, 240, 240, 240, mc_image_width, mc_image_height)
   sprite_quads["volume3"] = love.graphics.newQuad(0, 480, 240, 240, mc_image_width, mc_image_height)
+  sprite_quads["menu"] = love.graphics.newQuad(240, 480, 240, 240, mc_image_width, mc_image_height)
   sprite_quads["loop"] = love.graphics.newQuad(0, 0, 300, 240, loop_image:getWidth(), loop_image:getHeight())
   sprite_quads["shuffle"] = love.graphics.newQuad(0, 0, 300, 240, shuffle_image:getWidth(), shuffle_image:getHeight())
 
-  sprite_batch = love.graphics.newSpriteBatch(music_control_image, 9)
+  sprite_batch = love.graphics.newSpriteBatch(music_control_image, 10)
   shuffle_sprite = love.graphics.newSpriteBatch(shuffle_image, 1)
   loop_sprite = love.graphics.newSpriteBatch(loop_image, 1)
   local gui_scaling_multiplier = math.max(graphics_height, 480)
@@ -120,7 +123,9 @@ function gui.load()
 
   offset = graphics_width-sprite_square_side_length-medium_spacing-small_spacing
   fullscreen_x = offset-medium_spacing
+  menu_x = offset-large_spacing
   sprites["fullscreen"] = sprite_batch:add(sprite_quads[fullscreen_quad], offset, right_height, 0, scale_x*.93)
+  sprites["menu"] = sprite_batch:add(sprite_quads["menu"], offset, 10, 0, scale_x)
   offset = offset-sprite_square_side_length-large_spacing-small_spacing/2
   volume_x = offset-3*small_spacing/2
   sprites["volume"] = sprite_batch:add(sprite_quads[volume_quad], offset, right_height, 0, scale_x)
@@ -147,6 +152,7 @@ function gui.load()
   scrubbar_y2 = ui_height
 
   click_area_y = graphics_height-gui_scaling_multiplier/16
+  menu_y = scale_x*240+10+medium_spacing
   ------------------------------------------------------------------------------------
 end
 
@@ -188,7 +194,9 @@ function gui.scale()
 
   offset = graphics_width-sprite_square_side_length-medium_spacing-small_spacing
   fullscreen_x = offset-medium_spacing
+  menu_x = offset-large_spacing
   sprite_batch:set(sprites["fullscreen"], sprite_quads[fullscreen_quad], offset, right_height, 0, scale_x*.93)
+  sprite_batch:set(sprites["menu"], sprite_quads["menu"], offset, 10, 0, scale_x)
   offset = offset-sprite_square_side_length-large_spacing-small_spacing/2
   volume_x = offset-3*small_spacing/2
   sprite_batch:set(sprites["volume"], sprite_quads[volume_quad], offset, right_height, 0, scale_x)
@@ -215,6 +223,7 @@ function gui.scale()
   scrubbar_y2 = ui_height
 
   click_area_y = graphics_height-gui_scaling_multiplier/16
+  menu_y = scale_x*240+10+medium_spacing
   ------------------------------------------------------------------------------------
 end
 
@@ -481,6 +490,23 @@ function gui.rightPanel:inBoundsX(x)
   return x >= volume_x
 end
 
+function gui.menu:inBoundsX(x)
+  return x <= graphics_width and x >= menu_x
+end
+
+function gui.menu:inBoundsY(y)
+  return y >= 0 and y <= menu_y
+end
+
+function gui.menu:activate()
+  audio.reload()
+  spectrum.reload()
+  reload()
+  
+  playback_quad = "pause"
+  gui.scale()
+end
+
 function gui.graphics:setHeight(height)
 	graphics_height = height
 end

images/music_control_sprites.png

@@ -152,6 +152,28 @@ function love.load()
 	------------------------------------------------------------------------------------
 end
 
+function reload()
+  waveform = {}
+	scrub_head_pause = false
+	scrub_head_pressed = false
+
+	appdata_music = true
+  
+	fade_interval_counter = 1
+	fade_bool = false
+  fade_activated = false
+	color = "g"
+	fade_intensity = 1
+	setColor("g", 1)
+	sleep_counter = 0
+	window_visible = true
+  last_frame_time = 0
+  cursor_hand_activated = false
+  previous_volume = 0
+  microphone_init = false
+  devices_list = nil
+end
+
 function love.update(dt)
 	if audio.musicExists() or audio.isPlayingMicrophone() then
 		if audio.isPlayingMicrophone() then audio.updateMicrophone() else audio.update() end
@@ -251,7 +273,7 @@ function love.mousepressed(x, y, key, istouch)
 	gui.sleep(false)
 	sleep_counter = 0
 
-  local button_table = {"left", "playback", "right", "shuffle", "loop", "volume", "fullscreen"}
+  local button_table = {"left", "playback", "right", "shuffle", "loop", "volume", "fullscreen", "menu"}
 
   local button
   for i,v in ipairs(button_table) do
@@ -292,7 +314,7 @@ function love.mousemoved(x, y, dx, dy, istouch)
 	gui.sleep(false)
 	sleep_counter = 0
 
-  if gui.left:inBoundsY(y) and ((gui.scrubbar:inBoundsY(y) and gui.scrubbar:inBoundsX(x)) or gui.leftPanel:inBoundsX(x) or gui.rightPanel:inBoundsX(x)) then
+  if (gui.left:inBoundsY(y) and ((gui.scrubbar:inBoundsY(y) and gui.scrubbar:inBoundsX(x)) or gui.leftPanel:inBoundsX(x) or gui.rightPanel:inBoundsX(x))) or (gui.menu:inBoundsX(x) and gui.menu:inBoundsY(y)) then
     if not cursor_hand_activated then love.mouse.setCursor(love.mouse.getSystemCursor("hand")) end
     cursor_hand_activated = true
   elseif cursor_hand_activated then

main.lua

@@ -16,6 +16,18 @@ local visualizer_type = 3
 local tick_amplitude_average = 0
 local tick_count = 128
 
+function spectrum.reload()
+  -- fft gen
+  spectrum = {}
+  size = 2048
+  old_sample = 0
+
+  -- spectrum draw
+  visualizer_type = 3
+  tick_amplitude_average = 0
+  tick_count = 128
+end
+
 function spectrum.generateWaveform()
 	local wave = {}
   local channels = audio.getChannels()