gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-06 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r13150) -Codechange: make classes of the Music[TrackSelection]Window.

Browse Source
This commit is contained in:
glx 2008-05-17 22:52:51 +00:00
parent 736671347b
commit c1713c9ab7
1 changed files with 219 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
src/music_gui.cpp
View File

@ -193,18 +193,40 @@ void MusicLoop()
} }
} }
static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e) struct MusicTrackSelectionWindow : public Window {
private:
enum MusicTrackSelectionWidgets {
MTSW_CLOSE,
MTSW_CAPTION,
MTSW_BACKGROUND,
MTSW_LIST_LEFT,
MTSW_LIST_RIGHT,
MTSW_ALL,
MTSW_OLD,
MTSW_NEW,
MTSW_EZY,
MTSW_CUSTOM1,
MTSW_CUSTOM2,
MTSW_CLEAR,
MTSW_SAVE,
};
public:
MusicTrackSelectionWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
{
this->FindWindowPlacementAndResize(desc);
}
virtual void OnPaint()
{ {
switch (e->event) {
case WE_PAINT: {
const byte* p; const byte* p;
uint i; uint i;
int y; int y;
w->SetWidgetDisabledState(11, msf.playlist <= 3); this->SetWidgetDisabledState(MTSW_CLEAR, msf.playlist <= 3);
w->LowerWidget(3); this->LowerWidget(MTSW_LIST_LEFT);
w->LowerWidget(4); this->LowerWidget(MTSW_LIST_RIGHT);
w->DrawWidgets(); this->DrawWidgets();
GfxFillRect(3, 23, 3 + 177, 23 + 191, 0); GfxFillRect(3, 23, 3 + 177, 23 + 191, 0);
GfxFillRect(251, 23, 251 + 177, 23 + 191, 0); GfxFillRect(251, 23, 251 + 177, 23 + 191, 0);
@ -238,13 +260,13 @@ static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e)
DrawString(252, y, (i < 10) ? STR_01EC_0 : STR_01ED, TC_FROMSTRING); DrawString(252, y, (i < 10) ? STR_01EC_0 : STR_01ED, TC_FROMSTRING);
y += 6; y += 6;
} }
break;
} }
case WE_CLICK: virtual void OnClick(Point pt, int widget)
switch (e->we.click.widget) { {
case 3: { // add to playlist switch (widget) {
int y = (e->we.click.pt.y - 23) / 6; case MTSW_LIST_LEFT: { // add to playlist
int y = (pt.y - 23) / 6;
uint i; uint i;
byte *p; byte *p;
@ -256,15 +278,15 @@ static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e)
if (p[i] == 0) { if (p[i] == 0) {
p[i] = y + 1; p[i] = y + 1;
p[i + 1] = 0; p[i + 1] = 0;
w->SetDirty(); this->SetDirty();
SelectSongToPlay(); SelectSongToPlay();
break; break;
} }
} }
} break; } break;
case 4: { // remove from playlist case MTSW_LIST_RIGHT: { // remove from playlist
int y = (e->we.click.pt.y - 23) / 6; int y = (pt.y - 23) / 6;
uint i; uint i;
byte *p; byte *p;
@ -276,50 +298,50 @@ static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e)
p[i] = p[i + 1]; p[i] = p[i + 1];
} }
w->SetDirty(); this->SetDirty();
SelectSongToPlay(); SelectSongToPlay();
} break; } break;
case 11: // clear case MTSW_CLEAR: // clear
_playlists[msf.playlist][0] = 0; _playlists[msf.playlist][0] = 0;
w->SetDirty(); this->SetDirty();
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
break; break;
#if 0 #if 0
case 12: // save case MTSW_SAVE: // save
ShowInfo("MusicTrackSelectionWndProc:save not implemented"); ShowInfo("MusicTrackSelectionWndProc:save not implemented");
break; break;
#endif #endif
case 5: case 6: case 7: case 8: case 9: case 10: /* set playlist */ case MTSW_ALL: case MTSW_OLD: case MTSW_NEW:
msf.playlist = e->we.click.widget - 5; case MTSW_EZY: case MTSW_CUSTOM1: case MTSW_CUSTOM2: // set playlist
w->SetDirty(); msf.playlist = widget - MTSW_ALL;
this->SetDirty();
InvalidateWindow(WC_MUSIC_WINDOW, 0); InvalidateWindow(WC_MUSIC_WINDOW, 0);
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
break; break;
} }
break;
}
} }
};
static const Widget _music_track_selection_widgets[] = { static const Widget _music_track_selection_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // MTSW_CLOSE
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 431, 0, 13, STR_01EB_MUSIC_PROGRAM_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 431, 0, 13, STR_01EB_MUSIC_PROGRAM_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // MTSW_CAPTION
{ WWT_PANEL, RESIZE_NONE, 14, 0, 431, 14, 217, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 14, 0, 431, 14, 217, 0x0, STR_NULL}, // MTSW_BACKGROUND
{ WWT_PANEL, RESIZE_NONE, 14, 2, 181, 22, 215, 0x0, STR_01FA_CLICK_ON_MUSIC_TRACK_TO}, { WWT_PANEL, RESIZE_NONE, 14, 2, 181, 22, 215, 0x0, STR_01FA_CLICK_ON_MUSIC_TRACK_TO}, // MTSW_LIST_LEFT
{ WWT_PANEL, RESIZE_NONE, 14, 250, 429, 22, 215, 0x0, STR_CLICK_ON_TRACK_TO_REMOVE}, { WWT_PANEL, RESIZE_NONE, 14, 250, 429, 22, 215, 0x0, STR_CLICK_ON_TRACK_TO_REMOVE}, // MTSW_LIST_RIGHT
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 44, 51, 0x0, STR_01F3_SELECT_ALL_TRACKS_PROGRAM}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 44, 51, 0x0, STR_01F3_SELECT_ALL_TRACKS_PROGRAM}, // MTSW_ALL
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 52, 59, 0x0, STR_01F4_SELECT_OLD_STYLE_MUSIC}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 52, 59, 0x0, STR_01F4_SELECT_OLD_STYLE_MUSIC}, // MTSW_OLD
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 60, 67, 0x0, STR_01F5_SELECT_NEW_STYLE_MUSIC}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 60, 67, 0x0, STR_01F5_SELECT_NEW_STYLE_MUSIC}, // MTSW_NEW
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 68, 75, 0x0, STR_0330_SELECT_EZY_STREET_STYLE}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 68, 75, 0x0, STR_0330_SELECT_EZY_STREET_STYLE}, // MTSW_EZY
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 76, 83, 0x0, STR_01F6_SELECT_CUSTOM_1_USER_DEFINED}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 76, 83, 0x0, STR_01F6_SELECT_CUSTOM_1_USER_DEFINED}, // MTSW_CUSTOM1
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 84, 91, 0x0, STR_01F7_SELECT_CUSTOM_2_USER_DEFINED}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 84, 91, 0x0, STR_01F7_SELECT_CUSTOM_2_USER_DEFINED}, // MTSW_CUSTOM2
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 108, 115, 0x0, STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 108, 115, 0x0, STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1}, // MTSW_CLEAR
#if 0 #if 0
{ WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 124, 131, 0x0, STR_01F9_SAVE_MUSIC_SETTINGS}, { WWT_PUSHBTN, RESIZE_NONE, 14, 186, 245, 124, 131, 0x0, STR_01F9_SAVE_MUSIC_SETTINGS}, // MTSW_SAVE
#endif #endif
{ WIDGETS_END}, { WIDGETS_END},
}; };
@ -329,24 +351,51 @@ static const WindowDesc _music_track_selection_desc = {
WC_MUSIC_TRACK_SELECTION, WC_NONE, WC_MUSIC_TRACK_SELECTION, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_music_track_selection_widgets, _music_track_selection_widgets,
MusicTrackSelectionWndProc NULL
}; };
static void ShowMusicTrackSelection() static void ShowMusicTrackSelection()
{ {
AllocateWindowDescFront<Window>(&_music_track_selection_desc, 0); AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
} }
static void MusicWindowWndProc(Window *w, WindowEvent *e) struct MusicWindow : public Window {
private:
enum MusicWidgets {
MW_CLOSE,
MW_CAPTION,
MW_PREV,
MW_NEXT,
MW_STOP,
MW_PLAY,
MW_SLIDERS,
MW_GAUGE,
MW_BACKGROUND,
MW_INFO,
MW_SHUFFLE,
MW_PROGRAMME,
MW_ALL,
MW_OLD,
MW_NEW,
MW_EZY,
MW_CUSTOM1,
MW_CUSTOM2,
};
public:
MusicWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
{
this->FindWindowPlacementAndResize(desc);
}
virtual void OnPaint()
{ {
switch (e->event) {
case WE_PAINT: {
uint i; uint i;
StringID str; StringID str;
w->RaiseWidget(7); this->RaiseWidget(MW_GAUGE);
w->RaiseWidget(9); this->RaiseWidget(MW_INFO);
w->DrawWidgets(); this->DrawWidgets();
GfxFillRect(187, 16, 200, 33, 0); GfxFillRect(187, 16, 200, 33, 0);
@ -403,29 +452,32 @@ static void MusicWindowWndProc(Window *w, WindowEvent *e)
DrawFrameRect( DrawFrameRect(
214 + msf.effect_vol / 2, 22, 217 + msf.effect_vol / 2, 28, 14, FR_NONE 214 + msf.effect_vol / 2, 22, 217 + msf.effect_vol / 2, 28, 14, FR_NONE
); );
} break; }
case WE_CLICK: virtual void OnClick(Point pt, int widget)
switch (e->we.click.widget) { {
case 2: // skip to prev switch (widget) {
if (!_song_is_active) case MW_PREV: // skip to prev
return; if (!_song_is_active) return;
SkipToPrevSong(); SkipToPrevSong();
break; break;
case 3: // skip to next
if (!_song_is_active) case MW_NEXT: // skip to next
return; if (!_song_is_active) return;
SkipToNextSong(); SkipToNextSong();
break; break;
case 4: // stop playing
case MW_STOP: // stop playing
msf.playing = false; msf.playing = false;
break; break;
case 5: // start playing
case MW_PLAY: // start playing
msf.playing = true; msf.playing = true;
break; break;
case 6: { // volume sliders
case MW_SLIDERS: { // volume sliders
byte *vol, new_vol; byte *vol, new_vol;
int x = e->we.click.pt.x - 88; int x = pt.x - 88;
if (x < 0) return; if (x < 0) return;
@ -438,57 +490,61 @@ static void MusicWindowWndProc(Window *w, WindowEvent *e)
new_vol = min(max(x - 21, 0) * 2, 127); new_vol = min(max(x - 21, 0) * 2, 127);
if (new_vol != *vol) { if (new_vol != *vol) {
*vol = new_vol; *vol = new_vol;
if (vol == &msf.music_vol) if (vol == &msf.music_vol) MusicVolumeChanged(new_vol);
MusicVolumeChanged(new_vol); this->SetDirty();
w->SetDirty();
} }
_left_button_clicked = false; _left_button_clicked = false;
} break; } break;
case 10: //toggle shuffle
case MW_SHUFFLE: //toggle shuffle
msf.shuffle ^= 1; msf.shuffle ^= 1;
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
break; break;
case 11: //show track selection
case MW_PROGRAMME: //show track selection
ShowMusicTrackSelection(); ShowMusicTrackSelection();
break; break;
case 12: case 13: case 14: case 15: case 16: case 17: // playlist
msf.playlist = e->we.click.widget - 12; case MW_ALL: case MW_OLD: case MW_NEW:
w->SetDirty(); case MW_EZY: case MW_CUSTOM1: case MW_CUSTOM2: // playlist
msf.playlist = widget - MW_ALL;
this->SetDirty();
InvalidateWindow(WC_MUSIC_TRACK_SELECTION, 0); InvalidateWindow(WC_MUSIC_TRACK_SELECTION, 0);
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
break; break;
} }
break;
case WE_TICK:
InvalidateWindowWidget(WC_MUSIC_WINDOW, 0, 7);
break;
} }
#if 0
virtual void OnTick()
{
this->InvalidateWidget(MW_GAUGE);
} }
#endif
};
static const Widget _music_window_widgets[] = { static const Widget _music_window_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // MW_CLOSE
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 299, 0, 13, STR_01D2_JAZZ_JUKEBOX, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, 14, 11, 299, 0, 13, STR_01D2_JAZZ_JUKEBOX, STR_018C_WINDOW_TITLE_DRAG_THIS}, // MW_CAPTION
{ WWT_PUSHIMGBTN, RESIZE_NONE, 14, 0, 21, 14, 35, SPR_IMG_SKIP_TO_PREV, STR_01DE_SKIP_TO_PREVIOUS_TRACK}, { WWT_PUSHIMGBTN, RESIZE_NONE, 14, 0, 21, 14, 35, SPR_IMG_SKIP_TO_PREV, STR_01DE_SKIP_TO_PREVIOUS_TRACK}, // MW_PREV
{ WWT_PUSHIMGBTN, RESIZE_NONE, 14, 22, 43, 14, 35, SPR_IMG_SKIP_TO_NEXT, STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION}, { WWT_PUSHIMGBTN, RESIZE_NONE, 14, 22, 43, 14, 35, SPR_IMG_SKIP_TO_NEXT, STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION}, // MW_NEXT
{ WWT_PUSHIMGBTN, RESIZE_NONE, 14, 44, 65, 14, 35, SPR_IMG_STOP_MUSIC, STR_01E0_STOP_PLAYING_MUSIC}, { WWT_PUSHIMGBTN, RESIZE_NONE, 14, 44, 65, 14, 35, SPR_IMG_STOP_MUSIC, STR_01E0_STOP_PLAYING_MUSIC}, // MW_STOP
{ WWT_PUSHIMGBTN, RESIZE_NONE, 14, 66, 87, 14, 35, SPR_IMG_PLAY_MUSIC, STR_01E1_START_PLAYING_MUSIC}, { WWT_PUSHIMGBTN, RESIZE_NONE, 14, 66, 87, 14, 35, SPR_IMG_PLAY_MUSIC, STR_01E1_START_PLAYING_MUSIC}, // MW_PLAY
{ WWT_PANEL, RESIZE_NONE, 14, 88, 299, 14, 35, 0x0, STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC}, { WWT_PANEL, RESIZE_NONE, 14, 88, 299, 14, 35, 0x0, STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC}, // MW_SLIDERS
{ WWT_PANEL, RESIZE_NONE, 14, 186, 201, 15, 34, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 14, 186, 201, 15, 34, 0x0, STR_NULL}, // MW_GAUGE
{ WWT_PANEL, RESIZE_NONE, 14, 0, 299, 36, 57, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 14, 0, 299, 36, 57, 0x0, STR_NULL}, // MW_BACKGROUND
{ WWT_PANEL, RESIZE_NONE, 14, 59, 240, 45, 53, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 14, 59, 240, 45, 53, 0x0, STR_NULL}, // MW_INFO
{ WWT_PUSHBTN, RESIZE_NONE, 14, 6, 55, 42, 49, 0x0, STR_01FB_TOGGLE_PROGRAM_SHUFFLE}, { WWT_PUSHBTN, RESIZE_NONE, 14, 6, 55, 42, 49, 0x0, STR_01FB_TOGGLE_PROGRAM_SHUFFLE}, // MW_SHUFFLE
{ WWT_PUSHBTN, RESIZE_NONE, 14, 244, 293, 42, 49, 0x0, STR_01FC_SHOW_MUSIC_TRACK_SELECTION}, { WWT_PUSHBTN, RESIZE_NONE, 14, 244, 293, 42, 49, 0x0, STR_01FC_SHOW_MUSIC_TRACK_SELECTION}, // MW_PROGRAMME
{ WWT_PUSHBTN, RESIZE_NONE, 14, 0, 49, 58, 65, 0x0, STR_01F3_SELECT_ALL_TRACKS_PROGRAM}, { WWT_PUSHBTN, RESIZE_NONE, 14, 0, 49, 58, 65, 0x0, STR_01F3_SELECT_ALL_TRACKS_PROGRAM}, // MW_ALL
{ WWT_PUSHBTN, RESIZE_NONE, 14, 50, 99, 58, 65, 0x0, STR_01F4_SELECT_OLD_STYLE_MUSIC}, { WWT_PUSHBTN, RESIZE_NONE, 14, 50, 99, 58, 65, 0x0, STR_01F4_SELECT_OLD_STYLE_MUSIC}, // MW_OLD
{ WWT_PUSHBTN, RESIZE_NONE, 14, 100, 149, 58, 65, 0x0, STR_01F5_SELECT_NEW_STYLE_MUSIC}, { WWT_PUSHBTN, RESIZE_NONE, 14, 100, 149, 58, 65, 0x0, STR_01F5_SELECT_NEW_STYLE_MUSIC}, // MW_NEW
{ WWT_PUSHBTN, RESIZE_NONE, 14, 150, 199, 58, 65, 0x0, STR_0330_SELECT_EZY_STREET_STYLE}, { WWT_PUSHBTN, RESIZE_NONE, 14, 150, 199, 58, 65, 0x0, STR_0330_SELECT_EZY_STREET_STYLE}, // MW_EZY
{ WWT_PUSHBTN, RESIZE_NONE, 14, 200, 249, 58, 65, 0x0, STR_01F6_SELECT_CUSTOM_1_USER_DEFINED}, { WWT_PUSHBTN, RESIZE_NONE, 14, 200, 249, 58, 65, 0x0, STR_01F6_SELECT_CUSTOM_1_USER_DEFINED}, // MW_CUSTOM1
{ WWT_PUSHBTN, RESIZE_NONE, 14, 250, 299, 58, 65, 0x0, STR_01F7_SELECT_CUSTOM_2_USER_DEFINED}, { WWT_PUSHBTN, RESIZE_NONE, 14, 250, 299, 58, 65, 0x0, STR_01F7_SELECT_CUSTOM_2_USER_DEFINED}, // MW_CUSTOM2
{ WIDGETS_END}, { WIDGETS_END},
}; };
@ -497,10 +553,10 @@ static const WindowDesc _music_window_desc = {
WC_MUSIC_WINDOW, WC_NONE, WC_MUSIC_WINDOW, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_music_window_widgets, _music_window_widgets,
MusicWindowWndProc NULL
}; };
void ShowMusicWindow() void ShowMusicWindow()
{ {
AllocateWindowDescFront<Window>(&_music_window_desc, 0); AllocateWindowDescFront<MusicWindow>(&_music_window_desc, 0);
} }