aboutsummaryrefslogtreecommitdiff
path: root/game/src/MusicConductor/SongInfo.gd
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-03-09 23:21:31 +0100
committer GitHub <noreply@github.com>2023-03-09 23:21:31 +0100
commit62bc0a0c2fc851a1e167b8d8da7c280f5e525921 (patch)
tree25a711cbbff765c26ba73e4908ba094d7c2871cf /game/src/MusicConductor/SongInfo.gd
parentf1aefab93f3b6b0d4df20540d8df0f1ddd510af6 (diff)
parent99c99ce56bb3e73e65ff70352d4c9eef3d7f0f86 (diff)
Merge pull request #57 from Spartan322/fixup/music-player
Diffstat (limited to 'game/src/MusicConductor/SongInfo.gd')
-rw-r--r--game/src/MusicConductor/SongInfo.gd12
1 files changed, 6 insertions, 6 deletions
diff --git a/game/src/MusicConductor/SongInfo.gd b/game/src/MusicConductor/SongInfo.gd
index 85ef96a..f7343c0 100644
--- a/game/src/MusicConductor/SongInfo.gd
+++ b/game/src/MusicConductor/SongInfo.gd
@@ -1,11 +1,11 @@
extends Node
class_name SongInfo
-var fullyQualifiedPath : String = ""
-var readableName : String = ""
-var loadedStream : Resource
+var song_path : String = ""
+var song_name : String = ""
+var song_stream : Resource
func _init(dirname:String, fname:String):
- fullyQualifiedPath = dirname + fname
- readableName = fname.get_basename().replace("_", " ")
- loadedStream = load(fullyQualifiedPath)
+ song_path = dirname.path_join(fname)
+ song_name = fname.get_basename().replace("_", " ")
+ song_stream = load(song_path)