From 71c288f0a230db0b0c82902ca70d25287dee1114 Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Wed, 20 May 2009 00:03:43 +0000 Subject: [PATCH] *Added new custom backgroundmusic Menu (the music has to be in OGG Format. if you remove the path to the music the standard of the GUi is loaded right now) *Added languagefiles again *Added some new Languagevariables which will be added to wiki tommorow --- Languages/korean | 171 ++++++++++++++ Languages/norwegian | 177 ++++++++++++++ Languages/schinese | 178 ++++++++++++++ Languages/spanish | 357 ++++++++++++++-------------- Languages/tchinese | 24 +- gui.pnproj | 2 +- source/cfg.c | 12 + source/cfg.h | 2 + source/fatmounter.c | 2 +- source/language.c | 31 ++- source/language.h | 6 + source/libwiigui/gui.h | 7 + source/libwiigui/gui_sound.cpp | 44 +++- source/menu.cpp | 409 ++++++++++++++++++++++++++++++--- source/menu.h | 1 + source/mp3s.c | 2 +- source/mp3s.h | 2 +- source/oggplayer.c | 41 ++++ source/oggplayer.h | 6 + 19 files changed, 1250 insertions(+), 224 deletions(-) create mode 100644 Languages/korean create mode 100644 Languages/norwegian create mode 100644 Languages/schinese diff --git a/Languages/korean b/Languages/korean new file mode 100644 index 00000000..1ccc6380 --- /dev/null +++ b/Languages/korean @@ -0,0 +1,171 @@ +Specialthanksto = Special thanks to +t3Covers = 3D 표지 +AppLanguage = 어플리케이션 언어 +Areyousure = 확실합니까? +AutoPatch = 자동 패치 +Back = 뒤로 +BacktoHBCorWiiMenu = 홈브류 메뉴 또는 Wii 메뉴로 +BacktoLoader = Loader로 돌아가기 +BacktoWiiMenu = Wii 메뉴로 놀아가기 +BootStandard = 부트/기본 +BothBoth = 전부 표시 +Cantcreatedirectory = 디렉토리를 만들 수 없습니다 +Cancel = 취소 +Cantbeformated = 포맷할 수 없습니다. +Cantdelete = 삭제할 수 없습니다: +ClicktoDownloadCovers = 표지를 다운 받으려면 클릭하세요. +Clock = 시계 +Continueinstallgame = 게임을 설치하겠습니까? +ConsoleDefault = 콘솔 기본값 +Consoleshouldbeunlockedtomodifyit = 변경하려면 콘솔 잠김을 해제하세요. +ConsoleLocked = 콘솔 잠김 +CorrectPassword = 올바른 비밀번호 +Couldnotinitializenetwork = 네트워크 초기화 실패! +CouldnotopenDisc = 디스크를 열 수 없습니다. +CouldnotinitializeDIPmodule = DIP 모듈 초기화 실패! +CoverDownload = 표지 다운로드 +CoverPath = 표지 경로 +CoverpathChanged = 표지 경로 변경됨 +Coverpathchange = 표지 경로 변경 +Credits = Credits +DiscImages = 디스크 이미지 +DiscimagePath = 디스크 이미지 경로 +DiscpathChanged = 새로운 디스크 경로 +Discpathchange = 디스크 경로 변경 +DiscDefault = 디스크 기본값 +Display = 화면 표시 +Doyouwanttoformat = 포맷하겠습니까: +Doyoureallywanttodelete = 정말로 삭제하겠습니까: +Doyouwanttoretryfor30secs = 30초간 재시도 할까요? +Downloadingfile = 파일을 다운로드합니다: +DownloadBoxartimage = 박스 이미지를 다운로드 할까요? +Downloadfinished = 다운로드 완료 +Error = 에러 ! +BOOTERROR = 부팅 에러 +ErrorreadingDisc = 디스크 읽기 오류 +ExitUSBISOLoader = USB Loader GX를 종료하겠습니까? +InitializingNetwork = 네트워크 초기화 +InsertDisk = 디스크를 넣어주세요 +InsertaWiiDisc = Wii 디스크를 넣으세요! +InsertaSDCardtodownloadimages = 다운받은 이미지를 저장할 SD카드를 넣으세요. +InsertaSDCardtosave = 저장할 SD카드를 넣으세요. +InstallRenameandDeleteareunlocked = USB Loader GX의 모든 기능 잠금해제. +Installerror = 설치 에러! +Installagame = 게임 설치 +Installinggame = 게임 설치 중: +Failedtoboot = 부팅 실패: +FailedtomountfrontSDcard = SD카드 인식 실패 +FailedtosetUSB = USB 세팅 실패: +Failedformating = 포맷 실패 +filesnotfoundontheserver = 파일이 서버에 없습니다! +filesleft = 파일 남음 +FlipX = Flip-X +Force = 강제 +Youneedtoformatapartition = 파티션을 포맷해야 합니다 +Format = 포맷 +Formattingpleasewait = 포맷 중입니다, 기다려 주세요... +formated = 포맷 완료! +free = 남음 +FreeSpace = 여유 공간 +FullShutdown = 완전히 끄기 +GameID = 게임 ID +Games = 게임 +Gameisalreadyinstalled = 게임이 이미 설치되어 있습니다. +GameRegion = 지역 +GameSize = 게임 용량 +GoBack = 뒤로 가기 +//GotoPage = 페이지로 가기 +HowtoShutdown = 어떻게 종료할까요? +Language = 언어 +Langchange = 언어 변경 +Left = 왼쪽 +LikeSysMenu = 세스템 메뉴처럼 +LoadingincIOS = cIOS249로 로딩 +Lock = 잠금 +LockConsole = 콘솔 잠금 +MP3Menu = MP3 메뉴 +Missingfiles = 빠진 파일 +Networkiniterror = 네트워크 초기화 에러 +Neither = 표시 없음 +Next = 다음 +No = 아니오 +Nofilemissing = 빠진 파일 없음! +NoHDDfound = 하드 디스크가 없습니다! +NoSDcardinserted = SD카드가 없습니다! +Nopartitionsfound = 파티션이 없습니다. +NoUSBDevice = USB 장치가 없습니다. +NoWBFSpartitionfound = WBFS 파티션이 없습니다. +NormalCovers = 일반 표지 +Normal = 일반 +NotaWiiDisc = Wii 디스크가 아닙니다 +NoUSBDevicefound = USB 장치가 없습니다. +Notenoughfreespace = 여유 공간이 부족합니다! +notset = 설정되지 않음 +of = 중 +OFF = 꺼짐 +OfficialSite = 공식 사이트 +ok = OK +ON = 켜짐 +Parentalcontrol = 파티션 제어 +Partition = 파티션 +Password = 비밀번호 +PasswordChanged = 새로운 비밀번호 +Passwordhasbeenchanged = 비밀번호가 변경되었습니다 +Passwordchange = 비밀번호 변경 +PowerofftheWii = Wii 전원 끄기 +Prev = 이전 +PromptsButtons = 프롬프트 버튼 +ReloadSD = SD카드 다시 읽기 +RenameGameonWBFS = WBFS에서 게임 이름 바꾸기 +Restart = 다시 시작 +Return = 돌아가기 +ReturntoWii = Wii 메뉴로 돌아가기 +Right = 오른쪽 +Rumble = 진동 +QuickBoot = 퀵부트 +Save = 저장 +SaveFailed = 저장 실패 +Specialthanksto = Special thanks to +For = for +theUSBLoaderandreleasingthesourcecodethe = 소스 코드 배포 +secondsleft = 초 남았습니다 +SelectthePartition = 포맷하려는 +youwanttoformat = 파티션을 선택하세요 +settings = 설정 +ShutdowntoIdle = Idle상태로 종료 +ShutdownSystem = 시스템 종료 +Success = 성공: +Successfullyinstalled = 설치 성공: +Successfullydeleted = 삭제 성공: +SuccessfullySaved = 저장 성공 +SystemDefault = 시스템 기본값 +ThemePath = 테마 경로 +ThemepathChanged = 테마 경로 변경됨 +Themepathchange = 테마 경로 변경 +Try = 시도 +Tooltips = Tooltips +Timeleft = 남은 시간: +Unlock = 잠금해제 +Uninstall = 제거 +USBLoaderisprotected = USB Loader GX 보호모드 +USBDevicenotfound = USB 장치가 없습니다. +VideoMode = 비디오 모드 +VIDTVPatch = VIDTV 패치 +Volume = 볼륨 +Waiting = 기다리는 중... +WaitingforUSBDevice = USB 장치를 기다리는 중 +WidescreenFix = 와이드 스크린 Fix +WiiMenu = Wii 메뉴 +WrongPassword = 잘못된 비밀번호 +Yes = 예 +YoudonthavecIOS = cIOS222가 없습니다. +Japanese = 일본어 +German = 독일어 +English = 영어 +French = 불어 +Spanish = 스페인어 +Italian = 이태리어 +Dutch = 네덜란드어 +SChinese = 중국어(간체) +TChinese = 중국어(번체) +Korean = 한국어 \ No newline at end of file diff --git a/Languages/norwegian b/Languages/norwegian new file mode 100644 index 00000000..d49c7d76 --- /dev/null +++ b/Languages/norwegian @@ -0,0 +1,177 @@ +t3Covers = 3D cover +AppLanguage = Program spr�k +Areyousure = Er du sikker? +AutoPatch = AutoPatch +Back = Tilbake +BacktoHBCorWiiMenu = Tilbake til HBC eller Wii meny +BacktoLoader = HBC/Loader +BacktoWiiMenu = Wii meny +BootStandard = Boot/Standard +Both = Begge +Cantcreatedirectory = Kan ikke opprette mappestruktur +Cancel = Avbryt +Cantbeformated = Kan ikke formateres +Cantdelete = Kan ikke slette: +ClicktoDownloadCovers = Klikk for � laste ned cover +Clock = Klokke +Continueinstallgame = Fortsett � installere spill? +ConsoleDefault = Konsoll Standard +Consoleshouldbeunlockedtomodifyit = Konsoll m� v�re oppl�st for � modifisere. +ConsoleLocked = Konsoll l�st +CorrectPassword = Riktig passord +Couldnotinitializenetwork = Kan ikke initialisere nettverk! +CouldnotopenDisc = Kan ikke �pne plate +CouldnotinitializeDIPmodule = Kan ikke initialisere DIP modul! +CoverDownload = Cover nedlasting +CoverPath = Cover sti +CoverpathChanged = Cover sti endret +Coverpathchange = Endre cover sti +Credits = Medvirkende +DiscImages = Plate bilder +DiscimagePath = Plate sti +DiscpathChanged = Plate sti endret +Discpathchange = Endre plate sti +DiscDefault = Plate Standard +Display = Vis +Doyouwanttoformat = Vil du formatere: +Doyoureallywanttodelete = Er du sikker p� at du vil slette: +Doyouwanttoretryfor30secs = Vil du fortsette � pr�ve i 30 sekunder? +Downloadingfile = Laster ned fil: +DownloadBoxartimage = Last ned cover bilde? +Downloadfinished = Nedlasting ferdig +Error = Feil ! +BOOTERROR = BOOT FEIL +ErrorreadingDisc = Feil ved lesing av plate +ExitUSBISOLoader = Avslutt USB Loader GX? +InitializingNetwork = Initialiserer nettverk +InsertDisk = Sett inn plate +InsertaWiiDisc = Sett inn en Wii plate! +InsertaSDCardtodownloadimages = Sett inn et SD-kort for � laste ned bilder. +InsertaSDCardtosave = Sett inn et SD-kort for � lagre. +InstallRenameandDeleteareunlocked = Alle funksjonene til USB Loader GX er oppl�st. +Installerror = Installasjonsfeil! +Installagame = Install�r et spill +Installinggame = Installerer spill: +Failedtoboot = Feil ved start: +FailedtomountfrontSDcard = Feil ved montering av SD-kort i front +FailedtosetUSB = Feil ved valgt USB: +Failedformating = Feil ved formatering +Filenotfound = Fil ikke funnet. +filesnotfoundontheserver = filer ikke funnet p� serveren! +filesleft = fil(er) gjenst�r +FlipX = Flip-X +Force = Tving +Youneedtoformatapartition = Du m� formatere en partisjon +Format = Format�r +Formattingpleasewait = Formaterer, vennligst vent... +formated = formatert! +free = ledig +FreeSpace = Ledig plass +FullShutdown = Skru helt av +GameID = Spill ID +Games = Spill +Gameisalreadyinstalled = Spillet er allerede installert: +GameRegion = Region +GameSize = Spill st�rrelse +GoBack = G� tilbake +//GotoPage = G� til side +HowtoShutdown = Hvordan skru av? +keyboard = Tastatur +Language = Spr�k +Langchange = Bytt spr�k +Left = Venstre +LikeSysMenu = Lik Systemmeny +LoadingincIOS = Laster i cIOS249 +Loadingstandardlanguage = Laster standard spr�k. +Lock = L�s +LockConsole = L�s konsoll +MP3Menu = MP3 meny +Missingfiles = Manglende filer +Networkiniterror = Nettverk init feil +Neither = Ingen +Next = Neste +No = Nei +Nofilemissing = Ingen filer mangler! +NoHDDfound = Ingen HDD funnet! +NoSDcardinserted = Intet SD-kort satt i! +Nopartitionsfound = Ingen partisjoner funnet +NoUSBDevice = Ingen USB enhet +NoWBFSpartitionfound = Ingen WBFS partisjon funnet +NormalCovers = Normale cover +Normal = Normal +NotaWiiDisc = Ikke en Wii plate +NoUSBDevicefound = Ingen USB enhet funnet. +Notenoughfreespace = Ikke nok ledig plass! +notset = ikke satt +of = av +OFF = AV +OfficialSite = Offisiell nettside +ok = OK +ON = P� +Parentalcontrol = Foreldre kontroll +Partition = Partisjon +Password = Passord +PasswordChanged = Passord endret +Passwordhasbeenchanged = Passord har blitt endret +Passwordchange = Endre passord +PowerofftheWii = Skru av Wii +Prev = Forrige +PromptsButtons = Dialog knapper +ReloadSD = Les SD p� nytt +RenameGameonWBFS = Gi nytt navn til spill p� WBFS +Restart = Start p� nytt +Return = G� tilbake +ReturntoWii = Tilbake til Wii meny +Right = H�yre +Rumble = Vibrasjon +QuickBoot = Hurtig start +Save = Lagre +SaveFailed = Lagre feilet +Specialthanksto = Spesiell takk til +Titlestxtpath = Titles.txt sti +TitlestxtpathChanged = Titles.txt sti endret. +Titlestxtpathchange = Endre titles.txt sti +For = for +theUSBLoaderandreleasingthesourcecodethe = og utgivelse av kildekoden +secondsleft = sekunder gjenst�r +SelectthePartition = Velg partisjonen +youwanttoformat = du vil formatere +settings = Innstillinger +ShutdowntoIdle = Skru av +ShutdownSystem = Skru helt av +Success = Suksess: +Successfullyinstalled = Vellykket installering: +Successfullydeleted = Vellykket sletting: +SuccessfullySaved = Vellykket lagring +SystemDefault = System Standard +ThemePath = Tema sti +ThemepathChanged = Tema sti endret +Themepathchange = Endre tema sti +Try = Pr�v +Tooltips = Verkt�ystips +Timeleft = Tid igjen: +Unlock = L�s opp +Unicodefix = Unicode fiks +Uninstall = Avinstall�r +USBLoaderisprotected = USB Loader GX er beskyttet +USBDevicenotfound = USB enhet ikke funnet +VideoMode = Video modus +VIDTVPatch = VIDTV Patch +Volume = Volum +Waiting = Venter... +WaitingforUSBDevice = Venter p� USB enhet +WidescreenFix = Fiks for 16/9 +WiiMenu = Wii meny +WrongPassword = Feil passord +Yes = Ja +YoudonthavecIOS = Du har ikke cIOS222 +Japanese = Japansk +German = Tysk +English = Engelsk +French = Fransk +Spanish = Spansk +Italian = Italiensk +Dutch = Nederlandsk +SChinese = S.Kinesisk +TChinese = T.Kinesisk +Korean = Koreansk \ No newline at end of file diff --git a/Languages/schinese b/Languages/schinese new file mode 100644 index 00000000..5bd60ce1 --- /dev/null +++ b/Languages/schinese @@ -0,0 +1,178 @@ +Specialthanksto = 景깎먁剋 +t3Coverst = 3D 룐충 +AppLanguage = 刀喇�擁� +Areyousure = 횅땍? +AutoPatch = 菱땡朞嶝 +Back = 럿쀼 +BacktoHBCorWiiMenu = 럿쀼 HBC 샀 Wii 溝固꽉데 +BacktoLoader = 럿쀼 Loader +BacktoWiiMenu = 럿쀼 Wii 溝固꽉데 +BootStandard = 폘땡/깃硫 +BothBoth = 홍꼬 +Cantcreatedirectory = 轟랬쉔접커쩌 +Cancel = 혤句 +Cantbeformated = 轟랬목駕뺏 +Cantdelete = 轟랬�쓱�: +ClicktoDownloadCovers = 듐샌苟潼룐충 +Clock = 珂爐 +Continueinstallgame = 셨崎갛陋踏狗? +ConsoleDefault = 寮샙칵훰 +Consoleshouldbeunlockedtomodifyit = 矜썩傑鹿역폘�擁㉨┙�. +ConsoleLocked = 寮샙傑땍 +CorrectPassword = 쵱쯤攣횅 +Couldnotinitializenetwork = 轟랬폘땡貢쭹! +CouldnotopenDisc = 轟랬역폘밟턍 +CouldnotinitializeDIPmodule = 轟랬폘땡 DIP 친욥! +CoverDownload = 苟潼룐충 +CoverPath = 룐충닸렴쨌쓺 +CoverpathChanged = 룐충쨌쓺綠긴뫘 +Coverpathchange = 긴뫘룐충닸렴쨌쓺 +Credits = Credits +DiscImages = DVD룐충 +DiscimagePath = 꽉데룐충닸렴쨌쓺 +DiscpathChanged = DVD룐충쨌쓺綠긴뫘 +Discpathchange = 긴뫘DVD룐충닸렴쨌쓺 +DiscDefault = 踏狗칵훰 +Display = 鞫刻 +Doyouwanttoformat = 角뤠목駕뺏: +Doyoureallywanttodelete = 횅땍�쓱�: +Doyouwanttoretryfor30secs = 角뤠된덤30취路桿? +Downloadingfile = 苟潼匡숭: +DownloadBoxartimage = 苟潼룐충暠튬? +Downloadfinished = 苟潼供냥 +Error = 댄轎 ! +BOOTERROR = 폘땡댄轎 +ErrorreadingDisc = 뗍혤밟턍댄轎 +ExitUSBISOLoader = 잼역 USB Loader GX? +InitializingNetwork = 攣瞳폘땡貢쭹 +InsertDisk = 꿨흙밟턍 +InsertaWiiDisc = 꿨흙 Wii 밟턍! +InsertaSDCardtodownloadimages = 꿨흙 SD 엥苟潼룐충. +InsertaSDCardtosave = 꿨흙SD엥괏닸. +InstallRenameandDeleteareunlocked = USB Loader GX 묘콘綠썩傑. +Installerror = 갛陋댄轎! +Installagame = 갛陋踏狗 +Installinggame = 攣瞳갛陋踏狗: +Failedtoboot = 轟랬폘땡: +FailedtomountfrontSDcard = 밈潼품똥 SD 엥呵겨 +FailedtosetUSB = 轟랬�擁� USB: +Failedformating = 목駕뺏呵겨 +filesnotfoundontheserver = 륩蛟포櫓轟늪匡숭! +filesleft = 假岱匡숭 +FlipX = 객숩방橙 +Force = 퓻齡 +Youneedtoformatapartition = 극伎목駕뺏寧몸롸혐 +Format = 목駕뺏 +Formattingpleasewait = 목駕뺏櫓, 헝�牘�... +formated = 供냥목駕뺏! +free = 假岱 +FreeSpace = 假岱왕쇌 +FullShutdown = 供홍밑샙 +GameID = 踏狗ID +Games = 踏狗 +Gameisalreadyinstalled = 綠갛陋법踏狗: +GameRegion = 혐堵 +GameSize = 踏狗휭좆 +GoBack = 럿쀼 +GotoPage = 품鞏女충 +HowtoShutdown = 흔부밑샙? +Language = 刀喇 +Langchange = 긴뫘刀喇 +Left = 璘 +LikeSysMenu = 谿溝固朞데 +LoadingincIOS = 鹿 cIOS249 潼흙 +Lock = 傑땍 +LockConsole = 傑땍왠齡憩 +MP3Menu = MP3 朞데 +Missingfiles = 홧�姆켑캬� +Networkiniterror = 貢쭹폘땡댄轎 +Neither = 홍꼇 +Next = 鞏빈 +No = 뤠 +Nofilemissing = 청唐홧�姆켑캬�! +NoHDDfound = 冷꼇돕袒턍! +NoSDcardinserted = 灌꿨흙 SD 엥! +Nopartitionsfound = 冷꼇돕롸혐 +NoUSBDevice = 청唐 USB �穩� +NoWBFSpartitionfound = 冷꼇돕 WBFS 롸혐 +NormalCovers = 寧겹룐충 +Normal = 寧겹 +NotaWiiDisc = 꼇角 Wii 돨밟턍 +NoUSBDevicefound = 冷꼇돕 USB �穩�. +Notenoughfreespace = 假岱왕쇌꼇璃! +notset = 灌�擁� +of = 돨 +OFF = 밑균 +OfficialSite = 바렘貢囹 +ok = 횅땍 +ON = 역폘 +Parentalcontrol = 소낀왠齡 +Partition = 롸혐 +Password = 쵱쯤 +PasswordChanged = 쵱쯤綠긴뫘 +Passwordhasbeenchanged = 쵱쯤綠굳긴뫘 +Passwordchange = 긴뫘쵱쯤 +PowerofftheWii = 밑균Wii寮샙 +Prev = 鞏품 +PromptsButtons = 鞫刻叫攣 +ReloadSD = 路劤潼흙SD엥 +RenameGameonWBFS = 맣긴WBFS(袒턍)�溝켤卦련惠� +Restart = 路劤폘땡 +Return = 럿쀼 +ReturntoWii = 럿쀼Wii溝固꽉데 +Right = 塘 +Rumble = 驢땡 +QuickBoot = 우醵폘땡 +Save = 괏닸 +SaveFailed = 괏닸呵겨 +Specialthanksto = 景깎먁剋 +For = 돨 +theUSBLoaderandreleasingthesourcecodethe = 렴놔覩덜쯤 +secondsleft = 假岱취鑒 +SelectthePartition = 朞嶝롸혐 +youwanttoformat = 角뤠목駕뺏 +settings = �阮� +ShutdowntoIdle = 쏵흙덤샙榴檄 +ShutdownSystem = 밑균溝固 +Success = 냥묘: +Successfullyinstalled = 냥묘돨갛陋: +Successfullydeleted = 냥묘돨�쓱�: +SuccessfullySaved = 괏닸냥묘 +SystemDefault = 溝固칵훰 +ThemePath = 寮痙닸렴쨌쓺 +ThemepathChanged = 寮痙쨌쓺綠긴뫘 +Themepathchange = 긴뫘寮痙닸렴쨌쓺 +Try = 끼桿 +Tooltips = 묏야瓊刻 +Timeleft = 假岱珂쇌: +Unlock = 썩傑 +Uninstall = �쓱� +USBLoaderisprotected = USB Loader GX 굳傑땍 +USBDevicenotfound = 冷꼇돕 USB �穩� +VideoMode = 柬틉齡駕 +VIDTVPatch = VIDTV 錦맣 +Volume = 稜좆 +Waiting = 된덤櫓... +WaitingforUSBDevice = 된덤 USB �穩� +WidescreenFix = 욱팁叫攣 +WiiMenu = Wii 溝固꽉데 +WrongPassword = 쵱쯤댄轎 +Yes = 角 +YoudonthavecIOS = 灌갛陋 cIOS222 +Japanese = 휑匡 +German = 돠匡 +English = 亶匡 +French = 랬匡 +Spanish = 鮫겯記匡 +Italian = 雷댕적匡 +Dutch = 뵐匡 +SChinese = 숌竟櫓匡 +TChinese = 런竟櫓匡 +Korean = 벴匡 +keyboard = 숩턍 +Unicodefix = Unicode 錦攣 +Filenotfound = 冷꼇돕匡숭 +Loadingstandardlanguage = 潼흙깃硫刀喇 +Titlestxtpath = Titles.txt 닸렴쨌쓺 +TitlestxtpathChanged = titles.txt 쨌쓺綠긴뫘 +Titlestxtpathchange = 긴뫘 titles.txt 닸렴쨌쓺 diff --git a/Languages/spanish b/Languages/spanish index 444fdb92..7a3e3671 100644 --- a/Languages/spanish +++ b/Languages/spanish @@ -1,179 +1,178 @@ -Specialthanksto = Muchas gracias a -t3Covers = Car�tulas 3D -AppLanguage = Idioma de la aplicaci�n -Areyousure = 풢st�s Seguro? -AutoPatch = Auto-Parcheo -Back = Atr�s -BacktoHBCorWiiMenu = Volver al HBC o Men� Wii -BacktoLoader = Volver al Cargador -BacktoWiiMenu = Volver al men� de wii -BootStandard = Inicio/Est�ndar -Both = Ambos -Cantcreatedirectory = No puedo crear el directorio -Cancel = Cancelar -Cantbeformated = No se puede formatear -Cantdelete = No se puede borrar: -ClicktoDownloadCovers = Click para descargar car�tulas -Clock = Reloj -Continueinstallgame = 풠ontinuo instalando el juego? -ConsoleDefault = Predeterm. consola -Consoleshouldbeunlockedtomodifyit = La consola deber�a estar desbloqueada -para modificarlo. -ConsoleLocked = Consola bloqueada -CorrectPassword = Contrase�a Correcta -Couldnotinitializenetwork = 좳o puedo iniciar la red! -CouldnotopenDisc = No se puede abrir el disco -CouldnotinitializeDIPmodule = 좳o se puede inicializar modulo DIP! -CoverDownload = Descarga de car�tulas -CoverPath = Ruta a Car�tulas -CoverpathChanged = Ruta a car�tulas cambiada -Coverpathchange = Cambiar ruta a car�tulas -Credits = Cr�ditos -DiscImages = Im�gen Discos -DiscimagePath = Ruta im�gen discos -DiscpathChanged = Ruta de discos cambiada -Discpathchange = Cambiar ruta a im�genes de disco -DiscDefault = Disco por defecto -Display = Pantalla -Doyouwanttoformat = 풯uieres formatear?: -Doyoureallywanttodelete = 풰ealmente quieres borrar?: -Doyouwanttoretryfor30secs = 풯uieres intentarlo otros 30 segundos? -Downloadingfile = Descargando fichero: -DownloadBoxartimage = 풡escargar imagen de caja? -Downloadfinished = Descarga finalizada -Error = 좪rror ! -BOOTERROR = 좪rror de arranque ! -ErrorreadingDisc = Error leyendo disco -ExitUSBISOLoader = Salir del USB Loader GX? -InitializingNetwork = Inicializando red -InsertDisk = Introduzca el disco -InsertaWiiDisc = 좵onga un disco de wii! -InsertaSDCardtodownloadimages = Introduzca una tarjeta SD para descargar im�genes. -InsertaSDCardtosave = Introduzca una tarjeta SD para guardar. -InstallRenameandDeleteareunlocked = Todas las opciones de USB Loader GX desbloqueadas. -Installerror = 좪rror de instalaci�n! -Installagame = Instalar un juego -Installinggame = Instalando juego: -Failedtoboot = Fallo en el inicio: -FailedtomountfrontSDcard = Fallo al montar la tarjeta SD -FailedtosetUSB = Fallo al usar el USB: -Failedformating = Fallo al dar formato -filesnotfoundontheserver = � Fichero(s) no encontrado(s) en el servidor ! -filesleft = Ficheros(s) restante(s) -FlipX = Desplazamiento X -Force = Forzar -Youneedtoformatapartition = Necesitas formatear una partici�n -Format = Formatear -Formattingpleasewait = Dando formato. por favor, espere... -formated = 좫ormateado ! -free = Libre -FreeSpace = Espacio libre -FullShutdown = Apagado total -GameID = ID de juego -Games = Juegos -Gameisalreadyinstalled = El Juego ya estaba instalado: -GameRegion = Regi�n -GameSize = Tama�o del juego -GoBack = Volver -//GotoPage = Ir a p�gina -HowtoShutdown = 풠�mo apago? -Language = Idioma -Langchange = Cambio de idioma -Left = Izquierda -LikeSysMenu = C�mo men� de sistema -LoadingincIOS = Cargando en cIOS249 -Lock = Bloqueo -LockConsole = Bloquear consola -MP3Menu = Menu MP3 -Missingfiles = Fichero(s) no encontrado(s) -Networkiniterror = Error de inicio de red -Neither = Ninguno -Next = Siguiente -No = No -Nofilemissing = 좳o faltan ficheros! -NoHDDfound = 좳o encuentro HD! -NoSDcardinserted = 좳o hay insertada tarjeta SD! -Nopartitionsfound = 좳o encuentro partici�nes! -NoUSBDevice = No hay dispositivo USB -NoWBFSpartitionfound = No encuentro partici�n WBFS -NormalCovers = Car�tulas normales -Normal = Normal -NotaWiiDisc = No es un disco de wii -NoUSBDevicefound = No encuentro dispositivo USB. -Notenoughfreespace = 좳o hay suficiente espacio libre! -notset = Sin poner -of = de -OFF = Apagado -OfficialSite = Sitio Oficial -ok = OK -ON = Encendido -Parentalcontrol = Control Parental -Partition = Partici�n -Password = Contrase�a -PasswordChanged = Contrase�a Cambiada -Passwordhasbeenchanged = La contrase�a se ha cambiado -Passwordchange = Cambio de contrase�a -PowerofftheWii = Apague la Wii -Prev = Anterior -PromptsButtons = Botones de consulta -ReloadSD = Recargar SD -RenameGameonWBFS = Renombrar juego en WBFS -Restart = Reiniciar -Return = Volver -ReturntoWii = Volver al men� de Wii -Right = Derecha -Rumble = Vibraci�n -QuickBoot = Inicio r�pido -Save = Guardar -SaveFailed = Fallo al guardar -Specialthanksto = Muchas gracias a -For = por -theUSBLoaderandreleasingthesourcecodethe = y liberar el c�digo fuente -secondsleft = Segundos que faltan -SelectthePartition = Selecciona la partici�n -youwanttoformat = Quieres formatear -settings = Ajustes -ShutdowntoIdle = Apagar a Stand-By -ShutdownSystem = Sistema de apagado -Success = Conseguido: -Successfullyinstalled = Instalado con exito: -Successfullydeleted = Borrado con exito: -SuccessfullySaved = Guardado -SystemDefault = Predeterm. consola -ThemePath = Ruta a Temas -ThemepathChanged = Ruta a temas cambiada -Themepathchange = Cambio de ruta a temas -Try = Intentar -Tooltips = Herramientas -Timeleft = Tiempo pendiente: -Unlock = Desbloqueo -Uninstall = Desinstalar -USBLoaderisprotected = USB Loader GX est� protegido -USBDevicenotfound = Dispositivo USB no encontrado -VideoMode = Modo de video -VIDTVPatch = Parcheo VIDTV -Volume = Volumen -Waiting = Esperando... -WaitingforUSBDevice = Esperando al dispositivo USB -WidescreenFix = Ajuste panor�mico -WiiMenu = Men� Wii -WrongPassword = Contrase�a err�nea -Yes = Si -YoudonthavecIOS = No tienes cIOS 222 -Japanese = Japon�s -German = Alem�n -English = Ingl�s -French = Franc�s -Spanish = Espa�ol -Italian = Italiano -Dutch = Holand�s -SChinese = Chino Simplificado -TChinese = Chino Tradicional -Korean = Coreano -keyboard = Teclado -Unicodefix = P�rche Unicode -Filenotfound = Fichero no encontrado. -Loadingstandardlanguage = Cargando idioma predeterminado. -Titlestxtpath = Ruta a Titles.txt -TitlestxtpathChanged = Ruta a titles.txt cambiada. -Titlestxtpathchange = Cambiar ruta a titles.txt + Specialthanksto = Agradecimientos + t3Covers = Car�tulas 3D + AppLanguage = Idioma Aplic. + Areyousure = 풢st�s seguro? + AutoPatch = AutoParchar + Back = Volver + BacktoHBCorWiiMenu = Volver a HBC o Men� Wii + BacktoLoader = Volver al HBC + BacktoWiiMenu = Volver a Men� Wii + BootStandard = Inicio/Estandar + Both = Ambos + Cantcreatedirectory = No se cre� directorio + Cancel = Cancelar + Cantbeformated = No se pudo formatear + Cantdelete = No se elimin�: + ClicktoDownloadCovers = Click para bajar Car�tulas + Clock = Reloj + Continueinstallgame = 풠ontinuar instalando juego? + ConsoleDefault = Pred. Consola + Consoleshouldbeunlockedtomodifyit = Consola debe desbloquearse para modificarla. + ConsoleLocked = Consola Bloqueada + CorrectPassword = Contrase�a Correcta + Couldnotinitializenetwork = 좳o se pudo iniciar la Conexi�n! + CouldnotopenDisc = No se pudo abrir Disco + CouldnotinitializeDIPmodule = 좳o se pudo iniciar m�dulo DIP! + CoverDownload = Descarga de Car�tulas + CoverPath = Ruta Car�tulas + CoverpathChanged = Ruta de Car�tulas cambiada + Coverpathchange = Cambio ruta Car�tulas + Credits = Cr�ditos + DiscImages = Img. de Disco + DiscimagePath = Ruta Img. Disco + DiscpathChanged = Ruta Img. Disco cambiada + Discpathchange = Cambio ruta Img. Disco + DiscDefault = Pred. Disco + Display = Mostrar + Doyouwanttoformat = Quieres formatear: + Doyoureallywanttodelete = Realmente quieres eliminar: + Doyouwanttoretryfor30secs = 풯ui�res reintentar por 30 segs.? + Downloadingfile = Descargando archivo: + DownloadBoxartimage = 풡escargar Im�genes? + Downloadfinished = Descarga completa + Error = 좪rror! + BOOTERROR = ERROR DE INICIO + ErrorreadingDisc = Error leyendo Disco + ExitUSBISOLoader = 풱alir de USB Loader GX? + InitializingNetwork = Iniciando Conexi�n + InsertDisk = Inserta el Disco + InsertaWiiDisc = 좮nserta un Disco Wii! + InsertaSDCardtodownloadimages = Insertar SD para bajar im�genes. + InsertaSDCardtosave = Insertar SD para guardar. + InstallRenameandDeleteareunlocked = Todas las caracteristicas del USB Loader GX desbloqueadas. + Installerror = 좪rror de Instalaci�n! + Installagame = Instalar un juego + Installinggame = Instalando juego: + Failedtoboot = Fallo al iniciar: + FailedtomountfrontSDcard = Fallo al montar SD + FailedtosetUSB = Fallo al iniciar USB: + Failedformating = Fallo al formatear + Filenotfound = Archivo no encontrado. + filesnotfoundontheserver = archivos no encontrados en el servidor! + filesleft = archivo(s) restante(s) + FlipX = Flip-X + Force = Forzar + Youneedtoformatapartition = Necesitas formatear una partici�n + Format = Formateo + Formattingpleasewait = Formateando, por favor espera... + formated = formateado! + free = libres + FreeSpace = Espacio Libre + FullShutdown = Apagado Total + GameID = ID de Juego + Games = Juegos + Gameisalreadyinstalled = Juego ya estaba instalado: + GameRegion = Regi�n + GameSize = Tama�o del Juego + GoBack = Volver + //GotoPage = Ir a P�gina + HowtoShutdown = 풠�mo Apagar? + Keyboard = Teclado + Language = Idioma + Langchange = Cambio de Idioma + Left = Izquierda + LikeSysMenu = Como Men� Sist. + LoadingincIOS = Cargando en cIOS249 + Loadingstandardlanguage = Cargando idioma estandar. + Lock = Bloquear + LockConsole = Bloquear consola + MP3Menu = Men� MP3 + Missingfiles = Archivo(s) faltante(s) + Networkiniterror = Error inicio conexi�n + Neither = Ninguno + Next = Siguiente + No = No + Nofilemissing = 좳o hay archivo(s) faltante(s)! + NoHDDfound = 좭DD no encontrado! + NoSDcardinserted = 좸D no insertada! + Nopartitionsfound = Particiones no encontradas + NoUSBDevice = USB no encontrado + NoWBFSpartitionfound = Partici�n WBFS no encontrada + NormalCovers = Car�tulas Norm. + Normal = Normal + NotaWiiDisc = No es un Disco Wii + NoUSBDevicefound = USB no encontrado. + Notenoughfreespace = 좳o hay suficiente espacio libre! + notset = no puesto + of = de + OFF = Apagado + OfficialSite = Sitio Oficial + ok = OK + ON = Encendido + Parentalcontrol = Control Parental + Partition = Partici�n + Password = Contrase�a + PasswordChanged = Contrase�a cambiada + Passwordhasbeenchanged = Contrase�a ha sido cambiada + Passwordchange = Cambio Contrase�a + PowerofftheWii = Apagar la Wii + Prev = Ant. + PromptsButtons = Botones + ReloadSD = Recargar SD + RenameGameonWBFS = Renombrar juego en WBFS + Restart = Reiniciar + Return = Volver + ReturntoWii = Volver a Men� Wii + Right = Derecha + Rumble = Vibraci�n + QuickBoot = Inicio R�pido + Save = Guardar + SaveFailed = Guardado fallido + Specialthanksto = Agradecimientos + Titlestxtpath = Ruta Titles.txt + TitlestxtpathChanged = Ruta a titles.txt cambiada. + Titlestxtpathchange = Cambio ruta titles.txt + For = por + theUSBLoaderandreleasingthesourcecodethe = y liberar el c�digo fuente + secondsleft = segundos restantes + SelectthePartition = Selecciona la partici�n + youwanttoformat = quieres formatear + settings = Configuraci�n + ShutdowntoIdle = Apagar a Idle + ShutdownSystem = Apagar Sistema + Success = Exito: + Successfullyinstalled = Instalado exit�samente: + Successfullydeleted = Borrado exit�samente: + SuccessfullySaved = Guardado exit�samente + SystemDefault = Pred. Sistema + ThemePath = Ruta del Tema + ThemepathChanged = Ruta de Tema cambiada + Themepathchange = Cambio Ruta de Tema + Try = Intentar + Tooltips = InfoBurbujas + Timeleft = T. restante: + Unlock = Desbloquear + Unicodefix = Arreg. Unicode + Uninstall = Desinstalar + USBLoaderisprotected = USB Loader GX est� protegido + USBDevicenotfound = USB no encontrado + VideoMode = Modo Video + VIDTVPatch = Parche VIDTV + Volume = Volumen + Waiting = Esperando... + WaitingforUSBDevice = Esperando por Dispositivo USB + WidescreenFix = Arreg. Widescreen + WiiMenu = Men� de Wii + WrongPassword = Contrase�a incorrecta + Yes = Si + YoudonthavecIOS = No tienes un cIOS222 + Japanese = Japon�s + German = Alem�n + English = Ingl�s + French = Franc�s + Spanish = Espa�ol + Italian = Italiano + Dutch = Holand�s + SChinese = Chino Simplif. + TChinese = Chino Tradic. + Korean = Coreano diff --git a/Languages/tchinese b/Languages/tchinese index 940db5ab..473fb761 100644 --- a/Languages/tchinese +++ b/Languages/tchinese @@ -8,15 +8,15 @@ BacktoHBCorWiiMenu = BacktoLoader = ゐ�^ Loader BacktoWiiMenu = ゐ�^ Wii 쮝꽝울녔 BootStandard = 귑걺/셸렷 -BothBoth = ��끝 +Both = ��끝톈�� Cantcreatedirectory = 킠챞깼ΝΩ웡 Cancel = ¾�� Cantbeformated = 킠챞�礖·� Cantdelete = 킠챞쬟간: -ClicktoDownloadCovers = 헕을짾뫘ナ�� +ClicktoDownloadCovers = 헕을턨�輿架광U뫘 Clock = ��컨 Continueinstallgame = �~쿱쫤맷툮으? -ConsoleDefault = 굇⑧쪃퉥�] +ConsoleDefault = 쩊업퉥�]�� Consoleshouldbeunlockedtomodifyit = 쁨먈쯔쩑�}귑�]쯹�\��. ConsoleLocked = 굇⑧쪃쯔쯹 CorrectPassword = 켎폵�옙T @@ -65,17 +65,18 @@ Youneedtoformatapartition = Format = �礖·� Formattingpleasewait = �礖·튄�, 싻탙��... formated = ㏏┬�礖·�! -free = 넘푡 +free = FreeSpace = 넘푡づ땀 FullShutdown = ㏏��츙업 GameID = 툮으쩘폵 -Games = 툮으 +Games = 툮으셕턲 Gameisalreadyinstalled = 쨢쫤맷툹툮으: -GameRegion = 겅곗 +GameRegion = 툮으겅폵 GameSize = 툮으췦턲 GoBack = ゐ�^ -GotoPage = 첿㈈�땟� +//GotoPage = 첿㈈�땟� HowtoShutdown = 쫜�纂淄�? +Keyboard = 쥑폥 Language = 퍈�� Langchange = 텝�齪y�� Left = ⅹ @@ -86,9 +87,9 @@ LockConsole = MP3Menu = MP3 울녔 Missingfiles = 움ⅱず읠�� Networkiniterror = 빌몰귑걺월�~ -Neither = б�_ +Neither = бㄳ톈�� Next = ㈈メ -No = �_ +No = �_ Nofilemissing = 쮁┳�價列봉���! NoHDDfound = ㏛ㄳ⑥탗분! NoSDcardinserted = �섦·J SD 쩮! @@ -101,7 +102,7 @@ NotaWiiDisc = NoUSBDevicefound = ㏛ㄳ⑥ USB 맷퇹. Notenoughfreespace = 넘푡づ땀ㄳº! notset = �설]쯹 -of = ず +of = 넘푡づ땀 �`췦턲 OFF = 츙낚 OfficialSite = 쯺ㅸ빌�} ok = 폯쯹 @@ -138,7 +139,7 @@ Success = Successfullyinstalled = ┬�\ず쫤맷: Successfullydeleted = ┬�\ず쬟간: SuccessfullySaved = 픵쫟┬�\ -SystemDefault = 쮝꽝퉥�] +SystemDefault = 쮝꽝퉥�]�� ThemePath = 쵪뉴쩊홁 ThemepathChanged = 쵪뉴쩊홁몰�|쨢텝�� Themepathchange = 텝�次I뉴쩊홁몰�| @@ -169,7 +170,6 @@ Dutch = SChinese = 짼톱ㄴㅵ TChinese = 햎톱ㄴㅵ Korean = 질ㅵ -keyboard = 쥑폥 Unicodefix = Unicode �婁� Filenotfound = ㏛ㄳ⑥읠�� Loadingstandardlanguage = 뫘짫셸렷퍈�� diff --git a/gui.pnproj b/gui.pnproj index b6996f1d..6e78162b 100644 --- a/gui.pnproj +++ b/gui.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/cfg.c b/source/cfg.c index f545ff3d..1784181a 100644 --- a/source/cfg.c +++ b/source/cfg.c @@ -234,6 +234,8 @@ void CFG_Default(int widescreen) // -1 = non forced Mode snprintf(CFG.titlestxt_path, sizeof(CFG.titlestxt_path), "SD:/config/");//default path for disc images snprintf(CFG.unlockCode, sizeof(CFG.unlockCode), "ab121b"); // default password snprintf(CFG.language_path, sizeof(CFG.language_path), "SD:/config/language/"); + snprintf(CFG.oggload_path, sizeof(CFG.oggload_path), "SD:/config/backgroundmusic/"); + sprintf(CFG.ogg_path, "notset"); CFG.parentalcontrol = 0; CFG.maxcharacters = 38; @@ -483,6 +485,14 @@ void cfg_set(char *name, char *val) strcopy(CFG.language_path, val, sizeof(CFG.language_path)); return; } + if (strcmp(name, "oggload_path") == 0) { + strcopy(CFG.oggload_path, val, sizeof(CFG.oggload_path)); + return; + } + if (strcmp(name, "ogg_path") == 0) { + strcopy(CFG.ogg_path, val, sizeof(CFG.ogg_path)); + return; + } cfg_int("parentalcontrol", &CFG.parentalcontrol, 4); cfg_bool("godmode", &CFG.godmode); @@ -1017,12 +1027,14 @@ bool cfg_save_global()// save global settings } fprintf(f, "disc_path = %s\n ", CFG.disc_path); fprintf(f, "language_path = %s\n ", CFG.language_path); + fprintf(f, "oggload_path = %s\n ", CFG.oggload_path); fprintf(f, "titlestxt_path = %s\n ", CFG.titlestxt_path); if(!strcmp("", Settings.unlockCode)) { fprintf(f, "godmode = %d\n ", CFG.godmode); } else { fprintf(f, "godmode = %d\n ", 0); } + fprintf(f, "ogg_path = %s\n ", CFG.ogg_path); fclose(f); return true; } diff --git a/source/cfg.h b/source/cfg.h index 93a91314..473f6f18 100644 --- a/source/cfg.h +++ b/source/cfg.h @@ -70,6 +70,8 @@ struct CFG char disc_path[100]; char titlestxt_path[100]; char language_path[100]; + char oggload_path[100]; + char ogg_path[150]; short keyset; }; diff --git a/source/fatmounter.c b/source/fatmounter.c index f39a821e..a925b7af 100644 --- a/source/fatmounter.c +++ b/source/fatmounter.c @@ -42,7 +42,7 @@ int SDCard_Init() if (!isSdInserted()){ return -1; } - if (fatMount("SD", &__io_wiisd, 0, CACHE, SECTORS)) { + if (fatMountSimple("SD", &__io_wiisd)) { return 1; } return -1; diff --git a/source/language.c b/source/language.c index 73f241fa..1feee152 100644 --- a/source/language.c +++ b/source/language.c @@ -35,6 +35,8 @@ snprintf(LANGUAGE.t3Covers, sizeof(LANGUAGE.t3Covers), "3D Covers"); snprintf(LANGUAGE.Areyousure, sizeof(LANGUAGE.Areyousure), "Are you sure?"); snprintf(LANGUAGE.AutoPatch, sizeof(LANGUAGE.AutoPatch), "AutoPatch"); snprintf(LANGUAGE.Back, sizeof(LANGUAGE.Back), "Back"); +snprintf(LANGUAGE.Backgroundmusic, sizeof(LANGUAGE.Backgroundmusic), "Backgroundmusic"); +snprintf(LANGUAGE.Backgroundmusicpath, sizeof(LANGUAGE.Backgroundmusicpath), "Backgroundmusic Path changed."); snprintf(LANGUAGE.BacktoHBCorWiiMenu, sizeof(LANGUAGE.BacktoHBCorWiiMenu), "Back to HBC or Wii Menu"); snprintf(LANGUAGE.BacktoLoader, sizeof(LANGUAGE.BacktoLoader), "Back to Loader"); snprintf(LANGUAGE.BacktoWiiMenu, sizeof(LANGUAGE.BacktoWiiMenu), "Back to Wii Menu"); @@ -107,13 +109,13 @@ snprintf(LANGUAGE.Gameisalreadyinstalled, sizeof(LANGUAGE.Gameisalreadyinstalled snprintf(LANGUAGE.GameRegion, sizeof(LANGUAGE.GameRegion), "Game Region"); snprintf(LANGUAGE.GameSize, sizeof(LANGUAGE.GameSize), "Game Size"); snprintf(LANGUAGE.GoBack, sizeof(LANGUAGE.GoBack), "Go Back"); -//snprintf(LANGUAGE.GotoPage, sizeof(LANGUAGE.GotoPage), "Go to Page"); snprintf(LANGUAGE.HowtoShutdown, sizeof(LANGUAGE.HowtoShutdown), "How to Shutdown?"); snprintf(LANGUAGE.Language, sizeof(LANGUAGE.Language), "Game Language"); snprintf(LANGUAGE.Left, sizeof(LANGUAGE.Left), "Left"); snprintf(LANGUAGE.LikeSysMenu, sizeof(LANGUAGE.LikeSysMenu), "Like SysMenu"); snprintf(LANGUAGE.LoadingincIOS, sizeof(LANGUAGE.LoadingincIOS), "Loading in cIOS249"); snprintf(LANGUAGE.Loadingstandardlanguage, sizeof(LANGUAGE.Loadingstandardlanguage), "Loading standard language."); +snprintf(LANGUAGE.Loadingstandardmusic, sizeof(LANGUAGE.Loadingstandardmusic), "Loading standard music."); snprintf(LANGUAGE.Lock, sizeof(LANGUAGE.Lock), "Lock"); snprintf(LANGUAGE.LockConsole, sizeof(LANGUAGE.LockConsole), "Lock Console"); snprintf(LANGUAGE.MP3Menu, sizeof(LANGUAGE.MP3Menu), "MP3 Menu"); @@ -133,6 +135,7 @@ snprintf(LANGUAGE.Normal, sizeof(LANGUAGE.Normal), "Normal"); snprintf(LANGUAGE.NotaWiiDisc, sizeof(LANGUAGE.NotaWiiDisc), "Not a Wii Disc"); snprintf(LANGUAGE.NoUSBDevicefound, sizeof(LANGUAGE.NoUSBDevicefound), "No USB Device found."); snprintf(LANGUAGE.Notenoughfreespace, sizeof(LANGUAGE.Notenoughfreespace), "Not enough free space!"); +snprintf(LANGUAGE.Notasupportedformat, sizeof(LANGUAGE.Notasupportedformat), "Not supported format!"); snprintf(LANGUAGE.notset, sizeof(LANGUAGE.notset), "not set"); snprintf(LANGUAGE.of, sizeof(LANGUAGE.of), "of"); snprintf(LANGUAGE.OFF, sizeof(LANGUAGE.OFF), "OFF"); @@ -161,9 +164,11 @@ snprintf(LANGUAGE.Specialthanksto, sizeof(LANGUAGE.Specialthanksto), "Special th snprintf(LANGUAGE.For, sizeof(LANGUAGE.For), "for"); snprintf(LANGUAGE.theUSBLoaderandreleasingthesourcecode, sizeof(LANGUAGE.theUSBLoaderandreleasingthesourcecode), "and releasing the source code"); snprintf(LANGUAGE.secondsleft, sizeof(LANGUAGE.secondsleft), "seconds left"); +snprintf(LANGUAGE.Setasbackgroundmusic, sizeof(LANGUAGE.Setasbackgroundmusic), "Set as backgroundmusic?"); snprintf(LANGUAGE.SelectthePartition, sizeof(LANGUAGE.SelectthePartition), "Select the Partition"); snprintf(LANGUAGE.Specialthanksto, sizeof(LANGUAGE.Specialthanksto), "Special thanks to"); snprintf(LANGUAGE.youwanttoformat, sizeof(LANGUAGE.youwanttoformat), "you want to format"); +snprintf(LANGUAGE.Standard, sizeof(LANGUAGE.Standard), "Standard"); snprintf(LANGUAGE.settings, sizeof(LANGUAGE.settings), "Settings"); snprintf(LANGUAGE.ShutdowntoIdle, sizeof(LANGUAGE.ShutdowntoIdle), "Shutdown to Idle"); snprintf(LANGUAGE.ShutdownSystem, sizeof(LANGUAGE.ShutdownSystem), "Shutdown System"); @@ -244,6 +249,14 @@ void language_set(char *name, char *val) strcopy(LANGUAGE.Back, val, sizeof(LANGUAGE.Back)); return; } + if (strcmp(name, "Backgroundmusic") == 0) { + strcopy(LANGUAGE.Backgroundmusic, val, sizeof(LANGUAGE.Backgroundmusic)); + return; + } + if (strcmp(name, "Backgroundmusicpath") == 0) { + strcopy(LANGUAGE.Backgroundmusicpath, val, sizeof(LANGUAGE.Backgroundmusicpath)); + return; + } if (strcmp(name, "BacktoHBCorWiiMenu") == 0) { strcopy(LANGUAGE.BacktoHBCorWiiMenu, val, sizeof(LANGUAGE.BacktoHBCorWiiMenu)); return; @@ -569,6 +582,10 @@ void language_set(char *name, char *val) strcopy(LANGUAGE.Loadingstandardlanguage, val, sizeof(LANGUAGE.Loadingstandardlanguage)); return; } + if (strcmp(name, "Loadingstandardmusic") == 0) { + strcopy(LANGUAGE.Loadingstandardmusic, val, sizeof(LANGUAGE.Loadingstandardmusic)); + return; + } if (strcmp(name, "Lock") == 0) { strcopy(LANGUAGE.Lock, val, sizeof(LANGUAGE.Lock)); return; @@ -645,6 +662,10 @@ void language_set(char *name, char *val) strcopy(LANGUAGE.Notenoughfreespace, val, sizeof(LANGUAGE.Notenoughfreespace)); return; } + if (strcmp(name, "Notasupportedformat") == 0) { + strcopy(LANGUAGE.Notasupportedformat, val, sizeof(LANGUAGE.Notasupportedformat)); + return; + } if (strcmp(name, "notset") == 0) { strcopy(LANGUAGE.notset, val, sizeof(LANGUAGE.notset)); return; @@ -765,6 +786,10 @@ void language_set(char *name, char *val) strcopy(LANGUAGE.settings, val, sizeof(LANGUAGE.settings)); return; } + if (strcmp(name, "Setasbackgroundmusic") == 0) { + strcopy(LANGUAGE.Setasbackgroundmusic, val, sizeof(LANGUAGE.Setasbackgroundmusic)); + return; + } if (strcmp(name, "ShutdowntoIdle") == 0) { strcopy(LANGUAGE.ShutdowntoIdle, val, sizeof(LANGUAGE.ShutdowntoIdle)); return; @@ -773,6 +798,10 @@ void language_set(char *name, char *val) strcopy(LANGUAGE.ShutdownSystem, val, sizeof(LANGUAGE.ShutdownSystem)); return; } + if (strcmp(name, "Standard") == 0) { + strcopy(LANGUAGE.Standard, val, sizeof(LANGUAGE.Standard)); + return; + } if (strcmp(name, "Success") == 0) { strcopy(LANGUAGE.Success, val, sizeof(LANGUAGE.Success)); return; diff --git a/source/language.h b/source/language.h index baef1590..0636ad72 100644 --- a/source/language.h +++ b/source/language.h @@ -17,6 +17,8 @@ struct LANGUAGE char Areyousure[50]; char AutoPatch[20]; char Back[20]; + char Backgroundmusic[80]; + char Backgroundmusicpath[100]; char BacktoHBCorWiiMenu[50]; char BacktoLoader[50]; char BacktoWiiMenu[50]; @@ -97,6 +99,7 @@ struct LANGUAGE char LikeSysMenu[50]; char LoadingincIOS[50]; char Loadingstandardlanguage[80]; + char Loadingstandardmusic[80]; char Lock[30]; char LockConsole[50]; char MP3Menu[40]; @@ -116,6 +119,7 @@ struct LANGUAGE char NotaWiiDisc[40]; char NoUSBDevicefound[50]; char Notenoughfreespace[50]; + char Notasupportedformat[100]; char notset[40]; char of[30]; char OFF[30]; @@ -148,6 +152,8 @@ struct LANGUAGE char SelectthePartition[50]; char youwanttoformat[50]; char settings[50]; + char Setasbackgroundmusic[90]; + char Standard[30]; char ShutdowntoIdle[50]; char ShutdownSystem[50]; char Success[30]; diff --git a/source/libwiigui/gui.h b/source/libwiigui/gui.h index 9355512e..48a2fe5c 100644 --- a/source/libwiigui/gui.h +++ b/source/libwiigui/gui.h @@ -131,6 +131,8 @@ class GuiSound ~GuiSound(); //!Start sound playback void Play(); + //!Start sound playback from ogg file + int PlayOggFile(char * path); //!Stop sound playback void Stop(); //!Pause sound playback @@ -146,6 +148,11 @@ class GuiSound //!Set the sound to loop playback (only applies to OGG) //!\param l Loop (true to loop) void SetLoop(bool l); + //!Get the playing time in ms for that moment (only applies to OGG) + s32 GetPlayTime(); + //!Set the starting point or playtime for skipping (only applies to OGG) + //!\param time in ms + void SetPlayTime(s32 time); protected: const u8 * sound; //!< Pointer to the sound data int type; //!< Sound format type (SOUND_PCM or SOUND_OGG) diff --git a/source/libwiigui/gui_sound.cpp b/source/libwiigui/gui_sound.cpp index 3db3bf8c..e37fddb6 100644 --- a/source/libwiigui/gui_sound.cpp +++ b/source/libwiigui/gui_sound.cpp @@ -42,6 +42,38 @@ GuiSound::~GuiSound() StopOgg(); } +int GuiSound::PlayOggFile(char * path) +{ /* + u32 filesize = 0; + char * bufferogg = NULL; + size_t resultogg; + + FILE * pFile; + pFile = fopen (path, "rb"); + + // get file size: + fseek (pFile , 0 , SEEK_END); + filesize = ftell (pFile); + rewind (pFile); + + // allocate memory to contain the whole file: + bufferogg = (char*) malloc (sizeof(char)*filesize); + if (bufferogg == NULL) {fputs (" Memory error",stderr); exit (2);} + + // copy the file into the buffer: + resultogg = fread (bufferogg,1,filesize,pFile); + if (resultogg != filesize) {fputs (" Reading error",stderr); exit (3);} + + fclose (pFile); + + sound = (const u8 *) bufferogg; + length = filesize; + */ + int ret = PlayOggFromFile(path, loop); + SetVolumeOgg(255*(volume/100.0)); + return ret; +} + void GuiSound::Play() { int vol; @@ -57,7 +89,7 @@ void GuiSound::Play() break; case SOUND_OGG: - voice = 0; + voice = ASND_GetFirstUnusedVoice(); if(loop) PlayOgg(mem_open((char *)sound, length), 0, OGG_INFINITE_TIME); else @@ -151,3 +183,13 @@ void GuiSound::SetLoop(bool l) { loop = l; } + +s32 GuiSound::GetPlayTime() +{ + return GetTimeOgg(); +} + +void GuiSound::SetPlayTime(s32 time_pos) +{ + SetTimeOgg(time_pos); +} diff --git a/source/menu.cpp b/source/menu.cpp index c11613d4..0feaaa65 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -63,7 +63,6 @@ static GuiText sizeTxt(sizeshow, 26, (GXColor){THEME.prompttxt_r, THEME.prompttx static GuiText *GameIDTxt = NULL; static GuiText *GameRegionTxt = NULL; static GuiSound * bgMusic = NULL; -static GuiSound * creditsMusic = NULL; static wbfs_t *hdd = NULL; static u32 gameCnt = 0; static s32 gameSelected = 0, gameStart = 0; @@ -170,12 +169,14 @@ HaltGui() static void WindowCredits(void * ptr) { int angle = 0; + GuiSound * creditsMusic = NULL; if(btnLogo->GetState() != STATE_CLICKED) { return; } + s32 thetimeofbg = bgMusic->GetPlayTime(); + StopOgg(); - bgMusic->Stop(); creditsMusic = new GuiSound(credits_music_ogg, credits_music_ogg_size, SOUND_OGG, 55); creditsMusic->SetVolume(55); creditsMusic->SetLoop(1); @@ -374,8 +375,14 @@ static void WindowCredits(void * ptr) delete txt[i]; delete creditsMusic; - bgMusic->SetLoop(1); - bgMusic->Play(); + + if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) { + bgMusic->Play(); + } else { + bgMusic->PlayOggFile(CFG.ogg_path); + } + bgMusic->SetPlayTime(thetimeofbg); + SetVolumeOgg(255*(vol/100.0)); } /**************************************************************************** @@ -758,7 +765,7 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label, closeBtn.SetLabel(&btn1Txt); closeBtn.SetRumble(false); closeBtn.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50); - + GuiImage btn1Img(&top); GuiImage btn1OverImg(&topOver); GuiButton btn1(top.GetWidth(), top.GetHeight()); @@ -817,7 +824,7 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label, btn2Txt.SetFontSize(22); btn3Txt.SetFontSize(22); - + GuiImage wiimoteImg(&wiimote); if (Settings.wsprompt == yes){wiimoteImg.SetWidescreen(CFG.widescreen);} wiimoteImg.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); @@ -982,7 +989,7 @@ int GameWindowPrompt() char imgPath[100]; snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path); GuiImageData btnOutline(imgPath, button_dialogue_box_png); - + snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_left.png", CFG.theme_path); GuiImageData imgLeft(imgPath, startgame_arrow_left_png); snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_right.png", CFG.theme_path); @@ -1795,7 +1802,7 @@ ProgressWindow(const char *title, const char *msg) snprintf(imgPath, sizeof(imgPath), "%sprogressbar_outline.png", CFG.theme_path); GuiImageData progressbarOutline(imgPath, progressbar_outline_png); - + //GuiImageData progressbarOutline(progressbar_outline_png); GuiImage progressbarOutlineImg(&progressbarOutline); if (Settings.wsprompt == yes){ @@ -2993,10 +3000,17 @@ static int MenuDiscList() } else if(homeBtn.GetState() == STATE_CLICKED) { + s32 thetimeofbg = bgMusic->GetPlayTime(); bgMusic->Stop(); choice = WindowExitPrompt(LANGUAGE.ExitUSBISOLoader,0, LANGUAGE.BacktoLoader,LANGUAGE.WiiMenu,LANGUAGE.Back,0); - bgMusic->SetLoop(1); - bgMusic->Play(); + if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) { + bgMusic->Play(); + } else { + bgMusic->PlayOggFile(CFG.ogg_path); + } + bgMusic->SetPlayTime(thetimeofbg); + SetVolumeOgg(255*(vol/100.0)); + if(choice == 3) { SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); // Back to System Menu @@ -3985,11 +3999,11 @@ static int MenuSettings() sprintf(options2.name[1], "%s",LANGUAGE.AppLanguage); sprintf(options2.name[2], "%s",LANGUAGE.keyboard); sprintf(options2.name[3], "%s",LANGUAGE.Unicodefix); - sprintf(options2.name[4], "%s",LANGUAGE.MP3Menu); - sprintf(options2.name[5], "Under"); - sprintf(options2.name[6], "Construction"); + sprintf(options2.name[4], "%s",LANGUAGE.Backgroundmusic); + sprintf(options2.name[5], " "); + sprintf(options2.name[6], " "); sprintf(options2.name[7], " "); - sprintf(options2.name[8], " "); + sprintf(options2.name[8], "%s",LANGUAGE.MP3Menu); @@ -4399,12 +4413,12 @@ static int MenuSettings() if (strlen(CFG.language_path) < (9 + 3)) { sprintf(cfgtext, "%s", CFG.language_path); - } else { + } else { strncpy(cfgtext, CFG.language_path, 9); cfgtext[9] = '\0'; strncat(cfgtext, "...", 3); - } - sprintf(options2.value[1], "%s", cfgtext); + } + sprintf(options2.value[1], "%s", cfgtext); if (Settings.keyset == us) sprintf (options2.value[2],"QWERTY"); @@ -4415,11 +4429,23 @@ static int MenuSettings() else if (Settings.unicodefix == 1) sprintf (options2.value[3],"%s",LANGUAGE.TChinese); else if (Settings.unicodefix == 2) sprintf (options2.value[3],"%s",LANGUAGE.SChinese); - sprintf(options2.value[4], " "); + if(!strcmp("notset", CFG.ogg_path) || !strcmp("",CFG.oggload_path)) { + sprintf(options2.value[4], "%s", LANGUAGE.Standard); + } else { + if (strlen(CFG.ogg_path) < (9 + 3)) { + sprintf(cfgtext, "%s", CFG.ogg_path); + } else { + strncpy(cfgtext, CFG.ogg_path, 9); + cfgtext[9] = '\0'; + strncat(cfgtext, "...", 3); + } + sprintf(options2.value[4], "%s", cfgtext); + } + sprintf(options2.value[5], " "); sprintf(options2.value[6], " "); sprintf(options2.value[7], " "); - sprintf(options2.value[8], " "); + sprintf(options2.value[8], "not working!"); ret = optionBrowser2.GetClickedOption(); @@ -4511,6 +4537,10 @@ static int MenuSettings() Settings.unicodefix++; break; case 4: + menu = MENU_OGG; + pageToDisplay = 0; + break; + case 8: menu = MENU_MP3; pageToDisplay = 0; break; @@ -4551,8 +4581,6 @@ static int MenuSettings() pageToDisplay = 3; menu = MENU_NONE; page3Btn.ResetState(); - //page1Btn.SetImage(&page1dImg); - //page2Btn.SetImage(&page2Img); tabBtn.SetImage(&tab3Img); break; } @@ -5024,7 +5052,329 @@ static int MenuCheck() return menu; } +/**************************************************************************** + * MenuOGG + ***************************************************************************/ +int MenuOGG() +{ + int menu = MENU_NONE, cnt = 0; + int ret = 0, choice = 0; + int scrollon, nothingchanged = 0; + GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol); + GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol); + + char imgPath[100]; + + snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path); + GuiImageData btnOutline(imgPath, button_dialogue_box_png); + snprintf(imgPath, sizeof(imgPath), "%ssettings_background.png", CFG.theme_path); + GuiImageData settingsbg(imgPath, settings_background_png); + + GuiTrigger trigA; + trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); + GuiTrigger trigB; + trigB.SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B); + 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); + + char fullpath[150]; + char shortpath[35]; + int countmp3 = GetFiles(CFG.oggload_path); + + if(!strcmp("", CFG.oggload_path)) { + sprintf(shortpath, "%s", LANGUAGE.Standard); + } else if (strlen(CFG.oggload_path) < (27 + 3)) { + sprintf(shortpath, "%s", CFG.oggload_path); + } + else { + strncpy(shortpath, CFG.oggload_path, 27); + shortpath[27] = '\0'; + strncat(shortpath, "...", 3); + } + + GuiText titleTxt(shortpath, 24, (GXColor){0, 0, 0, 255}); + titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); + titleTxt.SetPosition(0,0); + GuiButton pathBtn(300, 50); + pathBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + pathBtn.SetPosition(0,28); + pathBtn.SetLabel(&titleTxt); + pathBtn.SetSoundOver(&btnSoundOver); + pathBtn.SetSoundClick(&btnClick); + pathBtn.SetTrigger(&trigA); + pathBtn.SetEffectGrow(); + + GuiImage oggmenubackground(&settingsbg); + oggmenubackground.SetAlignment(ALIGN_LEFT, ALIGN_TOP); + oggmenubackground.SetPosition(0, 0); + + GuiText backBtnTxt(LANGUAGE.Back , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255}); + backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30); + GuiImage backBtnImg(&btnOutline); + if (Settings.wsprompt == yes){ + backBtnImg.SetWidescreen(CFG.widescreen);}////// + GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); + backBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + backBtn.SetPosition(-180, 400); + backBtn.SetLabel(&backBtnTxt); + backBtn.SetImage(&backBtnImg); + backBtn.SetSoundOver(&btnSoundOver); + backBtn.SetSoundClick(&btnClick); + backBtn.SetTrigger(&trigA); + backBtn.SetTrigger(&trigB); + backBtn.SetEffectGrow(); + + customOptionList options2(300); + + for (cnt = 0; cnt < countmp3; cnt++) { + snprintf(options2.value[cnt], 30, "%s", mp3files[cnt]); + sprintf (options2.name[cnt],"%i.", cnt+1); + } + options2.length = cnt; + + if(cnt < 9) { + scrollon = 0; + } else { + scrollon = 1; + } + + GuiCustomOptionBrowser optionBrowser4(396, 280, &options2, CFG.theme_path, "bg_options_settings.png", bg_options_settings_png, scrollon, 85); + optionBrowser4.SetPosition(0, 90); + optionBrowser4.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + optionBrowser4.SetCol2Position(45); + + int songPlaying=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(130, 400); + nextBtn.SetImage(&nextBtnImg); + nextBtn.SetSoundOver(&btnSoundOver); + nextBtn.SetSoundClick(&btnClick); + nextBtn.SetTrigger(&trigA); + nextBtn.SetEffectGrow(); + + GuiImage prevBtnImg(&prev); + prevBtnImg.SetWidescreen(CFG.widescreen); + GuiButton prevBtn(prev.GetWidth(), prev.GetHeight()); + prevBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + prevBtn.SetPosition(-60, 400); + prevBtn.SetImage(&prevBtnImg); + prevBtn.SetSoundOver(&btnSoundOver); + prevBtn.SetSoundClick(&btnClick); + prevBtn.SetTrigger(&trigA); + prevBtn.SetEffectGrow(); + + GuiImage playBtnImg(&play); + playBtnImg.SetWidescreen(CFG.widescreen); + GuiButton playBtn(play.GetWidth(), play.GetHeight()); + playBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + playBtn.SetPosition(72, 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(17, 400); + stopBtn.SetImage(&stopBtnImg); + stopBtn.SetSoundOver(&btnSoundOver); + stopBtn.SetSoundClick(&btnClick); + stopBtn.SetTrigger(&trigA); + stopBtn.SetTrigger(&trigMinus); + stopBtn.SetEffectGrow(); + + HaltGui(); + GuiWindow w(screenwidth, screenheight); + w.Append(&oggmenubackground); + w.Append(&pathBtn); + w.Append(&backBtn); + w.Append(&playBtn); + w.Append(&nextBtn); + w.Append(&prevBtn); + w.Append(&stopBtn); + mainWindow->Append(&w); + mainWindow->Append(&optionBrowser4); + + ResumeGui(); + + while(menu == MENU_NONE) + { + + if (backBtn.GetState() == STATE_CLICKED) { + if(nothingchanged == 1 && countmp3 > 0) { + if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) { + bgMusic->Play(); + } else { + bgMusic->PlayOggFile(CFG.ogg_path); + } + } + menu = MENU_SETTINGS; + break; + } + + if (pathBtn.GetState() == STATE_CLICKED) { + mainWindow->Remove(&optionBrowser4); + w.Remove(&backBtn); + w.Remove(&pathBtn); + w.Remove(&playBtn); + w.Remove(&nextBtn); + w.Remove(&prevBtn); + w.Remove(&stopBtn); + char entered[43] = ""; + strncpy(entered, CFG.oggload_path, sizeof(entered)); + int result = OnScreenKeyboard(entered,43,0); + mainWindow->Append(&optionBrowser4); + w.Append(&pathBtn); + w.Append(&backBtn); + w.Append(&playBtn); + w.Append(&nextBtn); + w.Append(&prevBtn); + w.Append(&stopBtn); + if ( result == 1 ) { + strncpy(CFG.oggload_path, entered, sizeof(CFG.oggload_path)); + WindowPrompt(LANGUAGE.Backgroundmusicpath,0,LANGUAGE.ok,0,0,0); + if(isSdInserted() == 1) { + cfg_save_global(); + if(!strcmp("", CFG.oggload_path)) { + bgMusic->Play(); + } + menu = MENU_OGG; + break; + } else { + WindowPrompt(LANGUAGE.NoSDcardinserted, LANGUAGE.InsertaSDCardtosave, LANGUAGE.ok, 0,0,0); + } + } + if(countmp3 > 0) { + optionBrowser4.SetFocus(1); + } + pathBtn.ResetState(); + } + + ret = optionBrowser4.GetClickedOption(); + + if(ret>=0) { + choice = WindowPrompt(LANGUAGE.Setasbackgroundmusic,mp3files[ret],LANGUAGE.Yes,LANGUAGE.No,0,0); + if(choice == 1) { + snprintf(fullpath,150,"%s%s",CFG.oggload_path,mp3files[ret]); + choice = bgMusic->PlayOggFile(fullpath); + if(choice < 0) { + WindowPrompt(LANGUAGE.Notasupportedformat, LANGUAGE.Loadingstandardmusic, LANGUAGE.ok, 0,0,0); + sprintf(CFG.ogg_path, "notset"); + bgMusic->Play(); + } else { + snprintf(CFG.ogg_path, sizeof(CFG.ogg_path), "%s", fullpath); + cfg_save_global(); + SetVolumeOgg(255*(vol/100.0)); + nothingchanged = 0; + } + } + optionBrowser4.SetFocus(1); + } + + if (playBtn.GetState() == STATE_CLICKED && countmp3 > 0) { + if(countmp3 > 0) { + ret = optionBrowser4.GetSelectedOption(); + songPlaying=ret; + snprintf(fullpath, 150,"%s%s", CFG.oggload_path,mp3files[ret]); + choice = bgMusic->PlayOggFile(fullpath); + if(choice < 0) { + WindowPrompt(LANGUAGE.Notasupportedformat, LANGUAGE.Loadingstandardmusic, LANGUAGE.ok, 0,0,0); + if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) { + bgMusic->Play(); + } else { + bgMusic->PlayOggFile(CFG.ogg_path); + } + } + SetVolumeOgg(255*(vol/100.0)); + songPlaying=ret; + nothingchanged = 1; + optionBrowser4.SetFocus(1); + } + playBtn.ResetState(); + } + + if(nextBtn.GetState() == STATE_CLICKED){ + if(countmp3 > 0) { + songPlaying++; + if (songPlaying>(countmp3 - 1)){songPlaying=0;} + snprintf(fullpath,150,"%s%s", CFG.oggload_path,mp3files[songPlaying]); + choice = bgMusic->PlayOggFile(fullpath); + if(choice < 0) { + WindowPrompt(LANGUAGE.Notasupportedformat, LANGUAGE.Loadingstandardmusic, LANGUAGE.ok, 0,0,0); + if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) { + bgMusic->Play(); + } else { + bgMusic->PlayOggFile(CFG.ogg_path); + } + } + nothingchanged = 1; + optionBrowser4.SetFocus(1); + } + SetVolumeOgg(255*(vol/100.0)); + nextBtn.ResetState(); + } + if(prevBtn.GetState() == STATE_CLICKED) { + if(countmp3 > 0) { + songPlaying--; + if (songPlaying<0){songPlaying=(countmp3 - 1);} + snprintf(fullpath,150,"%s%s", CFG.oggload_path,mp3files[songPlaying]); + choice = bgMusic->PlayOggFile(fullpath); + if(choice < 0) { + WindowPrompt(LANGUAGE.Notasupportedformat, LANGUAGE.Loadingstandardmusic, LANGUAGE.ok, 0,0,0); + if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) { + bgMusic->Play(); + } else { + bgMusic->PlayOggFile(CFG.ogg_path); + } + } + nothingchanged = 1; + optionBrowser4.SetFocus(1); + } + SetVolumeOgg(255*(vol/100.0)); + prevBtn.ResetState(); + } + if(stopBtn.GetState() == STATE_CLICKED) { + if(countmp3 > 0) { + StopOgg(); + nothingchanged = 1; + optionBrowser4.SetFocus(1); + } + stopBtn.ResetState(); + } + } + + HaltGui(); + mainWindow->Remove(&optionBrowser4); + mainWindow->Remove(&w); + ResumeGui(); + + return menu; +} + +/**************************************************************************** + * MenuMp3 + ***************************************************************************/ int MenuMp3() { int menu = MENU_NONE, cnt = 0; @@ -5102,8 +5452,6 @@ int MenuMp3() 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); @@ -5241,8 +5589,6 @@ int MenuMp3() mainWindow->Remove(&optionBrowser4); mainWindow->Remove(&w); ResumeGui(); - return menu; - return menu; } @@ -5286,11 +5632,17 @@ int MainMenu(int menu) bgMusic = new GuiSound(bg_music_ogg, bg_music_ogg_size, SOUND_OGG, vol); bgMusic->SetVolume(vol); bgMusic->SetLoop(1); //loop music - bgMusic->Play(); // startup music + // startup music + if(!strcmp("", CFG.oggload_path) || !strcmp("notset", CFG.ogg_path)) { + bgMusic->Play(); + } else { + bgMusic->PlayOggFile(CFG.ogg_path); + } while(currentMenu != MENU_EXIT) { - bgMusic->SetVolume(vol); + SetVolumeOgg(255*(vol/100.0)); + switch (currentMenu) { case MENU_CHECK: @@ -5311,6 +5663,9 @@ int MainMenu(int menu) case MENU_MP3: currentMenu = MenuMp3(); break; + case MENU_OGG: + currentMenu = MenuOGG(); + break; default: // unrecognized menu currentMenu = MenuCheck(); break; diff --git a/source/menu.h b/source/menu.h index e8b280fc..f25b9692 100644 --- a/source/menu.h +++ b/source/menu.h @@ -25,6 +25,7 @@ enum MENU_INSTALL, MENU_CHECK, MENU_GAME_SETTINGS, + MENU_OGG, MENU_MP3 }; diff --git a/source/mp3s.c b/source/mp3s.c index 7c71fd67..6a879835 100644 --- a/source/mp3s.c +++ b/source/mp3s.c @@ -134,7 +134,7 @@ if (dir == NULL) //If empty } } - qsort(mp3files, countmp3, sizeof(char[80]), filenamescmp); + qsort(mp3files, countmp3, sizeof(char[70]), filenamescmp); return countmp3; } diff --git a/source/mp3s.h b/source/mp3s.h index f0abdd00..a5a06aeb 100644 --- a/source/mp3s.h +++ b/source/mp3s.h @@ -6,7 +6,7 @@ extern "C" { #endif -char mp3files[500][80]; +char mp3files[300][70]; void StopMp3(); void SetMp3Volume(u32 vol); diff --git a/source/oggplayer.c b/source/oggplayer.c index 6e562e17..01221987 100644 --- a/source/oggplayer.c +++ b/source/oggplayer.c @@ -25,7 +25,10 @@ */ #include "oggplayer.h" +#include "mp3s.h" #include +#include +#include /* OGG control */ @@ -287,6 +290,43 @@ int PlayOgg(int fd, int time_pos, int mode) return 0; } + +int PlayOggFromFile(char * path, int loop) { + + u32 filesize = 0; + char * bufferogg = NULL; + size_t resultogg; + + FILE * pFile; + pFile = fopen (path, "rb"); + + //Check that pFile exist + if (pFile==NULL){ + return -1; + } + + // get file size: + fseek (pFile , 0 , SEEK_END); + filesize = ftell (pFile); + rewind (pFile); + + // allocate memory to contain the whole file: + bufferogg = (char*) malloc (sizeof(char)*filesize); + if (bufferogg == NULL) {fputs (" Memory error",stderr); exit (2);} + + // copy the file into the buffer: + resultogg = fread (bufferogg,1,filesize,pFile); + if (resultogg != filesize) {fputs (" Reading error",stderr); exit (3);} + + fclose (pFile); + + if (loop) + return PlayOgg(mem_open((char *)bufferogg, filesize), 0, OGG_INFINITE_TIME); + else + return PlayOgg(mem_open((char *)bufferogg, filesize), 0, OGG_ONE_TIME); +} + + void PauseOgg(int pause) { if (pause) @@ -325,6 +365,7 @@ int StatusOgg() void SetVolumeOgg(int volume) { private_ogg.volume = volume; + SND_Pause(0); SND_ChangeVolumeVoice(0, volume, volume); } diff --git a/source/oggplayer.h b/source/oggplayer.h index 5c4610d1..7478263f 100644 --- a/source/oggplayer.h +++ b/source/oggplayer.h @@ -68,6 +68,12 @@ extern "C" int PlayOgg(int fd, int time_pos, int mode); +/*------------------------------------------------------------------------------------------------------------------------------------------------------*/ +/* int PlayOgg(char * path, int loop); + Just give the function the full device+path to OGG to play it + loop = 1 for Loop and 0 for one time playing +*/ +int PlayOggFromFile(char * path, int loop); /*------------------------------------------------------------------------------------------------------------------------------------------------------*/ /* void StopOgg();