From 73b44833a6a801a7bc72810664557e559d54575d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 13 Apr 2018 20:34:10 -0400 Subject: VOICE-59: display human-friendly names for voice input and output devices --- indra/newview/llvoicevivox.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llvoicevivox.h') diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index 9d4af85c8c..b4cf94444b 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -432,10 +432,10 @@ protected: //---------------------------------- // devices void clearCaptureDevices(); - void addCaptureDevice(const std::string& name); + void addCaptureDevice(const std::string& display_name, const std::string& device_name); void clearRenderDevices(); void setDevicesListUpdated(bool state); - void addRenderDevice(const std::string& name); + void addRenderDevice(const std::string& display_name, const std::string& device_name); void buildSetAudioDevices(std::ostringstream &stream); void getCaptureDevicesSendMessage(); -- cgit v1.2.3 From 4ab4bfb2c7bd79a89b347969c7812db366538ed9 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 15 Apr 2018 09:41:47 -0400 Subject: VOICE-59: better fix for display human-friendly names for voice input and output devices --- indra/newview/llvoicevivox.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llvoicevivox.h') diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index b4cf94444b..50862cea1e 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -432,10 +432,10 @@ protected: //---------------------------------- // devices void clearCaptureDevices(); - void addCaptureDevice(const std::string& display_name, const std::string& device_name); + void addCaptureDevice(const LLVoiceDevice& device); void clearRenderDevices(); void setDevicesListUpdated(bool state); - void addRenderDevice(const std::string& display_name, const std::string& device_name); + void addRenderDevice(const LLVoiceDevice& device); void buildSetAudioDevices(std::ostringstream &stream); void getCaptureDevicesSendMessage(); -- cgit v1.2.3