|
@@ -413,9 +413,9 @@ void MusicSystem::SaveCustomPlaylist(Pla
|
|
|
size_t num = 0;
|
|
|
MemSetT(settings_pl, 0, NUM_SONGS_PLAYLIST);
|
|
|
|
|
|
for (Playlist::const_iterator song = this->standard_playlists[pl].begin(); song != this->standard_playlists[pl].end(); ++song) {
|
|
|
for (const auto &song : this->standard_playlists[pl]) {
|
|
|
/* Music set indices in the settings playlist are 1-based, 0 means unused slot */
|
|
|
settings_pl[num++] = (byte)song->set_index + 1;
|
|
|
settings_pl[num++] = (byte)song.set_index + 1;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -510,10 +510,10 @@ struct MusicTrackSelectionWindow : publi
|
|
|
case WID_MTS_LIST_LEFT: case WID_MTS_LIST_RIGHT: {
|
|
|
Dimension d = {0, 0};
|
|
|
|
|
|
for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song) {
|
|
|
SetDParam(0, song->tracknr);
|
|
|
for (const auto &song : _music.music_set) {
|
|
|
SetDParam(0, song.tracknr);
|
|
|
SetDParam(1, 2);
|
|
|
SetDParamStr(2, song->songname);
|
|
|
SetDParamStr(2, song.songname);
|
|
|
Dimension d2 = GetStringBoundingBox(STR_PLAYLIST_TRACK_NAME);
|
|
|
d.width = std::max(d.width, d2.width);
|
|
|
d.height += d2.height;
|
|
@@ -533,10 +533,10 @@ struct MusicTrackSelectionWindow : publi
|
|
|
GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), PC_BLACK);
|
|
|
|
|
|
Rect tr = r.Shrink(WidgetDimensions::scaled.framerect);
|
|
|
for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song) {
|
|
|
SetDParam(0, song->tracknr);
|
|
|
for (const auto &song : _music.music_set) {
|
|
|
SetDParam(0, song.tracknr);
|
|
|
SetDParam(1, 2);
|
|
|
SetDParamStr(2, song->songname);
|
|
|
SetDParamStr(2, song.songname);
|
|
|
DrawString(tr, STR_PLAYLIST_TRACK_NAME);
|
|
|
tr.top += FONT_HEIGHT_SMALL;
|
|
|
}
|
|
@@ -547,10 +547,10 @@ struct MusicTrackSelectionWindow : publi
|
|
|
GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), PC_BLACK);
|
|
|
|
|
|
Rect tr = r.Shrink(WidgetDimensions::scaled.framerect);
|
|
|
for (MusicSystem::Playlist::const_iterator song = _music.active_playlist.begin(); song != _music.active_playlist.end(); ++song) {
|
|
|
SetDParam(0, song->tracknr);
|
|
|
for (const auto &song : _music.active_playlist) {
|
|
|
SetDParam(0, song.tracknr);
|
|
|
SetDParam(1, 2);
|
|
|
SetDParamStr(2, song->songname);
|
|
|
SetDParamStr(2, song.songname);
|
|
|
DrawString(tr, STR_PLAYLIST_TRACK_NAME);
|
|
|
tr.top += FONT_HEIGHT_SMALL;
|
|
|
}
|
|
@@ -698,8 +698,8 @@ struct MusicWindow : public Window {
|
|
|
|
|
|
case WID_M_TRACK_NAME: {
|
|
|
Dimension d = GetStringBoundingBox(STR_MUSIC_TITLE_NONE);
|
|
|
for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song) {
|
|
|
SetDParamStr(0, song->songname);
|
|
|
for (const auto &song : _music.music_set) {
|
|
|
SetDParamStr(0, song.songname);
|
|
|
d = maxdim(d, GetStringBoundingBox(STR_MUSIC_TITLE_NAME));
|
|
|
}
|
|
|
d.width += padding.width;
|