miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed music GUI compilation

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-04-24 20:01:32 +03:00
committed by pelya
parent 57e7680dd5
commit bcfb36e8af
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/music_gui.cpp
View File

@@ -457,7 +457,7 @@ struct MusicTrackSelectionWindow : public Window {
uint GetNumberOfTracksOfTracklist() const uint GetNumberOfTracksOfTracklist() const
{ {
uint i = 0; uint i = 0;
for (; _playlists[_settings_client.music.playlist][i] > 0; i++) {} for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song, ++i) {}
return i; return i;
} }
@@ -549,8 +549,10 @@ struct MusicTrackSelectionWindow : public Window {
int y = r.top + WD_FRAMERECT_TOP; int y = r.top + WD_FRAMERECT_TOP;
uint vscroll_max = min(this->left_sb->GetPosition() + this->left_sb->GetCapacity(), NUM_SONGS_AVAILABLE); uint vscroll_max = min(this->left_sb->GetPosition() + this->left_sb->GetCapacity(), NUM_SONGS_AVAILABLE);
uint i = 0;
for (uint i = this->left_sb->GetPosition(); i < vscroll_max; i++) { for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song, i++) {
if (i < this->left_sb->GetPosition()) continue;
if (i >= vscroll_max) break;
SetDParam(0, song->tracknr); SetDParam(0, song->tracknr);
SetDParam(1, 2); SetDParam(1, 2);
SetDParamStr(2, song->songname); SetDParamStr(2, song->songname);
@@ -565,9 +567,10 @@ struct MusicTrackSelectionWindow : public Window {
int y = r.top + WD_FRAMERECT_TOP; int y = r.top + WD_FRAMERECT_TOP;
uint vscroll_max = min(this->right_sb->GetPosition() + this->right_sb->GetCapacity(), this->GetNumberOfTracksOfTracklist()); uint vscroll_max = min(this->right_sb->GetPosition() + this->right_sb->GetCapacity(), this->GetNumberOfTracksOfTracklist());
uint i = 0;
for (uint i = this->right_sb->GetPosition(); i < vscroll_max; i++) { for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song, i++) {
uint j = _playlists[_settings_client.music.playlist][i] - 1; if (i < this->right_sb->GetPosition()) continue;
if (i >= vscroll_max) break;
SetDParam(0, song->tracknr); SetDParam(0, song->tracknr);
SetDParam(1, 2); SetDParam(1, 2);
SetDParamStr(2, song->songname); SetDParamStr(2, song->songname);
@@ -843,11 +846,7 @@ struct MusicWindow : public Window {
if (new_vol < 3) new_vol = 0; if (new_vol < 3) new_vol = 0;
if (new_vol != *vol) { if (new_vol != *vol) {
*vol = new_vol; *vol = new_vol;
<<<<<<< HEAD
if (widget == WID_M_MUSIC_VOL) MusicDriver::GetInstance()->SetVolume(new_vol); if (widget == WID_M_MUSIC_VOL) MusicDriver::GetInstance()->SetVolume(new_vol);
=======
if (widget == WID_M_MUSIC_VOL) MusicVolumeChanged((new_vol * new_vol) / 127); // Kinda logarithmic scale
>>>>>>> origin/master
this->SetDirty(); this->SetDirty();
} }