Remove the compiledApis vector.

[rtaudio-cdist.git] / RtAudio.cpp

diff --git a/RtAudio.cpp b/RtAudio.cpp
index c2c376016b03717bc63ba4dd28d129e52990d056..4e75d683c74aa843320c00eba96efd39a17c60c3 100644 (file)
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -118,7 +118,7 @@ const unsigned int rtaudio_num_api_names =
 
 // The order here will control the order of RtAudio's API search in
 // the constructor.
-RtAudio::Api rtaudio_compiled_apis[] = {
+extern "C" const RtAudio::Api rtaudio_compiled_apis[] = {
 #if defined(__UNIX_JACK__)
   RtAudio::UNIX_JACK,
 #endif
@@ -148,19 +148,10 @@ RtAudio::Api rtaudio_compiled_apis[] = {
 #endif
   RtAudio::UNSPECIFIED,
 };
-const unsigned int rtaudio_num_compiled_apis =
+extern "C" const unsigned int rtaudio_num_compiled_apis =
   sizeof(rtaudio_compiled_apis)/sizeof(rtaudio_compiled_apis[0])-1;
 }
 
-// TODO: replace this with something nicer (C++11)
-static const std::vector<RtAudio::Api> init_compiledApis() {
-  std::vector<RtAudio::Api> apis;
-  for (unsigned int i=0; i<rtaudio_num_compiled_apis; i++)
-    apis.push_back(rtaudio_compiled_apis[i]);
-  return apis;
-}
-const std::vector<RtAudio::Api> RtAudio::compiledApis(init_compiledApis());
-
 // This is a compile-time check that rtaudio_num_api_names == RtAudio::NUM_APIS.
 // If the build breaks here, check that they match.
 template<bool b> class StaticAssert { private: StaticAssert() {} };
@@ -171,19 +162,16 @@ class StaticAssertions { StaticAssertions() {
 
 void RtAudio :: getCompiledApi( std::vector<RtAudio::Api> &apis )
 {
-  apis = compiledApis;
-}
-
-const std::vector<RtAudio::Api>& RtAudio :: getCompiledApi()
-{
-  return compiledApis;
+  apis = std::vector<RtAudio::Api>(rtaudio_compiled_apis,
+                                   rtaudio_compiled_apis + rtaudio_num_compiled_apis);
 }
 
 const std::string RtAudio :: getCompiledApiName( RtAudio::Api api )
 {
   if (api < 0 || api > RtAudio::NUM_APIS
-      || (std::find(RtAudio::compiledApis.begin(),
-                    RtAudio::compiledApis.end(), api) == RtAudio::compiledApis.end()))
+      || (std::find(rtaudio_compiled_apis,
+                    rtaudio_compiled_apis+rtaudio_num_compiled_apis,
+                    api) == rtaudio_compiled_apis+rtaudio_num_compiled_apis))
     return "";
   return rtaudio_api_names[api][0];
 }
@@ -191,8 +179,9 @@ const std::string RtAudio :: getCompiledApiName( RtAudio::Api api )
 const std::string RtAudio :: getCompiledApiDisplayName( RtAudio::Api api )
 {
   if (api < 0 || api > RtAudio::NUM_APIS
-      || (std::find(RtAudio::compiledApis.begin(),
-                    RtAudio::compiledApis.end(), api) == RtAudio::compiledApis.end())) 
+      || (std::find(rtaudio_compiled_apis,
+                    rtaudio_compiled_apis+rtaudio_num_compiled_apis,
+                    api) == rtaudio_compiled_apis+rtaudio_num_compiled_apis))
     return "Unknown";
   return rtaudio_api_names[api][1];
 }
@@ -200,10 +189,9 @@ const std::string RtAudio :: getCompiledApiDisplayName( RtAudio::Api api )
 RtAudio::Api RtAudio :: getCompiledApiByName( const std::string &name )
 {
   unsigned int i=0;
-  std::vector<RtAudio::Api>::const_iterator it;
-  for (it = compiledApis.begin(); it != compiledApis.end(); ++it, ++i)
-    if (name == rtaudio_api_names[*it][0])
-      return *it;
+  for (i = 0; i < rtaudio_num_compiled_apis; ++i)
+    if (name == rtaudio_api_names[rtaudio_compiled_apis[i]][0])
+      return rtaudio_compiled_apis[i];
   return RtAudio::UNSPECIFIED;
 }