|
|
@ -192,25 +192,23 @@ void MusicLoop()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct MusicTrackSelectionWindow : public Window {
|
|
|
|
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)
|
|
|
|
MusicTrackSelectionWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
this->FindWindowPlacementAndResize(desc);
|
|
|
|
this->FindWindowPlacementAndResize(desc);
|
|
|
@ -350,30 +348,28 @@ static void ShowMusicTrackSelection()
|
|
|
|
AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
|
|
|
|
AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct MusicWindow : public Window {
|
|
|
|
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)
|
|
|
|
MusicWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
this->FindWindowPlacementAndResize(desc);
|
|
|
|
this->FindWindowPlacementAndResize(desc);
|
|
|
|