AE: convert all strings DirectSound to uppercase

diff --git a/system/settings/win32.xml b/system/settings/win32.xml
index fce8da1..987f974 100644 (file)
--- a/system/settings/win32.xml
+++ b/system/settings/win32.xml
@@ -48,7 +48,7 @@
       <group id="1">
         <setting id="audiooutput.audiodevice" type="string" label="545" help="36371">
           <level>1</level>
-          <default>DirectSound:default</default>
+          <default>DIRECTSOUND:default</default>
           <constraints>
             <options>audiodevices</options>
           </constraints>
@@ -58,7 +58,7 @@
       <group id="3">
         <setting id="audiooutput.passthroughdevice" type="string" label="546" help="36372">
           <level>2</level>
-          <default>DirectSound:default</default>
+          <default>DIRECTSOUND:default</default>
           <constraints>
             <options>audiodevicespassthrough</options>
           </constraints>

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
index 98bf6d9..a3f0bf2 100644 (file)
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -564,7 +564,7 @@ void CAESinkDirectSound::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bo
 
     deviceInfo.m_deviceName       = strDevName;
     deviceInfo.m_displayName      = strWinDevType.append(strFriendlyName);
-    deviceInfo.m_displayNameExtra = std::string("DirectSound: ").append(strFriendlyName);
+    deviceInfo.m_displayNameExtra = std::string("DIRECTSOUND: ").append(strFriendlyName);
     deviceInfo.m_deviceType       = aeDeviceType;
 
     deviceInfoList.push_back(deviceInfo);

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
index 417a151..2564e54 100644 (file)
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h
@@ -29,7 +29,7 @@
 class CAESinkDirectSound : public IAESink
 {
 public:
-  virtual const char *GetName() { return "DirectSound"; }
+  virtual const char *GetName() { return "DIRECTSOUND"; }
 
   CAESinkDirectSound();
   virtual ~CAESinkDirectSound();