summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RtAudio.cpp11
-rw-r--r--RtAudio.h4
2 files changed, 9 insertions, 6 deletions
diff --git a/RtAudio.cpp b/RtAudio.cpp
index 7b7c8ef..07a6314 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -160,22 +160,25 @@ const std::vector<RtAudio::Api>& RtAudio :: getCompiledApi()
return compiledApis;
}
-const std::string RtAudio :: getCompiledApiName( RtAudio::Api api )
+static const std::string unknown_api_name = "";
+static const std::string unknown_api_display_name = "Unknown";
+
+const std::string& RtAudio :: getCompiledApiName( RtAudio::Api api )
{
ApiNameMap::const_iterator it;
for (it = apiNames.begin(); it != apiNames.end(); it++)
if (it->second.first == api)
return it->first;
- return "";
+ return unknown_api_name;
}
-const std::string RtAudio :: getCompiledApiDisplayName( RtAudio::Api api )
+const std::string& RtAudio :: getCompiledApiDisplayName( RtAudio::Api api )
{
ApiNameMap::const_iterator it;
for (it = apiNames.begin(); it != apiNames.end(); it++)
if (it->second.first == api)
return it->second.second;
- return "Unknown";
+ return unknown_api_display_name;
}
RtAudio::Api RtAudio :: getCompiledApiByName( const std::string &name )
diff --git a/RtAudio.h b/RtAudio.h
index 78d96a9..3927ae1 100644
--- a/RtAudio.h
+++ b/RtAudio.h
@@ -416,7 +416,7 @@ class RTAUDIO_DLL_PUBLIC RtAudio
If the API is unknown or not compiled, this function will return
the empty string.
*/
- static const std::string getCompiledApiName( RtAudio::Api api );
+ static const std::string& getCompiledApiName( RtAudio::Api api );
//! Return the display name of a specified compiled audio API.
/*!
@@ -424,7 +424,7 @@ class RTAUDIO_DLL_PUBLIC RtAudio
If the API is unknown or not compiled, this function will return
the empty string.
*/
- static const std::string getCompiledApiDisplayName( RtAudio::Api api );
+ static const std::string& getCompiledApiDisplayName( RtAudio::Api api );
//! Return the compiled audio API having the given name.
/*!