X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=rtaudio_c.cpp;h=bcb6930b6811090aeeeb4bbfe5c00044d7967d5f;hb=f2244e394dc2873abc4de1864d215ccab2b15e08;hp=7ae1bec4c36e4308ff65f715cd041e4ec7a7003b;hpb=e92130e9e152a71da71264a610662e910b450ec0;p=rtaudio.git

diff --git a/rtaudio_c.cpp b/rtaudio_c.cpp
index 7ae1bec..bcb6930 100644
--- a/rtaudio_c.cpp
+++ b/rtaudio_c.cpp
@@ -17,18 +17,24 @@ struct rtaudio {
 
 const char *rtaudio_version() { return RTAUDIO_VERSION; }
 
-extern "C" const rtaudio_api_t rtaudio_compiled_apis[]; // casting from RtAudio::Api[]
-extern "C" unsigned int rtaudio_num_compiled_apis;
-const rtaudio_api_t *rtaudio_compiled_api() { return rtaudio_compiled_apis; }
+extern "C" const RtAudio::Api rtaudio_compiled_apis[];
+const rtaudio_api_t *rtaudio_compiled_api() {
+  return (rtaudio_api_t *) &rtaudio_compiled_apis[0];
+}
+
+extern "C" const unsigned int rtaudio_num_compiled_apis;
+unsigned int rtaudio_get_num_compiled_apis(void) {
+  return rtaudio_num_compiled_apis;
+}
 
 extern "C" const char* rtaudio_api_names[][2];
-const char *rtaudio_compiled_api_name(rtaudio_api_t api) {
+const char *rtaudio_api_name(rtaudio_api_t api) {
     if (api < 0 || api >= RTAUDIO_API_NUM)
         return NULL;
     return rtaudio_api_names[api][0];
 }
 
-const char *rtaudio_compiled_api_display_name(rtaudio_api_t api)
+const char *rtaudio_api_display_name(rtaudio_api_t api)
 {
     if (api < 0 || api >= RTAUDIO_API_NUM)
         return "Unknown";
@@ -155,8 +161,7 @@ int rtaudio_open_stream(rtaudio_t audio,
     audio->cb = cb;
     audio->userdata = userdata;
     audio->audio->openStream(out, in, (RtAudioFormat)format, sample_rate,
-                             buffer_frames, proxy_cb_func, (void *)audio, opts,
-                             NULL);
+                             buffer_frames, proxy_cb_func, (void *)audio, opts); //,  NULL);
     return 0;
   } catch (RtAudioError &err) {
     audio->has_error = 1;