mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-10 16:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu XUI 360) Add Audio Options

Browse Source
This commit is contained in:
twinaphex 2013-05-10 19:02:24 +02:00
parent 3543885acf
commit 1ee603b07e
6 changed files with 162 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
frontend/menu/rmenu_xui.cpp
View File

@ -40,6 +40,10 @@ enum {
MENU_XUI_ITEM_ORIENTATION, MENU_XUI_ITEM_ORIENTATION,
}; };
enum {
MENU_XUI_ITEM_AUDIO_MUTE_AUDIO = 0,
};
enum enum
{ {
SETTING_EMU_SHOW_INFO_MSG = 0, SETTING_EMU_SHOW_INFO_MSG = 0,
@ -146,6 +150,7 @@ CREATE_CLASS(CRetroArchFileBrowser, L"RetroArchFileBrowser");
CREATE_CLASS(CRetroArchCoreBrowser, L"RetroArchCoreBrowser"); CREATE_CLASS(CRetroArchCoreBrowser, L"RetroArchCoreBrowser");
CREATE_CLASS(CRetroArchShaderBrowser, L"RetroArchShaderBrowser"); CREATE_CLASS(CRetroArchShaderBrowser, L"RetroArchShaderBrowser");
CREATE_CLASS(CRetroArchVideoOptions, L"RetroArchVideoOptions"); CREATE_CLASS(CRetroArchVideoOptions, L"RetroArchVideoOptions");
CREATE_CLASS(CRetroArchAudioOptions, L"RetroArchAudioOptions");
CREATE_CLASS(CRetroArchSettings, L"RetroArchSettings"); CREATE_CLASS(CRetroArchSettings, L"RetroArchSettings");
CREATE_CLASS(CRetroArchControls, L"RetroArchControls"); CREATE_CLASS(CRetroArchControls, L"RetroArchControls");
@ -164,6 +169,7 @@ HRESULT CRetroArch::RegisterXuiClasses (void)
CRetroArchCoreBrowser::Register(); CRetroArchCoreBrowser::Register();
CRetroArchShaderBrowser::Register(); CRetroArchShaderBrowser::Register();
CRetroArchVideoOptions::Register(); CRetroArchVideoOptions::Register();
CRetroArchAudioOptions::Register();
CRetroArchControls::Register(); CRetroArchControls::Register();
CRetroArchSettings::Register(); CRetroArchSettings::Register();
@ -178,6 +184,7 @@ HRESULT CRetroArch::UnregisterXuiClasses (void)
XuiUnregisterClass(L"RetroArchShaderBrowser"); XuiUnregisterClass(L"RetroArchShaderBrowser");
XuiUnregisterClass(L"RetroArchFileBrowser"); XuiUnregisterClass(L"RetroArchFileBrowser");
XuiUnregisterClass(L"RetroArchVideoOptions"); XuiUnregisterClass(L"RetroArchVideoOptions");
XuiUnregisterClass(L"RetroArchAudioOptions");
XuiUnregisterClass(L"RetroArchControls"); XuiUnregisterClass(L"RetroArchControls");
XuiUnregisterClass(L"RetroArchSettings"); XuiUnregisterClass(L"RetroArchSettings");
@ -712,6 +719,77 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
return 0; return 0;
} }
HRESULT CRetroArchAudioOptions::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
{
GetChildById(L"XuiMenuList", &m_menulist);
GetChildById(L"XuiBackButton", &m_back);
GetChildById(L"XuiTxtTitle", &m_menutitle);
XuiListDeleteItems(m_menulist, 0, XuiListGetItemCount(m_menulist));
XuiTextElementSetText(m_menutitle, L"Audio Options");
XuiListInsertItems(m_menulist, MENU_XUI_ITEM_AUDIO_MUTE_AUDIO, 1);
XuiListSetText(m_menulist, MENU_XUI_ITEM_AUDIO_MUTE_AUDIO, g_extern.audio_data.mute ? L"Mute Audio : ON" : L"Mute Audio : OFF");
return 0;
}
HRESULT CRetroArchAudioOptions::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled)
{
bool aspectratio_changed = false;
int current_index;
current_index = XuiListGetCurSel(m_menulist, NULL);
unsigned input = pControlNavigateData->nControlNavigate;
switch (current_index)
{
case MENU_XUI_ITEM_AUDIO_MUTE_AUDIO:
if (input == XUI_CONTROL_NAVIGATE_LEFT ||
input == XUI_CONTROL_NAVIGATE_RIGHT ||
input == XUI_CONTROL_NAVIGATE_OK)
{
settings_set(1ULL << S_AUDIO_MUTE);
XuiListSetText(m_menulist, MENU_XUI_ITEM_AUDIO_MUTE_AUDIO, g_extern.audio_data.mute ? L"Mute Audio : ON" : L"Mute Audio : OFF");
}
break;
}
bHandled = TRUE;
switch(pControlNavigateData->nControlNavigate)
{
case XUI_CONTROL_NAVIGATE_LEFT:
case XUI_CONTROL_NAVIGATE_RIGHT:
case XUI_CONTROL_NAVIGATE_UP:
case XUI_CONTROL_NAVIGATE_DOWN:
pControlNavigateData->hObjDest = pControlNavigateData->hObjSource;
break;
default:
break;
}
return 0;
}
HRESULT CRetroArchAudioOptions::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{
process_input_ret = 0;
if ( hObjPressed == m_menulist)
{
XUIMessageControlNavigate controls;
controls.nControlNavigate = (XUI_CONTROL_NAVIGATE)XUI_CONTROL_NAVIGATE_OK;
OnControlNavigate(&controls, bHandled);
}
bHandled = TRUE;
return 0;
}
HRESULT CRetroArchVideoOptions::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) HRESULT CRetroArchVideoOptions::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
{ {
GetChildById(L"XuiMenuList", &m_menulist); GetChildById(L"XuiMenuList", &m_menulist);
@ -1004,6 +1082,15 @@ HRESULT CRetroArchMain::OnControlNavigate(XUIMessageControlNavigate *pControlNav
} }
break; break;
case INGAME_MENU_AUDIO_OPTIONS_MODE: case INGAME_MENU_AUDIO_OPTIONS_MODE:
if (input == XUI_CONTROL_NAVIGATE_OK)
{
hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_audio_options.xur", NULL, &current_menu);
if (hr < 0)
RARCH_ERR("Failed to load scene.\n");
XuiSceneNavigateForward(current_obj, false, current_menu, XUSER_INDEX_FOCUS);
}
break; break;
case INGAME_MENU_INPUT_OPTIONS_MODE: case INGAME_MENU_INPUT_OPTIONS_MODE:
if (input == XUI_CONTROL_NAVIGATE_OK) if (input == XUI_CONTROL_NAVIGATE_OK)

9
media/360/generate_xuis.bat
View File

@ -13,6 +13,8 @@ call :subroutine_d
call :subroutine_e call :subroutine_e
@echo "Creating sd/rarch_libretrocore_browser.xui ..." @echo "Creating sd/rarch_libretrocore_browser.xui ..."
call :subroutine_f call :subroutine_f
@echo "Creating sd/rarch_audio_options.xui ..."
call :subroutine_g
cd ../ cd ../
cd hd cd hd
@ -29,6 +31,8 @@ call :subroutine_d
call :subroutine_e call :subroutine_e
@echo "Creating hd/rarch_libretrocore_browser.xui ..." @echo "Creating hd/rarch_libretrocore_browser.xui ..."
call :subroutine_f call :subroutine_f
@echo "Creating sd/rarch_audio_options.xui ..."
call :subroutine_g
goto :eof goto :eof
:subroutine_a :subroutine_a
@ -60,3 +64,8 @@ goto :eof
del rarch_libretrocore_browser.xui 2>NUL del rarch_libretrocore_browser.xui 2>NUL
call rarch_libretrocore_browser.bat call rarch_libretrocore_browser.bat
goto :eof goto :eof
:subroutine_a
del rarch_audio_options.xui 2>NUL
call rarch_audio_options.bat
goto :eof

14
media/360/hd/rarch_audio_options.bat Normal file
View File

@ -0,0 +1,14 @@
@echo off
for /f "tokens=* delims=" %%f in ('type rarch_main.xui') do CALL :DOREPLACE "%%f"
GOTO :EOF
:DOREPLACE
SET INPUT=%*
SET OUTPUT=%INPUT:RetroArchMain=RetroArchAudioOptions%
for /f "tokens=* delims=" %%g in ('ECHO %OUTPUT%') do ECHO %%~g>>rarch_audio_options.xui
EXIT /b
:EOF

14
media/360/sd/rarch_audio_options.bat Normal file
View File

@ -0,0 +1,14 @@
@echo off
for /f "tokens=* delims=" %%f in ('type rarch_main.xui') do CALL :DOREPLACE "%%f"
GOTO :EOF
:DOREPLACE
SET INPUT=%*
SET OUTPUT=%INPUT:RetroArchMain=RetroArchAudioOptions%
for /f "tokens=* delims=" %%g in ('ECHO %OUTPUT%') do ECHO %%~g>>rarch_audio_options.xui
EXIT /b
:EOF

32
msvc/RetroArch-360/RetroArch-360.vcxproj
View File

@ -522,6 +522,23 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\media\360\sd\rarch_audio_options.xui">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\sd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\sd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\sd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\sd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\sd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\sd\rarch_audio_options.xur"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\sd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\sd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\sd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\sd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\sd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\sd\rarch_audio_options.xur;</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\media\360\sd\rarch_libretrocore_browser.xui"> <CustomBuild Include="..\..\media\360\sd\rarch_libretrocore_browser.xui">
<FileType>Document</FileType> <FileType>Document</FileType>
@ -600,6 +617,21 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\media\360\hd\rarch_audio_options.xui">
<FileType>Document</FileType>
<Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\hd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\hd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\hd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\hd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_audio_options.xur;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\hd\rarch_audio_options.xur;</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\hd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\hd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\hd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\hd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\hd\rarch_audio_options.xur"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_audio_options.xui" "$(OutDir)media\hd\rarch_audio_options.xur"</Command>
</CustomBuild>
<CustomBuild Include="..\..\media\360\hd\rarch_settings.xui"> <CustomBuild Include="..\..\media\360\hd\rarch_settings.xui">
<FileType>Document</FileType> <FileType>Document</FileType>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_settings.xur;</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_settings.xur;</Outputs>

6
msvc/RetroArch-360/RetroArch-360.vcxproj.filters
View File

@ -153,6 +153,12 @@
<CustomBuild Include="..\..\media\360\sd\rarch_video_options.xui"> <CustomBuild Include="..\..\media\360\sd\rarch_video_options.xui">
<Filter>Source Files\media\sd</Filter> <Filter>Source Files\media\sd</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\media\360\hd\rarch_audio_options.xui">
<Filter>Source Files\media\hd</Filter>
</CustomBuild>
<CustomBuild Include="..\..\media\360\sd\rarch_audio_options.xui">
<Filter>Source Files\media\sd</Filter>
</CustomBuild>
<CustomBuild Include="..\..\media\360\hd\rarch_settings.xui"> <CustomBuild Include="..\..\media\360\hd\rarch_settings.xui">
<Filter>Source Files\media\hd</Filter> <Filter>Source Files\media\hd</Filter>
</CustomBuild> </CustomBuild>