falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Audio plugin host https://kx.studio/carla
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3871 Commits
16 Branches
14GB
Tree: a90b9f9a3e
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'a90b9f9a3e'
${ noResults }
Carla/source/modules/rtaudio.diff

648 lines
26KB
Raw Blame History 

  1. diff --git a/RtAudio.cpp b/RtAudio.cpp

  2. index 2ac2179..c658295 100644

  3. --- a/RtAudio.cpp

  4. +++ b/RtAudio.cpp

  5. @@ -282,7 +282,7 @@ void RtApi :: openStream( RtAudio::StreamParameters *oParams,

  6.      return;

  7.    }

  8.  

  9. -  if ( oParams == NULL && iParams == NULL ) {

  10. +  if ( oParams == NULL && iParams == NULL && getCurrentApi() != RtAudio::RTAUDIO_DUMMY ) {

  11.      errorText_ = "RtApi::openStream: input and output StreamParameters structures are both NULL!";

  12.      error( RtAudioError::INVALID_USE );

  13.      return;

  14. @@ -1587,6 +1587,8 @@ static void *coreStopStream( void *ptr )

  15.  

  16.    object->stopStream();

  17.    pthread_exit( NULL );

  18. +

  19. +  return NULL;

  20.  }

  21.  

  22.  bool RtApiCore :: callbackEvent( AudioDeviceID deviceId,

  23. @@ -1925,7 +1927,7 @@ const char* RtApiCore :: getErrorCode( OSStatus code )

  24.  // devices are available (i.e., the JACK server is not running), a

  25.  // stream cannot be opened.

  26.  

  27. -#include <jack/jack.h>

  28. +#include "jackbridge/JackBridge.hpp"

  29.  #include <unistd.h>

  30.  #include <cstdio>

  31.  

  32. @@ -1944,17 +1946,9 @@ struct JackHandle {

  33.      :client(0), drainCounter(0), internalDrain(false) { ports[0] = 0; ports[1] = 0; xrun[0] = false; xrun[1] = false; }

  34.  };

  35.  

  36. -#if !defined(__RTAUDIO_DEBUG__)

  37. -static void jackSilentError( const char * ) {};

  38. -#endif

  39. -

  40.  RtApiJack :: RtApiJack()

  41.      :shouldAutoconnect_(true) {

  42.    // Nothing to do here.

  43. -#if !defined(__RTAUDIO_DEBUG__)

  44. -  // Turn off Jack's internal error reporting.

  45. -  jack_set_error_function( &jackSilentError );

  46. -#endif

  47.  }

  48.  

  49.  RtApiJack :: ~RtApiJack()

  50. @@ -1967,13 +1961,13 @@ unsigned int RtApiJack :: getDeviceCount( void )

  51.    // See if we can become a jack client.

  52.    jack_options_t options = (jack_options_t) ( JackNoStartServer ); //JackNullOption;

  53.    jack_status_t *status = NULL;

  54. -  jack_client_t *client = jack_client_open( "RtApiJackCount", options, status );

  55. +  jack_client_t *client = jackbridge_client_open( "CarlaJackCount", options, status );

  56.    if ( client == 0 ) return 0;

  57.  

  58.    const char **ports;

  59.    std::string port, previousPort;

  60.    unsigned int nChannels = 0, nDevices = 0;

  61. -  ports = jack_get_ports( client, NULL, NULL, 0 );

  62. +  ports = jackbridge_get_ports( client, NULL, NULL, 0 );

  63.    if ( ports ) {

  64.      // Parse the port names up to the first colon (:).

  65.      size_t iColon = 0;

  66. @@ -1988,10 +1982,10 @@ unsigned int RtApiJack :: getDeviceCount( void )

  67.          }

  68.        }

  69.      } while ( ports[++nChannels] );

  70. -    free( ports );

  71. +    jackbridge_free( ports );

  72.    }

  73.  

  74. -  jack_client_close( client );

  75. +  jackbridge_client_close( client );

  76.    return nDevices;

  77.  }

  78.  

  79. @@ -2002,7 +1996,7 @@ RtAudio::DeviceInfo RtApiJack :: getDeviceInfo( unsigned int device )

  80.  

  81.    jack_options_t options = (jack_options_t) ( JackNoStartServer ); //JackNullOption

  82.    jack_status_t *status = NULL;

  83. -  jack_client_t *client = jack_client_open( "RtApiJackInfo", options, status );

  84. +  jack_client_t *client = jackbridge_client_open( "CarlaJackInfo", options, status );

  85.    if ( client == 0 ) {

  86.      errorText_ = "RtApiJack::getDeviceInfo: Jack server not found or connection error!";

  87.      error( RtAudioError::WARNING );

  88. @@ -2012,7 +2006,7 @@ RtAudio::DeviceInfo RtApiJack :: getDeviceInfo( unsigned int device )

  89.    const char **ports;

  90.    std::string port, previousPort;

  91.    unsigned int nPorts = 0, nDevices = 0;

  92. -  ports = jack_get_ports( client, NULL, NULL, 0 );

  93. +  ports = jackbridge_get_ports( client, NULL, NULL, 0 );

  94.    if ( ports ) {

  95.      // Parse the port names up to the first colon (:).

  96.      size_t iColon = 0;

  97. @@ -2028,11 +2022,11 @@ RtAudio::DeviceInfo RtApiJack :: getDeviceInfo( unsigned int device )

  98.          }

  99.        }

  100.      } while ( ports[++nPorts] );

  101. -    free( ports );

  102. +    jackbridge_free( ports );

  103.    }

  104.  

  105.    if ( device >= nDevices ) {

  106. -    jack_client_close( client );

  107. +    jackbridge_client_close( client );

  108.      errorText_ = "RtApiJack::getDeviceInfo: device ID is invalid!";

  109.      error( RtAudioError::INVALID_USE );

  110.      return info;

  111. @@ -2041,30 +2035,30 @@ RtAudio::DeviceInfo RtApiJack :: getDeviceInfo( unsigned int device )

  112.    // Get the current jack server sample rate.

  113.    info.sampleRates.clear();

  114.  

  115. -  info.preferredSampleRate = jack_get_sample_rate( client );

  116. +  info.preferredSampleRate = jackbridge_get_sample_rate( client );

  117.    info.sampleRates.push_back( info.preferredSampleRate );

  118.  

  119.    // Count the available ports containing the client name as device

  120.    // channels.  Jack "input ports" equal RtAudio output channels.

  121.    unsigned int nChannels = 0;

  122. -  ports = jack_get_ports( client, info.name.c_str(), NULL, JackPortIsInput );

  123. +  ports = jackbridge_get_ports( client, info.name.c_str(), NULL, JackPortIsInput );

  124.    if ( ports ) {

  125.      while ( ports[ nChannels ] ) nChannels++;

  126. -    free( ports );

  127. +    jackbridge_free( ports );

  128.      info.outputChannels = nChannels;

  129.    }

  130.  

  131.    // Jack "output ports" equal RtAudio input channels.

  132.    nChannels = 0;

  133. -  ports = jack_get_ports( client, info.name.c_str(), NULL, JackPortIsOutput );

  134. +  ports = jackbridge_get_ports( client, info.name.c_str(), NULL, JackPortIsOutput );

  135.    if ( ports ) {

  136.      while ( ports[ nChannels ] ) nChannels++;

  137. -    free( ports );

  138. +    jackbridge_free( ports );

  139.      info.inputChannels = nChannels;

  140.    }

  141.  

  142.    if ( info.outputChannels == 0 && info.inputChannels == 0 ) {

  143. -    jack_client_close(client);

  144. +    jackbridge_client_close(client);

  145.      errorText_ = "RtApiJack::getDeviceInfo: error determining Jack input/output channels!";

  146.      error( RtAudioError::WARNING );

  147.      return info;

  148. @@ -2083,7 +2077,7 @@ RtAudio::DeviceInfo RtApiJack :: getDeviceInfo( unsigned int device )

  149.    if ( device == 0 && info.inputChannels > 0 )

  150.      info.isDefaultInput = true;

  151.  

  152. -  jack_client_close(client);

  153. +  jackbridge_client_close(client);

  154.    info.probed = true;

  155.    return info;

  156.  }

  157. @@ -2101,7 +2095,7 @@ static int jackCallbackHandler( jack_nframes_t nframes, void *infoPointer )

  158.  // This function will be called by a spawned thread when the Jack

  159.  // server signals that it is shutting down.  It is necessary to handle

  160.  // it this way because the jackShutdown() function must return before

  161. -// the jack_deactivate() function (in closeStream()) will return.

  162. +// the jackbridge_deactivate() function (in closeStream()) will return.

  163.  static void *jackCloseStream( void *ptr )

  164.  {

  165.    CallbackInfo *info = (CallbackInfo *) ptr;

  166. @@ -2110,6 +2104,8 @@ static void *jackCloseStream( void *ptr )

  167.    object->closeStream();

  168.  

  169.    pthread_exit( NULL );

  170. +

  171. +  return NULL;

  172.  }

  173.  static void jackShutdown( void *infoPointer )

  174.  {

  175. @@ -2151,9 +2147,9 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  176.      jack_options_t jackoptions = (jack_options_t) ( JackNoStartServer ); //JackNullOption;

  177.      jack_status_t *status = NULL;

  178.      if ( options && !options->streamName.empty() )

  179. -      client = jack_client_open( options->streamName.c_str(), jackoptions, status );

  180. +      client = jackbridge_client_open( options->streamName.c_str(), jackoptions, status );

  181.      else

  182. -      client = jack_client_open( "RtApiJack", jackoptions, status );

  183. +      client = jackbridge_client_open( "CarlaJack", jackoptions, status );

  184.      if ( client == 0 ) {

  185.        errorText_ = "RtApiJack::probeDeviceOpen: Jack server not found or connection error!";

  186.        error( RtAudioError::WARNING );

  187. @@ -2168,7 +2164,7 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  188.    const char **ports;

  189.    std::string port, previousPort, deviceName;

  190.    unsigned int nPorts = 0, nDevices = 0;

  191. -  ports = jack_get_ports( client, NULL, NULL, 0 );

  192. +  ports = jackbridge_get_ports( client, NULL, NULL, 0 );

  193.    if ( ports ) {

  194.      // Parse the port names up to the first colon (:).

  195.      size_t iColon = 0;

  196. @@ -2184,7 +2180,7 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  197.          }

  198.        }

  199.      } while ( ports[++nPorts] );

  200. -    free( ports );

  201. +    jackbridge_free( ports );

  202.    }

  203.  

  204.    if ( device >= nDevices ) {

  205. @@ -2197,10 +2193,10 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  206.    unsigned int nChannels = 0;

  207.    unsigned long flag = JackPortIsInput;

  208.    if ( mode == INPUT ) flag = JackPortIsOutput;

  209. -  ports = jack_get_ports( client, deviceName.c_str(), NULL, flag );

  210. +  ports = jackbridge_get_ports( client, deviceName.c_str(), NULL, flag );

  211.    if ( ports ) {

  212.      while ( ports[ nChannels ] ) nChannels++;

  213. -    free( ports );

  214. +    jackbridge_free( ports );

  215.    }

  216.  

  217.    // Compare the jack ports for specified client to the requested number of channels.

  218. @@ -2211,9 +2207,9 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  219.    }

  220.  

  221.    // Check the jack server sample rate.

  222. -  unsigned int jackRate = jack_get_sample_rate( client );

  223. +  unsigned int jackRate = jackbridge_get_sample_rate( client );

  224.    if ( sampleRate != jackRate ) {

  225. -    jack_client_close( client );

  226. +    jackbridge_client_close( client );

  227.      errorStream_ << "RtApiJack::probeDeviceOpen: the requested sample rate (" << sampleRate << ") is different than the JACK server rate (" << jackRate << ").";

  228.      errorText_ = errorStream_.str();

  229.      return FAILURE;

  230. @@ -2221,19 +2217,19 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  231.    stream_.sampleRate = jackRate;

  232.  

  233.    // Get the latency of the JACK port.

  234. -  ports = jack_get_ports( client, deviceName.c_str(), NULL, flag );

  235. +  ports = jackbridge_get_ports( client, deviceName.c_str(), NULL, flag );

  236.    if ( ports[ firstChannel ] ) {

  237.      // Added by Ge Wang

  238.      jack_latency_callback_mode_t cbmode = (mode == INPUT ? JackCaptureLatency : JackPlaybackLatency);

  239.      // the range (usually the min and max are equal)

  240.      jack_latency_range_t latrange; latrange.min = latrange.max = 0;

  241.      // get the latency range

  242. -    jack_port_get_latency_range( jack_port_by_name( client, ports[firstChannel] ), cbmode, &latrange );

  243. +    jackbridge_port_get_latency_range( jackbridge_port_by_name( client, ports[firstChannel] ), cbmode, &latrange );

  244.      // be optimistic, use the min!

  245.      stream_.latency[mode] = latrange.min;

  246. -    //stream_.latency[mode] = jack_port_get_latency( jack_port_by_name( client, ports[ firstChannel ] ) );

  247. +    //stream_.latency[mode] = jack_port_get_latency( jackbridge_port_by_name( client, ports[ firstChannel ] ) );

  248.    }

  249. -  free( ports );

  250. +  jackbridge_free( ports );

  251.  

  252.    // The jack server always uses 32-bit floating-point data.

  253.    stream_.deviceFormat[mode] = RTAUDIO_FLOAT32;

  254. @@ -2250,7 +2246,7 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  255.  

  256.    // Get the buffer size.  The buffer size and number of buffers

  257.    // (periods) is set when the jack server is started.

  258. -  stream_.bufferSize = (int) jack_get_buffer_size( client );

  259. +  stream_.bufferSize = (int) jackbridge_get_buffer_size( client );

  260.    *bufferSize = stream_.bufferSize;

  261.  

  262.    stream_.nDeviceChannels[mode] = channels;

  263. @@ -2333,24 +2329,24 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  264.      stream_.mode = DUPLEX;

  265.    else {

  266.      stream_.mode = mode;

  267. -    jack_set_process_callback( handle->client, jackCallbackHandler, (void *) &stream_.callbackInfo );

  268. -    jack_set_xrun_callback( handle->client, jackXrun, (void *) &stream_.apiHandle );

  269. -    jack_on_shutdown( handle->client, jackShutdown, (void *) &stream_.callbackInfo );

  270. +    jackbridge_set_process_callback( handle->client, jackCallbackHandler, (void *) &stream_.callbackInfo );

  271. +    jackbridge_set_xrun_callback( handle->client, jackXrun, (void *) &stream_.apiHandle );

  272. +    jackbridge_on_shutdown( handle->client, jackShutdown, (void *) &stream_.callbackInfo );

  273.    }

  274.  

  275.    // Register our ports.

  276.    char label[64];

  277.    if ( mode == OUTPUT ) {

  278.      for ( unsigned int i=0; i<stream_.nUserChannels[0]; i++ ) {

  279. -      snprintf( label, 64, "outport %d", i );

  280. -      handle->ports[0][i] = jack_port_register( handle->client, (const char *)label,

  281. +      snprintf( label, 64, "audio-out%d", i+1 );

  282. +      handle->ports[0][i] = jackbridge_port_register( handle->client, (const char *)label,

  283.                                                  JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 );

  284.      }

  285.    }

  286.    else {

  287.      for ( unsigned int i=0; i<stream_.nUserChannels[1]; i++ ) {

  288. -      snprintf( label, 64, "inport %d", i );

  289. -      handle->ports[1][i] = jack_port_register( handle->client, (const char *)label,

  290. +      snprintf( label, 64, "audio-in%d", i+1 );

  291. +      handle->ports[1][i] = jackbridge_port_register( handle->client, (const char *)label,

  292.                                                  JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0 );

  293.      }

  294.    }

  295. @@ -2367,7 +2363,7 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  296.   error:

  297.    if ( handle ) {

  298.      pthread_cond_destroy( &handle->condition );

  299. -    jack_client_close( handle->client );

  300. +    jackbridge_client_close( handle->client );

  301.  

  302.      if ( handle->ports[0] ) free( handle->ports[0] );

  303.      if ( handle->ports[1] ) free( handle->ports[1] );

  304. @@ -2403,9 +2399,9 @@ void RtApiJack :: closeStream( void )

  305.    if ( handle ) {

  306.  

  307.      if ( stream_.state == STREAM_RUNNING )

  308. -      jack_deactivate( handle->client );

  309. +      jackbridge_deactivate( handle->client );

  310.  

  311. -    jack_client_close( handle->client );

  312. +    jackbridge_client_close( handle->client );

  313.    }

  314.  

  315.    if ( handle ) {

  316. @@ -2442,8 +2438,8 @@ void RtApiJack :: startStream( void )

  317.    }

  318.  

  319.    JackHandle *handle = (JackHandle *) stream_.apiHandle;

  320. -  int result = jack_activate( handle->client );

  321. -  if ( result ) {

  322. +  bool result = jackbridge_activate( handle->client );

  323. +  if ( ! result ) {

  324.      errorText_ = "RtApiJack::startStream(): unable to activate JACK client!";

  325.      goto unlock;

  326.    }

  327. @@ -2452,8 +2448,8 @@ void RtApiJack :: startStream( void )

  328.  

  329.    // Get the list of available ports.

  330.    if ( shouldAutoconnect_ && (stream_.mode == OUTPUT || stream_.mode == DUPLEX) ) {

  331. -    result = 1;

  332. -    ports = jack_get_ports( handle->client, handle->deviceName[0].c_str(), NULL, JackPortIsInput);

  333. +    result = false;

  334. +    ports = jackbridge_get_ports( handle->client, handle->deviceName[0].c_str(), NULL, JackPortIsInput);

  335.      if ( ports == NULL) {

  336.        errorText_ = "RtApiJack::startStream(): error determining available JACK input ports!";

  337.        goto unlock;

  338. @@ -2463,21 +2459,21 @@ void RtApiJack :: startStream( void )

  339.      // allow the user to select particular channels of a device, we'll

  340.      // just open the first "nChannels" ports with offset.

  341.      for ( unsigned int i=0; i<stream_.nUserChannels[0]; i++ ) {

  342. -      result = 1;

  343. +      result = false;

  344.        if ( ports[ stream_.channelOffset[0] + i ] )

  345. -        result = jack_connect( handle->client, jack_port_name( handle->ports[0][i] ), ports[ stream_.channelOffset[0] + i ] );

  346. -      if ( result ) {

  347. -        free( ports );

  348. +        result = jackbridge_connect( handle->client, jackbridge_port_name( handle->ports[0][i] ), ports[ stream_.channelOffset[0] + i ] );

  349. +      if ( ! result ) {

  350. +        jackbridge_free( ports );

  351.          errorText_ = "RtApiJack::startStream(): error connecting output ports!";

  352.          goto unlock;

  353.        }

  354.      }

  355. -    free(ports);

  356. +    jackbridge_free(ports);

  357.    }

  358.  

  359.    if ( shouldAutoconnect_ && (stream_.mode == INPUT || stream_.mode == DUPLEX) ) {

  360. -    result = 1;

  361. -    ports = jack_get_ports( handle->client, handle->deviceName[1].c_str(), NULL, JackPortIsOutput );

  362. +    result = false;

  363. +    ports = jackbridge_get_ports( handle->client, handle->deviceName[1].c_str(), NULL, JackPortIsOutput );

  364.      if ( ports == NULL) {

  365.        errorText_ = "RtApiJack::startStream(): error determining available JACK output ports!";

  366.        goto unlock;

  367. @@ -2485,16 +2481,16 @@ void RtApiJack :: startStream( void )

  368.  

  369.      // Now make the port connections.  See note above.

  370.      for ( unsigned int i=0; i<stream_.nUserChannels[1]; i++ ) {

  371. -      result = 1;

  372. +      result = false;

  373.        if ( ports[ stream_.channelOffset[1] + i ] )

  374. -        result = jack_connect( handle->client, ports[ stream_.channelOffset[1] + i ], jack_port_name( handle->ports[1][i] ) );

  375. -      if ( result ) {

  376. -        free( ports );

  377. +        result = jackbridge_connect( handle->client, ports[ stream_.channelOffset[1] + i ], jackbridge_port_name( handle->ports[1][i] ) );

  378. +      if ( ! result ) {

  379. +        jackbridge_free( ports );

  380.          errorText_ = "RtApiJack::startStream(): error connecting input ports!";

  381.          goto unlock;

  382.        }

  383.      }

  384. -    free(ports);

  385. +    jackbridge_free(ports);

  386.    }

  387.  

  388.    handle->drainCounter = 0;

  389. @@ -2502,7 +2498,7 @@ void RtApiJack :: startStream( void )

  390.    stream_.state = STREAM_RUNNING;

  391.  

  392.   unlock:

  393. -  if ( result == 0 ) return;

  394. +  if ( result ) return;

  395.    error( RtAudioError::SYSTEM_ERROR );

  396.  }

  397.  

  398. @@ -2524,7 +2520,7 @@ void RtApiJack :: stopStream( void )

  399.      }

  400.    }

  401.  

  402. -  jack_deactivate( handle->client );

  403. +  jackbridge_deactivate( handle->client );

  404.    stream_.state = STREAM_STOPPED;

  405.  }

  406.  

  407. @@ -2546,7 +2542,7 @@ void RtApiJack :: abortStream( void )

  408.  // This function will be called by a spawned thread when the user

  409.  // callback function signals that the stream should be stopped or

  410.  // aborted.  It is necessary to handle it this way because the

  411. -// callbackEvent() function must return before the jack_deactivate()

  412. +// callbackEvent() function must return before the jackbridge_deactivate()

  413.  // function will return.

  414.  static void *jackStopStream( void *ptr )

  415.  {

  416. @@ -2555,6 +2551,8 @@ static void *jackStopStream( void *ptr )

  417.  

  418.    object->stopStream();

  419.    pthread_exit( NULL );

  420. +

  421. +  return NULL;

  422.  }

  423.  

  424.  bool RtApiJack :: callbackEvent( unsigned long nframes )

  425. @@ -2621,7 +2619,7 @@ bool RtApiJack :: callbackEvent( unsigned long nframes )

  426.      if ( handle->drainCounter > 1 ) { // write zeros to the output stream

  427.  

  428.        for ( unsigned int i=0; i<stream_.nDeviceChannels[0]; i++ ) {

  429. -        jackbuffer = (jack_default_audio_sample_t *) jack_port_get_buffer( handle->ports[0][i], (jack_nframes_t) nframes );

  430. +        jackbuffer = (jack_default_audio_sample_t *) jackbridge_port_get_buffer( handle->ports[0][i], (jack_nframes_t) nframes );

  431.          memset( jackbuffer, 0, bufferBytes );

  432.        }

  433.  

  434. @@ -2631,13 +2629,13 @@ bool RtApiJack :: callbackEvent( unsigned long nframes )

  435.        convertBuffer( stream_.deviceBuffer, stream_.userBuffer[0], stream_.convertInfo[0] );

  436.  

  437.        for ( unsigned int i=0; i<stream_.nDeviceChannels[0]; i++ ) {

  438. -        jackbuffer = (jack_default_audio_sample_t *) jack_port_get_buffer( handle->ports[0][i], (jack_nframes_t) nframes );

  439. +        jackbuffer = (jack_default_audio_sample_t *) jackbridge_port_get_buffer( handle->ports[0][i], (jack_nframes_t) nframes );

  440.          memcpy( jackbuffer, &stream_.deviceBuffer[i*bufferBytes], bufferBytes );

  441.        }

  442.      }

  443.      else { // no buffer conversion

  444.        for ( unsigned int i=0; i<stream_.nUserChannels[0]; i++ ) {

  445. -        jackbuffer = (jack_default_audio_sample_t *) jack_port_get_buffer( handle->ports[0][i], (jack_nframes_t) nframes );

  446. +        jackbuffer = (jack_default_audio_sample_t *) jackbridge_port_get_buffer( handle->ports[0][i], (jack_nframes_t) nframes );

  447.          memcpy( jackbuffer, &stream_.userBuffer[0][i*bufferBytes], bufferBytes );

  448.        }

  449.      }

  450. @@ -2653,14 +2651,14 @@ bool RtApiJack :: callbackEvent( unsigned long nframes )

  451.  

  452.      if ( stream_.doConvertBuffer[1] ) {

  453.        for ( unsigned int i=0; i<stream_.nDeviceChannels[1]; i++ ) {

  454. -        jackbuffer = (jack_default_audio_sample_t *) jack_port_get_buffer( handle->ports[1][i], (jack_nframes_t) nframes );

  455. +        jackbuffer = (jack_default_audio_sample_t *) jackbridge_port_get_buffer( handle->ports[1][i], (jack_nframes_t) nframes );

  456.          memcpy( &stream_.deviceBuffer[i*bufferBytes], jackbuffer, bufferBytes );

  457.        }

  458.        convertBuffer( stream_.userBuffer[1], stream_.deviceBuffer, stream_.convertInfo[1] );

  459.      }

  460.      else { // no buffer conversion

  461.        for ( unsigned int i=0; i<stream_.nUserChannels[1]; i++ ) {

  462. -        jackbuffer = (jack_default_audio_sample_t *) jack_port_get_buffer( handle->ports[1][i], (jack_nframes_t) nframes );

  463. +        jackbuffer = (jack_default_audio_sample_t *) jackbridge_port_get_buffer( handle->ports[1][i], (jack_nframes_t) nframes );

  464.          memcpy( &stream_.userBuffer[1][i*bufferBytes], jackbuffer, bufferBytes );

  465.        }

  466.      }

  467. @@ -2691,10 +2689,10 @@ bool RtApiJack :: callbackEvent( unsigned long nframes )

  468.  // on information found in

  469.  // http://www.cs.wustl.edu/~schmidt/win32-cv-1.html.

  470.  

  471. -#include "asiosys.h"

  472. -#include "asio.h"

  473. -#include "iasiothiscallresolver.h"

  474. -#include "asiodrivers.h"

  475. +#include "asio.cpp"

  476. +#include "asiodrivers.cpp"

  477. +#include "asiolist.cpp"

  478. +#include "iasiothiscallresolver.cpp"

  479.  #include <cmath>

  480.  

  481.  static AsioDrivers drivers;

  482. @@ -8012,6 +8010,8 @@ static void *alsaCallbackHandler( void *ptr )

  483.    }

  484.  

  485.    pthread_exit( NULL );

  486. +

  487. +  return NULL;

  488.  }

  489.  

  490.  //******************** End of __LINUX_ALSA__ *********************//

  491. @@ -8092,6 +8092,8 @@ static void *pulseaudio_callback( void * user )

  492.    }

  493.  

  494.    pthread_exit( NULL );

  495. +

  496. +  return NULL;

  497.  }

  498.  

  499.  void RtApiPulse::closeStream( void )

  500. @@ -9446,6 +9448,8 @@ static void *ossCallbackHandler( void *ptr )

  501.    }

  502.  

  503.    pthread_exit( NULL );

  504. +

  505. +  return NULL;

  506.  }

  507.  

  508.  //******************** End of __LINUX_OSS__ *********************//

  509. diff --git a/RtAudio.h b/RtAudio.h

  510. index 34a2534..4c32cab 100644

  511. --- a/RtAudio.h

  512. +++ b/RtAudio.h

  513. @@ -46,16 +46,7 @@

  514.  #define __RTAUDIO_H

  515.  

  516.  #define RTAUDIO_VERSION "5.0.0"

  517. -

  518. -#if defined _WIN32 || defined __CYGWIN__

  519. -  #define RTAUDIO_DLL_PUBLIC

  520. -#else

  521. -  #if __GNUC__ >= 4

  522. -    #define RTAUDIO_DLL_PUBLIC __attribute__( (visibility( "default" )) )

  523. -  #else

  524. -    #define RTAUDIO_DLL_PUBLIC

  525. -  #endif

  526. -#endif

  527. +#define RTAUDIO_DLL_PUBLIC

  528.  

  529.  #include <string>

  530.  #include <vector>

  531. @@ -416,7 +407,7 @@ class RTAUDIO_DLL_PUBLIC RtAudio

  532.    ~RtAudio();

  533.  

  534.    //! Returns the audio API specifier for the current instance of RtAudio.

  535. -  RtAudio::Api getCurrentApi( void );

  536. +  RtAudio::Api getCurrentApi( void ) const;

  537.  

  538.    //! A public function that queries for the number of audio devices available.

  539.    /*!

  540. @@ -687,7 +678,7 @@ public:

  541.  

  542.    RtApi();

  543.    virtual ~RtApi();

  544. -  virtual RtAudio::Api getCurrentApi( void ) = 0;

  545. +  virtual RtAudio::Api getCurrentApi( void ) const = 0;

  546.    virtual unsigned int getDeviceCount( void ) = 0;

  547.    virtual RtAudio::DeviceInfo getDeviceInfo( unsigned int device ) = 0;

  548.    virtual unsigned int getDefaultInputDevice( void );

  549. @@ -836,7 +827,7 @@ protected:

  550.  //

  551.  // **************************************************************** //

  552.  

  553. -inline RtAudio::Api RtAudio :: getCurrentApi( void ) { return rtapi_->getCurrentApi(); }

  554. +inline RtAudio::Api RtAudio :: getCurrentApi( void ) const { return rtapi_->getCurrentApi(); }

  555.  inline unsigned int RtAudio :: getDeviceCount( void ) { return rtapi_->getDeviceCount(); }

  556.  inline RtAudio::DeviceInfo RtAudio :: getDeviceInfo( unsigned int device ) { return rtapi_->getDeviceInfo( device ); }

  557.  inline unsigned int RtAudio :: getDefaultInputDevice( void ) { return rtapi_->getDefaultInputDevice(); }

  558. @@ -865,7 +856,7 @@ public:

  559.  

  560.    RtApiCore();

  561.    ~RtApiCore();

  562. -  RtAudio::Api getCurrentApi( void ) { return RtAudio::MACOSX_CORE; }

  563. +  RtAudio::Api getCurrentApi( void ) const { return RtAudio::MACOSX_CORE; }

  564.    unsigned int getDeviceCount( void );

  565.    RtAudio::DeviceInfo getDeviceInfo( unsigned int device );

  566.    unsigned int getDefaultOutputDevice( void );

  567. @@ -903,7 +894,7 @@ public:

  568.  

  569.    RtApiJack();

  570.    ~RtApiJack();

  571. -  RtAudio::Api getCurrentApi( void ) { return RtAudio::UNIX_JACK; }

  572. +  RtAudio::Api getCurrentApi( void ) const { return RtAudio::UNIX_JACK; }

  573.    unsigned int getDeviceCount( void );

  574.    RtAudio::DeviceInfo getDeviceInfo( unsigned int device );

  575.    void closeStream( void );

  576. @@ -938,7 +929,7 @@ public:

  577.  

  578.    RtApiAsio();

  579.    ~RtApiAsio();

  580. -  RtAudio::Api getCurrentApi( void ) { return RtAudio::WINDOWS_ASIO; }

  581. +  RtAudio::Api getCurrentApi( void ) const { return RtAudio::WINDOWS_ASIO; }

  582.    unsigned int getDeviceCount( void );

  583.    RtAudio::DeviceInfo getDeviceInfo( unsigned int device );

  584.    void closeStream( void );

  585. @@ -974,7 +965,7 @@ public:

  586.  

  587.    RtApiDs();

  588.    ~RtApiDs();

  589. -  RtAudio::Api getCurrentApi( void ) { return RtAudio::WINDOWS_DS; }

  590. +  RtAudio::Api getCurrentApi( void ) const { return RtAudio::WINDOWS_DS; }

  591.    unsigned int getDeviceCount( void );

  592.    unsigned int getDefaultOutputDevice( void );

  593.    unsigned int getDefaultInputDevice( void );

  594. @@ -1015,7 +1006,7 @@ public:

  595.    RtApiWasapi();

  596.    ~RtApiWasapi();

  597.  

  598. -  RtAudio::Api getCurrentApi( void ) { return RtAudio::WINDOWS_WASAPI; }

  599. +  RtAudio::Api getCurrentApi( void ) const { return RtAudio::WINDOWS_WASAPI; }

  600.    unsigned int getDeviceCount( void );

  601.    RtAudio::DeviceInfo getDeviceInfo( unsigned int device );

  602.    unsigned int getDefaultOutputDevice( void );

  603. @@ -1050,7 +1041,7 @@ public:

  604.  

  605.    RtApiAlsa();

  606.    ~RtApiAlsa();

  607. -  RtAudio::Api getCurrentApi() { return RtAudio::LINUX_ALSA; }

  608. +  RtAudio::Api getCurrentApi() const { return RtAudio::LINUX_ALSA; }

  609.    unsigned int getDeviceCount( void );

  610.    RtAudio::DeviceInfo getDeviceInfo( unsigned int device );

  611.    void closeStream( void );

  612. @@ -1082,7 +1073,7 @@ class RtApiPulse: public RtApi

  613.  {

  614.  public:

  615.    ~RtApiPulse();

  616. -  RtAudio::Api getCurrentApi() { return RtAudio::LINUX_PULSE; }

  617. +  RtAudio::Api getCurrentApi() const { return RtAudio::LINUX_PULSE; }

  618.    unsigned int getDeviceCount( void );

  619.    RtAudio::DeviceInfo getDeviceInfo( unsigned int device );

  620.    void closeStream( void );

  621. @@ -1116,7 +1107,7 @@ public:

  622.  

  623.    RtApiOss();

  624.    ~RtApiOss();

  625. -  RtAudio::Api getCurrentApi() { return RtAudio::LINUX_OSS; }

  626. +  RtAudio::Api getCurrentApi() const { return RtAudio::LINUX_OSS; }

  627.    unsigned int getDeviceCount( void );

  628.    RtAudio::DeviceInfo getDeviceInfo( unsigned int device );

  629.    void closeStream( void );

  630. @@ -1147,7 +1138,7 @@ class RtApiDummy: public RtApi

  631.  public:

  632.  

  633.    RtApiDummy() { errorText_ = "RtApiDummy: This class provides no functionality."; error( RtAudioError::WARNING ); }

  634. -  RtAudio::Api getCurrentApi( void ) { return RtAudio::RTAUDIO_DUMMY; }

  635. +  RtAudio::Api getCurrentApi( void ) const { return RtAudio::RTAUDIO_DUMMY; }

  636.    unsigned int getDeviceCount( void ) { return 0; }

  637.    RtAudio::DeviceInfo getDeviceInfo( unsigned int /*device*/ ) { RtAudio::DeviceInfo info; return info; }

  638.    void closeStream( void ) {}

  639. diff --git a/include/iasiodrv.h b/include/iasiodrv.h

  640. index 64d2dbb..860675c 100644

  641. --- a/include/iasiodrv.h

  642. +++ b/include/iasiodrv.h

  643. @@ -1,3 +1,4 @@

  644. +#pragma once

  645.  #include "asiosys.h"

  646.  #include "asio.h"

  647.