diff options
Diffstat (limited to 'mic.diff')
| -rw-r--r-- | mic.diff | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -691,7 +691,7 @@ #include "Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h" #include "Cafe/Account/Account.h" -@@ -71,6 +73,15 @@ private: +@@ -69,6 +71,15 @@ private: IAudioAPI::DeviceDescriptionPtr m_description; }; @@ -707,7 +707,7 @@ class wxVulkanUUID : public wxClientData { public: -@@ -425,6 +436,47 @@ wxPanel* GeneralSettings2::AddAudioPage(wxNotebook* notebook) +@@ -423,6 +434,47 @@ wxPanel* GeneralSettings2::AddAudioPage(wxNotebook* notebook) audio_panel_sizer->Add(box_sizer, 0, wxEXPAND | wxALL, 5); } @@ -755,7 +755,7 @@ audio_panel->SetSizerAndFit(audio_panel_sizer); return audio_panel; } -@@ -839,9 +891,12 @@ void GeneralSettings2::StoreConfig() +@@ -837,9 +889,12 @@ void GeneralSettings2::StoreConfig() config.tv_channels = (AudioChannels)m_tv_channels->GetSelection(); //config.pad_channels = (AudioChannels)m_pad_channels->GetSelection(); config.pad_channels = kStereo; // (AudioChannels)m_pad_channels->GetSelection(); @@ -768,7 +768,7 @@ config.tv_device.clear(); const auto tv_device = m_tv_device->GetSelection(); -@@ -861,6 +916,15 @@ void GeneralSettings2::StoreConfig() +@@ -859,6 +914,15 @@ void GeneralSettings2::StoreConfig() config.pad_device = device_description->GetDescription()->GetIdentifier(); } @@ -784,7 +784,7 @@ // graphics config.graphic_api = (GraphicAPI)m_graphic_api->GetSelection(); -@@ -958,19 +1022,29 @@ void GeneralSettings2::OnAudioLatencyChanged(wxCommandEvent& event) +@@ -956,19 +1020,29 @@ void GeneralSettings2::OnAudioLatencyChanged(wxCommandEvent& event) void GeneralSettings2::OnVolumeChanged(wxCommandEvent& event) { @@ -823,7 +823,7 @@ } -@@ -1029,9 +1103,11 @@ void GeneralSettings2::UpdateAudioDeviceList() +@@ -1027,9 +1101,11 @@ void GeneralSettings2::UpdateAudioDeviceList() { m_tv_device->Clear(); m_pad_device->Clear(); @@ -835,7 +835,7 @@ const auto audio_api = (IAudioAPI::AudioAPI)GetConfig().audio_api; const auto devices = IAudioAPI::GetDevices(audio_api); -@@ -1041,6 +1117,14 @@ void GeneralSettings2::UpdateAudioDeviceList() +@@ -1039,6 +1115,14 @@ void GeneralSettings2::UpdateAudioDeviceList() m_pad_device->Append(device->GetName(), new wxDeviceDescription(device)); } @@ -850,7 +850,7 @@ if(m_tv_device->GetCount() > 1) m_tv_device->SetSelection(1); else -@@ -1048,6 +1132,8 @@ void GeneralSettings2::UpdateAudioDeviceList() +@@ -1046,6 +1130,8 @@ void GeneralSettings2::UpdateAudioDeviceList() m_pad_device->SetSelection(0); @@ -859,7 +859,7 @@ // todo reset global instance of audio device } -@@ -1433,6 +1519,8 @@ void GeneralSettings2::ApplyConfig() +@@ -1431,6 +1517,8 @@ void GeneralSettings2::ApplyConfig() m_tv_channels->SetSelection(config.tv_channels); //m_pad_channels->SetSelection(config.pad_channels); m_pad_channels->SetSelection(0); @@ -868,7 +868,7 @@ SendSliderEvent(m_tv_volume, config.tv_volume); -@@ -1467,6 +1555,22 @@ void GeneralSettings2::ApplyConfig() +@@ -1465,6 +1553,22 @@ void GeneralSettings2::ApplyConfig() else m_pad_device->SetSelection(0); @@ -891,7 +891,7 @@ // account UpdateOnlineAccounts(); m_active_account->SetSelection(0); -@@ -1530,6 +1634,9 @@ void GeneralSettings2::UpdateAudioDevice() +@@ -1528,6 +1632,9 @@ void GeneralSettings2::UpdateAudioDevice() { auto& config = GetConfig(); @@ -901,7 +901,7 @@ // tv audio device { const auto selection = m_tv_device->GetSelection(); -@@ -1539,13 +1646,13 @@ void GeneralSettings2::UpdateAudioDevice() +@@ -1537,13 +1644,13 @@ void GeneralSettings2::UpdateAudioDevice() return; } @@ -917,7 +917,7 @@ sint32 channels; if (m_game_launched && g_tvAudio) channels = g_tvAudio->GetChannels(); -@@ -1567,7 +1674,6 @@ void GeneralSettings2::UpdateAudioDevice() +@@ -1565,7 +1672,6 @@ void GeneralSettings2::UpdateAudioDevice() try { @@ -925,7 +925,7 @@ g_tvAudio = IAudioAPI::CreateDevice((IAudioAPI::AudioAPI)config.audio_api, description->GetDescription(), 48000, channels, snd_core::AX_SAMPLES_PER_3MS_48KHZ * AX_FRAMES_PER_GROUP, 16); g_tvAudio->SetVolume(m_tv_volume->GetValue()); } -@@ -1588,13 +1694,13 @@ void GeneralSettings2::UpdateAudioDevice() +@@ -1586,13 +1692,13 @@ void GeneralSettings2::UpdateAudioDevice() return; } @@ -941,7 +941,7 @@ sint32 channels; if (m_game_launched && g_padAudio) channels = g_padAudio->GetChannels(); -@@ -1616,7 +1722,6 @@ void GeneralSettings2::UpdateAudioDevice() +@@ -1614,7 +1720,6 @@ void GeneralSettings2::UpdateAudioDevice() try { @@ -949,7 +949,7 @@ g_padAudio = IAudioAPI::CreateDevice((IAudioAPI::AudioAPI)config.audio_api, description->GetDescription(), 48000, channels, snd_core::AX_SAMPLES_PER_3MS_48KHZ * AX_FRAMES_PER_GROUP, 16); g_padAudio->SetVolume(m_pad_volume->GetValue()); g_padVolume = m_pad_volume->GetValue(); -@@ -1628,6 +1733,54 @@ void GeneralSettings2::UpdateAudioDevice() +@@ -1626,6 +1731,54 @@ void GeneralSettings2::UpdateAudioDevice() } } } |