From 0a11579c18a939cf58d80fa8e8d7bb20dc8b2a66 Mon Sep 17 00:00:00 2001 From: giantpune Date: Wed, 13 May 2009 16:54:50 +0000 Subject: [PATCH] put some buttons for mp3 menu --- gui.pnproj | 2 +- gui.pnps | 2 +- source/filelist.h | 16 +++- source/images/arrow_next.png | Bin 0 -> 4607 bytes source/images/arrow_previous.png | Bin 0 -> 4523 bytes source/images/mp3_pause.png | Bin 0 -> 5057 bytes source/images/mp3_stop.png | Bin 0 -> 6555 bytes source/menu.cpp | 129 ++++++++++++++++++++++++++++--- 8 files changed, 133 insertions(+), 16 deletions(-) create mode 100644 source/images/arrow_next.png create mode 100644 source/images/arrow_previous.png create mode 100644 source/images/mp3_pause.png create mode 100644 source/images/mp3_stop.png diff --git a/gui.pnproj b/gui.pnproj index 706f4bf5..5d2af8d1 100644 --- a/gui.pnproj +++ b/gui.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/gui.pnps b/gui.pnps index adbc903b..4d76a3fe 100644 --- a/gui.pnps +++ b/gui.pnps @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/filelist.h b/source/filelist.h index c6e7d0a4..5acd7bfa 100644 --- a/source/filelist.h +++ b/source/filelist.h @@ -230,13 +230,25 @@ extern const u32 player3_grab_png_size; extern const u8 player4_grab_png[]; extern const u32 player4_grab_png_size; +extern const u8 battery_png[]; +extern const u32 battery_png_size; + extern const u8 battery_bar_png[]; extern const u32 battery_bar_png_size; extern const u8 battery_red_png[]; extern const u32 battery_red_png_size; -extern const u8 battery_png[]; -extern const u32 battery_png_size; +extern const u8 arrow_next_png[]; +extern const u32 arrow_next_png_size; + +extern const u8 arrow_previous_png[]; +extern const u32 arrow_previous_png_size; + +extern const u8 mp3_pause_png[]; +extern const u32 mp3_pause_png_size; + +extern const u8 mp3_stop_png[]; +extern const u32 mp3_stop_png_size; #endif diff --git a/source/images/arrow_next.png b/source/images/arrow_next.png new file mode 100644 index 0000000000000000000000000000000000000000..4704d97b1646c7c1af288e7b3cfc082b20ab9a2b GIT binary patch literal 4607 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 literal 0 HcmV?d00001 diff --git a/source/images/arrow_previous.png b/source/images/arrow_previous.png new file mode 100644 index 0000000000000000000000000000000000000000..8dcdaddc667d13903b1b9baf7a6e5894177c7d81 GIT binary patch literal 4523 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 JPDHLkV1hE{f@=T( literal 0 HcmV?d00001 diff --git a/source/images/mp3_pause.png b/source/images/mp3_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..b60960fb77d88cca62258a054b64eebe59d122dc GIT binary patch literal 5057 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 XuUU|AJj_%}00000NkvXXu0mjf*A=+M literal 0 HcmV?d00001 diff --git a/source/images/mp3_stop.png b/source/images/mp3_stop.png new file mode 100644 index 0000000000000000000000000000000000000000..cf89d62c1a273e96b6876d5dbebd270604a8c209 GIT binary patch literal 6555 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 N002ovPDHLkV1m)}!*Kur literal 0 HcmV?d00001 diff --git a/source/menu.cpp b/source/menu.cpp index 243ee24e..78b97b76 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -4511,6 +4511,7 @@ int MenuMp3() int menu = MENU_NONE, cnt = 0; int ret = 0; int scrollon, i = 0; + char imgPath[100]; GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol); GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol); @@ -4548,32 +4549,99 @@ int MenuMp3() GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); cancelBtn.SetScale(0.9); cancelBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - cancelBtn.SetPosition(180, 400); + cancelBtn.SetPosition(210, 400); cancelBtn.SetLabel(&cancelBtnTxt); cancelBtn.SetImage(&cancelBtnImg); cancelBtn.SetSoundOver(&btnSoundOver); cancelBtn.SetTrigger(&trigA); cancelBtn.SetEffectGrow(); - GuiText playBtnTxt("Play", 22, (GXColor){0, 0, 0, 255}); - cancelBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30); - GuiImage playBtnImg(&btnOutline); - if (Settings.wsprompt == yes){ - cancelBtnImg.SetWidescreen(CFG.widescreen);} - GuiButton playBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); - playBtn.SetScale(0.9); + bool isplaying = false; + int songPlaying=0; + + GuiTrigger trigHome; + trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); + GuiTrigger trigL; + trigL.SetButtonOnlyTrigger(-1, WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT, PAD_BUTTON_LEFT); + GuiTrigger trigR; + trigR.SetButtonOnlyTrigger(-1, WPAD_BUTTON_RIGHT | WPAD_CLASSIC_BUTTON_RIGHT, PAD_BUTTON_RIGHT); + GuiTrigger trigMinus; + trigMinus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0); + GuiTrigger trigPlus; + trigPlus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_PLUS | WPAD_CLASSIC_BUTTON_PLUS, 0); + + int playerIsUp=0; + snprintf(imgPath, sizeof(imgPath), "%sarrow_next.png", CFG.theme_path); + GuiImageData next(imgPath, arrow_next_png); + snprintf(imgPath, sizeof(imgPath), "%sarrow_previous.png", CFG.theme_path); + GuiImageData prev(imgPath, arrow_previous_png); + snprintf(imgPath, sizeof(imgPath), "%smp3_stop.png", CFG.theme_path); + GuiImageData stop(imgPath, mp3_stop_png); + snprintf(imgPath, sizeof(imgPath), "%smp3_pause.png", CFG.theme_path); + GuiImageData pause(imgPath, mp3_pause_png); + snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_right.png", CFG.theme_path); + GuiImageData play(imgPath, startgame_arrow_right_png); + + + + GuiImage nextBtnImg(&next); + GuiButton nextBtn(next.GetWidth(), next.GetHeight()); + nextBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + nextBtn.SetPosition(100, 400); + nextBtn.SetImage(&nextBtnImg); + nextBtn.SetSoundOver(&btnSoundOver); + nextBtn.SetSoundClick(&btnClick); + nextBtn.SetTrigger(&trigA); + nextBtn.SetTrigger(&trigR); + nextBtn.SetEffectGrow(); + + GuiImage prevBtnImg(&prev); + prevBtnImg.SetWidescreen(CFG.widescreen); + GuiButton prevBtn(prev.GetWidth(), prev.GetHeight()); + prevBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + prevBtn.SetPosition(-100, 400); + prevBtn.SetImage(&prevBtnImg); + prevBtn.SetSoundOver(&btnSoundOver); + prevBtn.SetSoundClick(&btnClick); + prevBtn.SetTrigger(&trigA); + prevBtn.SetTrigger(&trigL); + prevBtn.SetEffectGrow(); + + GuiImage playBtnImg(&play); + playBtnImg.SetWidescreen(CFG.widescreen); + GuiButton playBtn(play.GetWidth(), play.GetHeight()); playBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - playBtn.SetPosition(-180, 400); - playBtn.SetLabel(&playBtnTxt); + playBtn.SetPosition(42, 400); playBtn.SetImage(&playBtnImg); playBtn.SetSoundOver(&btnSoundOver); + playBtn.SetSoundClick(&btnClick); playBtn.SetTrigger(&trigA); + playBtn.SetTrigger(&trigPlus); playBtn.SetEffectGrow(); + + GuiImage stopBtnImg(&stop); + stopBtnImg.SetWidescreen(CFG.widescreen); + GuiButton stopBtn(stop.GetWidth(), stop.GetHeight()); + stopBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + stopBtn.SetPosition(-27, 400); + stopBtn.SetImage(&stopBtnImg); + stopBtn.SetSoundOver(&btnSoundOver); + stopBtn.SetSoundClick(&btnClick); + stopBtn.SetTrigger(&trigA); + stopBtn.SetTrigger(&trigMinus); + stopBtn.SetEffectGrow(); + + GuiImage pauseBtnImg(&pause); + pauseBtnImg.SetWidescreen(CFG.widescreen); HaltGui(); GuiWindow w(screenwidth, screenheight); w.Append(&cancelBtn); w.Append(&playBtn); + w.Append(&playBtn); + w.Append(&nextBtn); + w.Append(&prevBtn); + w.Append(&stopBtn); mainWindow->Append(&optionBrowser4); mainWindow->Append(&w); @@ -4595,22 +4663,59 @@ int MenuMp3() if(i == ret) { sprintf(fullpath,"%s%s", mp3path,mp3files[ret]); PlayMp3(fullpath); + songPlaying=ret; SetMp3Volume(127); } } if (playBtn.GetState() == STATE_CLICKED) { - + StopMp3(); ret = optionBrowser4.GetSelectedOption(); + songPlaying=ret; sprintf(fullpath,"%s%s", mp3path,mp3files[ret]); - //bgMusic->Stop(); PlayMp3(fullpath); SetMp3Volume(127); + //playBtn.SetImage(&playBtnImg);isplaying=true; + //if (isplaying==true){playBtn.SetImage(&pauseBtnImg);isplaying=false;} playBtn.ResetState(); + } + + if(nextBtn.GetState() == STATE_CLICKED) + { + StopMp3(); + songPlaying++; + //ret = (optionBrowser4.GetSelectedOption()+1); + sprintf(fullpath,"%s%s", mp3path,mp3files[songPlaying]); + PlayMp3(fullpath); + SetMp3Volume(127); + nextBtn.ResetState(); + //break; + } + if(prevBtn.GetState() == STATE_CLICKED) + { + StopMp3(); + songPlaying--; + //ret = (optionBrowser4.GetSelectedOption()-1); + sprintf(fullpath,"%s%s", mp3path,mp3files[songPlaying]); + PlayMp3(fullpath); + SetMp3Volume(127); + prevBtn.ResetState(); + //break; + } + if(stopBtn.GetState() == STATE_CLICKED) + { StopMp3(); + stopBtn.ResetState(); + playBtn.SetImage(&playBtnImg); + //break; + } } HaltGui(); + w.Remove(&playBtn); + w.Remove(&nextBtn); + w.Remove(&prevBtn); + w.Remove(&stopBtn); mainWindow->Remove(&optionBrowser4); mainWindow->Remove(&w); ResumeGui();