Use beatmap file map for audio

Wieku · Oct 1, 2024 · 1661f1a · 1661f1a
1 parent 2c2973b
commit 1661f1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/states/player.go b/app/states/player.go
@@ -38,7 +38,6 @@ import (
 	"log"
 	"math"
 	"math/rand"
-	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
@@ -168,7 +167,10 @@ func NewPlayer(beatMap *beatmap.BeatMap) *Player {
 	player.mapFullName = fmt.Sprintf("%s - %s [%s]", beatMap.Artist, beatMap.Name, beatMap.Difficulty)
 	log.Println("Playing:", player.mapFullName)
 
-	track := bass.NewTrack(filepath.Join(settings.General.GetSongsDir(), beatMap.Dir, beatMap.Audio))
+	var track *bass.TrackBass
+	if fPath, err2 := beatMap.GetAudioFile(); err2 == nil {
+		track = bass.NewTrack(fPath)
+	}
 
 	if track == nil {
 		log.Println("Failed to create music stream, creating a dummy stream...")

diff --git a/launcher/songselect.go b/launcher/songselect.go
@@ -608,7 +608,10 @@ func (m *songSelectPopup) stopPreview() {
 func (m *songSelectPopup) startPreview(bMap *beatmap.BeatMap) {
 	cT := qpc.GetMilliTimeF()
 
-	track := bass.NewTrack(filepath.Join(settings.General.OsuSongsDir, bMap.Dir, bMap.Audio))
+	var track *bass.TrackBass
+	if fPath, err2 := bMap.GetAudioFile(); err2 == nil {
+		track = bass.NewTrack(fPath)
+	}
 
 	if track != nil {
 		beatmap.ParseTimingPointsAndPauses(bMap)