Skip to content

Commit 8a09087

Browse files
committed
Remove instrument tracks (guitars???)
1 parent 68d7161 commit 8a09087

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

src/Etterna/Models/Misc/AutoKeysounds.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ AutoKeysounds::LoadTracks(const Song* pSong,
102102
RageSoundReader*& pShared,
103103
RageSoundReader*& pPlayer1)
104104
{
105-
// If we have two players, prefer a three-track sound; otherwise prefer a
106-
// two-track sound.
107-
// bool bTwoPlayers = GAMESTATE->GetNumPlayersEnabled() == 2;
108-
109105
pPlayer1 = nullptr;
110106
pShared = nullptr;
111107

@@ -115,14 +111,6 @@ AutoKeysounds::LoadTracks(const Song* pSong,
115111
if (!sMusicPath.empty())
116112
vsMusicFile.push_back(sMusicPath);
117113

118-
FOREACH_ENUM(InstrumentTrack, it)
119-
{
120-
if (it == InstrumentTrack_Guitar)
121-
continue;
122-
if (pSong->HasInstrumentTrack(it))
123-
vsMusicFile.push_back(pSong->GetInstrumentTrackPath(it));
124-
}
125-
126114
vector<RageSoundReader*> vpSounds;
127115
FOREACH(RString, vsMusicFile, s)
128116
{
@@ -156,19 +144,6 @@ AutoKeysounds::LoadTracks(const Song* pSong,
156144
pShared = pSongReader;
157145
}
158146

159-
if (pSong->HasInstrumentTrack(InstrumentTrack_Guitar)) {
160-
RString sError;
161-
RageSoundReader* pGuitarTrackReader =
162-
RageSoundReader_FileReader::OpenFile(
163-
pSong->GetInstrumentTrackPath(InstrumentTrack_Guitar), sError);
164-
// Load the buffering filter before the effects filters, so effects
165-
// aren't delayed.
166-
pGuitarTrackReader = new RageSoundReader_Extend(pGuitarTrackReader);
167-
pGuitarTrackReader =
168-
new RageSoundReader_ThreadedBuffer(pGuitarTrackReader);
169-
pPlayer1 = pGuitarTrackReader;
170-
}
171-
172147
return;
173148
}
174149

0 commit comments

Comments
 (0)