ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1638 from Stevoisiak/DSP-to-Audio 

Rename DSP settings to Audio settings
This commit is contained in:
Pierre Bourdon 2014-12-21 01:57:39 +01:00
parent 0735aaf208 91aeb7510f
commit f2a07e43d1
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Data/Sys/Themes/Boomy/dsp.png → Data/Sys/Themes/Boomy/audio.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
Data/Sys/Themes/Clean Blue/dsp.png → Data/Sys/Themes/Clean Blue/audio.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
Data/Sys/Themes/Clean Blue/dsp@2x.png → Data/Sys/Themes/Clean Blue/audio@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
Data/Sys/Themes/Clean Lite/dsp.png → Data/Sys/Themes/Clean Lite/audio.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
Data/Sys/Themes/Clean Lite/dsp@2x.png → Data/Sys/Themes/Clean Lite/audio@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
Data/Sys/Themes/Clean Pink/dsp.png → Data/Sys/Themes/Clean Pink/audio.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
Data/Sys/Themes/Clean Pink/dsp@2x.png → Data/Sys/Themes/Clean Pink/audio@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
Data/Sys/Themes/Clean/dsp.png → Data/Sys/Themes/Clean/audio.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
Data/Sys/Themes/Clean/dsp@2x.png → Data/Sys/Themes/Clean/audio@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

2
Source/Core/DolphinWX/Frame.cpp
View File

@ -259,7 +259,7 @@ EVT_MENU(IDM_TOGGLE_DUMPFRAMES, CFrame::OnToggleDumpFrames)
EVT_MENU(IDM_TOGGLE_DUMPAUDIO, CFrame::OnToggleDumpAudio) EVT_MENU(IDM_TOGGLE_DUMPAUDIO, CFrame::OnToggleDumpAudio)
EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain) EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain)
EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX) EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX)
EVT_MENU(IDM_CONFIG_DSP_EMULATOR, CFrame::OnConfigDSP) EVT_MENU(IDM_CONFIG_AUDIO, CFrame::OnConfigAudio)
EVT_MENU(IDM_CONFIG_CONTROLLERS, CFrame::OnConfigControllers) EVT_MENU(IDM_CONFIG_CONTROLLERS, CFrame::OnConfigControllers)
EVT_MENU(IDM_CONFIG_HOTKEYS, CFrame::OnConfigHotkey) EVT_MENU(IDM_CONFIG_HOTKEYS, CFrame::OnConfigHotkey)

4
Source/Core/DolphinWX/Frame.h
View File

@ -189,7 +189,7 @@ private:
Toolbar_FullScreen, Toolbar_FullScreen,
Toolbar_ConfigMain, Toolbar_ConfigMain,
Toolbar_ConfigGFX, Toolbar_ConfigGFX,
Toolbar_ConfigDSP, Toolbar_ConfigAudio,
Toolbar_Controller, Toolbar_Controller,
EToolbar_Max EToolbar_Max
}; };
@ -291,7 +291,7 @@ private:
void OnConfigMain(wxCommandEvent& event); // Options void OnConfigMain(wxCommandEvent& event); // Options
void OnConfigGFX(wxCommandEvent& event); void OnConfigGFX(wxCommandEvent& event);
void OnConfigDSP(wxCommandEvent& event); void OnConfigAudio(wxCommandEvent& event);
void OnConfigControllers(wxCommandEvent& event); void OnConfigControllers(wxCommandEvent& event);
void OnConfigHotkey(wxCommandEvent& event); void OnConfigHotkey(wxCommandEvent& event);

8
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -235,7 +235,7 @@ wxMenuBar* CFrame::CreateMenu()
pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure...")); pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure..."));
pOptionsMenu->AppendSeparator(); pOptionsMenu->AppendSeparator();
pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings")); pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings"));
pOptionsMenu->Append(IDM_CONFIG_DSP_EMULATOR, _("&DSP Settings")); pOptionsMenu->Append(IDM_CONFIG_AUDIO, _("&Audio Settings"));
pOptionsMenu->Append(IDM_CONFIG_CONTROLLERS, _("&Controller Settings")); pOptionsMenu->Append(IDM_CONFIG_CONTROLLERS, _("&Controller Settings"));
pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings")); pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings"));
if (g_pCodeWindow) if (g_pCodeWindow)
@ -570,7 +570,7 @@ void CFrame::PopulateToolbar(wxToolBar* ToolBar)
ToolBar->AddSeparator(); ToolBar->AddSeparator();
WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure..."));
WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings"));
WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_DSP_EMULATOR, _("DSP"), m_Bitmaps[Toolbar_ConfigDSP], _("DSP settings")); WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_AUDIO, _("Audio"), m_Bitmaps[Toolbar_ConfigAudio], _("Audio settings"));
WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings")); WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings"));
} }
@ -614,7 +614,7 @@ void CFrame::InitBitmaps()
m_Bitmaps[Toolbar_Pause ].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Pause ].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_ConfigMain ].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_ConfigMain ].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_ConfigGFX ].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_ConfigGFX ].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_ConfigDSP ].LoadFile(dir + "dsp.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_ConfigAudio].LoadFile(dir + "audio.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_Controller ].LoadFile(dir + "classic.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Controller ].LoadFile(dir + "classic.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_Screenshot ].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Screenshot ].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_FullScreen ].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_FullScreen ].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG);
@ -1335,7 +1335,7 @@ void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event))
g_video_backend->ShowConfig(this); g_video_backend->ShowConfig(this);
} }
void CFrame::OnConfigDSP(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED (event))
{ {
CConfigMain ConfigMain(this); CConfigMain ConfigMain(this);
ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE); ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE);

2
Source/Core/DolphinWX/Globals.h
View File

@ -146,7 +146,7 @@ enum
IDM_HELPGITHUB, IDM_HELPGITHUB,
IDM_CONFIG_GFX_BACKEND, IDM_CONFIG_GFX_BACKEND,
IDM_CONFIG_DSP_EMULATOR, IDM_CONFIG_AUDIO,
IDM_CONFIG_CONTROLLERS, IDM_CONFIG_CONTROLLERS,
IDM_CONFIG_HOTKEYS, IDM_CONFIG_HOTKEYS,
IDM_CONFIG_LOGGER, IDM_CONFIG_LOGGER,