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.
4742 Commits
16 Branches
14GB
Tree: 681fd1dd54
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '681fd1dd54'
${ noResults }
Carla/source/modules/rtaudio.diff

731 lines
29KB
Raw Blame History 

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

  2. index 2ac2179..f846b43 100644

  3. --- a/RtAudio.cpp

  4. +++ b/RtAudio.cpp

  5. @@ -76,7 +76,7 @@ const unsigned int RtApi::SAMPLE_RATES[] = {

  6.      return s;

  7.    }

  8.  

  9. -#elif defined(__LINUX_ALSA__) || defined(__LINUX_PULSE__) || defined(__UNIX_JACK__) || defined(__LINUX_OSS__) || defined(__MACOSX_CORE__)

  10. +#elif defined(__LINUX_ALSA__) || defined(__UNIX_PULSE__) || defined(__UNIX_JACK__) || defined(__LINUX_OSS__) || defined(__MACOSX_CORE__)

  11.    // pthread API

  12.    #define MUTEX_INITIALIZE(A) pthread_mutex_init(A, NULL)

  13.    #define MUTEX_DESTROY(A)    pthread_mutex_destroy(A)

  14. @@ -110,8 +110,8 @@ void RtAudio :: getCompiledApi( std::vector<RtAudio::Api> &apis )

  15.  #if defined(__LINUX_ALSA__)

  16.    apis.push_back( LINUX_ALSA );

  17.  #endif

  18. -#if defined(__LINUX_PULSE__)

  19. -  apis.push_back( LINUX_PULSE );

  20. +#if defined(__UNIX_PULSE__)

  21. +  apis.push_back( UNIX_PULSE );

  22.  #endif

  23.  #if defined(__LINUX_OSS__)

  24.    apis.push_back( LINUX_OSS );

  25. @@ -147,8 +147,8 @@ void RtAudio :: openRtApi( RtAudio::Api api )

  26.    if ( api == LINUX_ALSA )

  27.      rtapi_ = new RtApiAlsa();

  28.  #endif

  29. -#if defined(__LINUX_PULSE__)

  30. -  if ( api == LINUX_PULSE )

  31. +#if defined(__UNIX_PULSE__)

  32. +  if ( api == UNIX_PULSE )

  33.      rtapi_ = new RtApiPulse();

  34.  #endif

  35.  #if defined(__LINUX_OSS__)

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

  37.      return;

  38.    }

  39.  

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

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

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

  43.      error( RtAudioError::INVALID_USE );

  44.      return;

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

  46.  

  47.    object->stopStream();

  48.    pthread_exit( NULL );

  49. +

  50. +  return NULL;

  51.  }

  52.  

  53.  bool RtApiCore :: callbackEvent( AudioDeviceID deviceId,

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

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

  56.  // stream cannot be opened.

  57.  

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

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

  60.  #include <unistd.h>

  61.  #include <cstdio>

  62.  

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

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

  65.  };

  66.  

  67. -#if !defined(__RTAUDIO_DEBUG__)

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

  69. -#endif

  70. -

  71.  RtApiJack :: RtApiJack()

  72.      :shouldAutoconnect_(true) {

  73.    // Nothing to do here.

  74. -#if !defined(__RTAUDIO_DEBUG__)

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

  76. -  jack_set_error_function( &jackSilentError );

  77. -#endif

  78.  }

  79.  

  80.  RtApiJack :: ~RtApiJack()

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

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

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

  84.    jack_status_t *status = NULL;

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

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

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

  88.  

  89.    const char **ports;

  90.    std::string port, previousPort;

  91.    unsigned int nChannels = 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. @@ -1988,10 +1982,10 @@ unsigned int RtApiJack :: getDeviceCount( void )

  98.          }

  99.        }

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

  101. -    free( ports );

  102. +    jackbridge_free( ports );

  103.    }

  104.  

  105. -  jack_client_close( client );

  106. +  jackbridge_client_close( client );

  107.    return nDevices;

  108.  }

  109.  

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

  111.  

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

  113.    jack_status_t *status = NULL;

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

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

  116.    if ( client == 0 ) {

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

  118.      error( RtAudioError::WARNING );

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

  120.    const char **ports;

  121.    std::string port, previousPort;

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

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

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

  125.    if ( ports ) {

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

  127.      size_t iColon = 0;

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

  129.          }

  130.        }

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

  132. -    free( ports );

  133. +    jackbridge_free( ports );

  134.    }

  135.  

  136.    if ( device >= nDevices ) {

  137. -    jack_client_close( client );

  138. +    jackbridge_client_close( client );

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

  140.      error( RtAudioError::INVALID_USE );

  141.      return info;

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

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

  144.    info.sampleRates.clear();

  145.  

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

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

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

  149.  

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

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

  152.    unsigned int nChannels = 0;

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

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

  155.    if ( ports ) {

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

  157. -    free( ports );

  158. +    jackbridge_free( ports );

  159.      info.outputChannels = nChannels;

  160.    }

  161.  

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

  163.    nChannels = 0;

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

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

  166.    if ( ports ) {

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

  168. -    free( ports );

  169. +    jackbridge_free( ports );

  170.      info.inputChannels = nChannels;

  171.    }

  172.  

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

  174. -    jack_client_close(client);

  175. +    jackbridge_client_close(client);

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

  177.      error( RtAudioError::WARNING );

  178.      return info;

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

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

  181.      info.isDefaultInput = true;

  182.  

  183. -  jack_client_close(client);

  184. +  jackbridge_client_close(client);

  185.    info.probed = true;

  186.    return info;

  187.  }

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

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

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

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

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

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

  194.  static void *jackCloseStream( void *ptr )

  195.  {

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

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

  198.    object->closeStream();

  199.  

  200.    pthread_exit( NULL );

  201. +

  202. +  return NULL;

  203.  }

  204.  static void jackShutdown( void *infoPointer )

  205.  {

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

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

  208.      jack_status_t *status = NULL;

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

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

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

  212.      else

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

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

  215.      if ( client == 0 ) {

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

  217.        error( RtAudioError::WARNING );

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

  219.    const char **ports;

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

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

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

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

  224.    if ( ports ) {

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

  226.      size_t iColon = 0;

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

  228.          }

  229.        }

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

  231. -    free( ports );

  232. +    jackbridge_free( ports );

  233.    }

  234.  

  235.    if ( device >= nDevices ) {

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

  237.    unsigned int nChannels = 0;

  238.    unsigned long flag = JackPortIsInput;

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

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

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

  242.    if ( ports ) {

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

  244. -    free( ports );

  245. +    jackbridge_free( ports );

  246.    }

  247.  

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

  249. @@ -2211,29 +2207,26 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

  250.    }

  251.  

  252.    // Check the jack server sample rate.

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

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

  255.    if ( sampleRate != jackRate ) {

  256. -    jack_client_close( client );

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

  258. -    errorText_ = errorStream_.str();

  259. -    return FAILURE;

  260. +    std::cerr << "RtApiJack::probeDeviceOpen: the requested sample rate (" << sampleRate << ") is different than the JACK server rate (" << jackRate << ")." << std::endl;

  261.    }

  262.    stream_.sampleRate = jackRate;

  263.  

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

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

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

  267.    if ( ports[ firstChannel ] ) {

  268.      // Added by Ge Wang

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

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

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

  272.      // get the latency range

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

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

  275.      // be optimistic, use the min!

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

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

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

  279.    }

  280. -  free( ports );

  281. +  jackbridge_free( ports );

  282.  

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

  284.    stream_.deviceFormat[mode] = RTAUDIO_FLOAT32;

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

  286.  

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

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

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

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

  291.    *bufferSize = stream_.bufferSize;

  292.  

  293.    stream_.nDeviceChannels[mode] = channels;

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

  295.      stream_.mode = DUPLEX;

  296.    else {

  297.      stream_.mode = mode;

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

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

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

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

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

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

  304.    }

  305.  

  306.    // Register our ports.

  307.    char label[64];

  308.    if ( mode == OUTPUT ) {

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

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

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

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

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

  314.                                                  JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 );

  315.      }

  316.    }

  317.    else {

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

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

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

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

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

  323.                                                  JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0 );

  324.      }

  325.    }

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

  327.   error:

  328.    if ( handle ) {

  329.      pthread_cond_destroy( &handle->condition );

  330. -    jack_client_close( handle->client );

  331. +    jackbridge_client_close( handle->client );

  332.  

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

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

  335. @@ -2403,9 +2396,9 @@ void RtApiJack :: closeStream( void )

  336.    if ( handle ) {

  337.  

  338.      if ( stream_.state == STREAM_RUNNING )

  339. -      jack_deactivate( handle->client );

  340. +      jackbridge_deactivate( handle->client );

  341.  

  342. -    jack_client_close( handle->client );

  343. +    jackbridge_client_close( handle->client );

  344.    }

  345.  

  346.    if ( handle ) {

  347. @@ -2442,8 +2435,8 @@ void RtApiJack :: startStream( void )

  348.    }

  349.  

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

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

  352. -  if ( result ) {

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

  354. +  if ( ! result ) {

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

  356.      goto unlock;

  357.    }

  358. @@ -2452,8 +2445,8 @@ void RtApiJack :: startStream( void )

  359.  

  360.    // Get the list of available ports.

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

  362. -    result = 1;

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

  364. +    result = false;

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

  366.      if ( ports == NULL) {

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

  368.        goto unlock;

  369. @@ -2463,21 +2456,21 @@ void RtApiJack :: startStream( void )

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

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

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

  373. -      result = 1;

  374. +      result = false;

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

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

  377. -      if ( result ) {

  378. -        free( ports );

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

  380. +      if ( ! result ) {

  381. +        jackbridge_free( ports );

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

  383.          goto unlock;

  384.        }

  385.      }

  386. -    free(ports);

  387. +    jackbridge_free(ports);

  388.    }

  389.  

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

  391. -    result = 1;

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

  393. +    result = false;

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

  395.      if ( ports == NULL) {

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

  397.        goto unlock;

  398. @@ -2485,16 +2478,16 @@ void RtApiJack :: startStream( void )

  399.  

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

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

  402. -      result = 1;

  403. +      result = false;

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

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

  406. -      if ( result ) {

  407. -        free( ports );

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

  409. +      if ( ! result ) {

  410. +        jackbridge_free( ports );

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

  412.          goto unlock;

  413.        }

  414.      }

  415. -    free(ports);

  416. +    jackbridge_free(ports);

  417.    }

  418.  

  419.    handle->drainCounter = 0;

  420. @@ -2502,7 +2495,7 @@ void RtApiJack :: startStream( void )

  421.    stream_.state = STREAM_RUNNING;

  422.  

  423.   unlock:

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

  425. +  if ( result ) return;

  426.    error( RtAudioError::SYSTEM_ERROR );

  427.  }

  428.  

  429. @@ -2524,7 +2517,7 @@ void RtApiJack :: stopStream( void )

  430.      }

  431.    }

  432.  

  433. -  jack_deactivate( handle->client );

  434. +  jackbridge_deactivate( handle->client );

  435.    stream_.state = STREAM_STOPPED;

  436.  }

  437.  

  438. @@ -2546,7 +2539,7 @@ void RtApiJack :: abortStream( void )

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

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

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

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

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

  444.  // function will return.

  445.  static void *jackStopStream( void *ptr )

  446.  {

  447. @@ -2555,6 +2548,8 @@ static void *jackStopStream( void *ptr )

  448.  

  449.    object->stopStream();

  450.    pthread_exit( NULL );

  451. +

  452. +  return NULL;

  453.  }

  454.  

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

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

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

  458.  

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

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

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

  462.          memset( jackbuffer, 0, bufferBytes );

  463.        }

  464.  

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

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

  467.  

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

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

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

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

  472.        }

  473.      }

  474.      else { // no buffer conversion

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

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

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

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

  479.        }

  480.      }

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

  482.  

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

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

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

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

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

  488.        }

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

  490.      }

  491.      else { // no buffer conversion

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

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

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

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

  496.        }

  497.      }

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

  499.  // on information found in

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

  501.  

  502. -#include "asiosys.h"

  503. -#include "asio.h"

  504. -#include "iasiothiscallresolver.h"

  505. -#include "asiodrivers.h"

  506. +#include "asio.cpp"

  507. +#include "asiodrivers.cpp"

  508. +#include "asiolist.cpp"

  509. +#include "iasiothiscallresolver.cpp"

  510.  #include <cmath>

  511.  

  512.  static AsioDrivers drivers;

  513. @@ -5487,8 +5482,8 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned

  514.    // two.  This is a judgement call and a value of two is probably too

  515.    // low for capture, but it should work for playback.

  516.    int nBuffers = 0;

  517. -  if ( options ) nBuffers = options->numberOfBuffers;

  518.    if ( options && options->flags & RTAUDIO_MINIMIZE_LATENCY ) nBuffers = 2;

  519. +  if ( options && options->numberOfBuffers > 0 ) nBuffers = options->numberOfBuffers;

  520.    if ( nBuffers < 2 ) nBuffers = 3;

  521.  

  522.    // Check the lower range of the user-specified buffer size and set

  523. @@ -8012,12 +8007,14 @@ static void *alsaCallbackHandler( void *ptr )

  524.    }

  525.  

  526.    pthread_exit( NULL );

  527. +

  528. +  return NULL;

  529.  }

  530.  

  531.  //******************** End of __LINUX_ALSA__ *********************//

  532.  #endif

  533.  

  534. -#if defined(__LINUX_PULSE__)

  535. +#if defined(__UNIX_PULSE__)

  536.  

  537.  // Code written by Peter Meerwald, pmeerw@pmeerw.net

  538.  // and Tristan Matthews.

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

  540.    }

  541.  

  542.    pthread_exit( NULL );

  543. +

  544. +  return NULL;

  545.  }

  546.  

  547.  void RtApiPulse::closeStream( void )

  548. @@ -8502,7 +8501,7 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode,

  549.    return FAILURE;

  550.  }

  551.  

  552. -//******************** End of __LINUX_PULSE__ *********************//

  553. +//******************** End of __UNIX_PULSE__ *********************//

  554.  #endif

  555.  

  556.  #if defined(__LINUX_OSS__)

  557. @@ -9446,6 +9445,8 @@ static void *ossCallbackHandler( void *ptr )

  558.    }

  559.  

  560.    pthread_exit( NULL );

  561. +

  562. +  return NULL;

  563.  }

  564.  

  565.  //******************** End of __LINUX_OSS__ *********************//

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

  567. index 34a2534..c28fefc 100644

  568. --- a/RtAudio.h

  569. +++ b/RtAudio.h

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

  571.  #define __RTAUDIO_H

  572.  

  573.  #define RTAUDIO_VERSION "5.0.0"

  574. -

  575. -#if defined _WIN32 || defined __CYGWIN__

  576. -  #define RTAUDIO_DLL_PUBLIC

  577. -#else

  578. -  #if __GNUC__ >= 4

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

  580. -  #else

  581. -    #define RTAUDIO_DLL_PUBLIC

  582. -  #endif

  583. -#endif

  584. +#define RTAUDIO_DLL_PUBLIC

  585.  

  586.  #include <string>

  587.  #include <vector>

  588. @@ -278,8 +269,8 @@ class RTAUDIO_DLL_PUBLIC RtAudio

  589.    enum Api {

  590.      UNSPECIFIED,    /*!< Search for a working compiled API. */

  591.      LINUX_ALSA,     /*!< The Advanced Linux Sound Architecture API. */

  592. -    LINUX_PULSE,    /*!< The Linux PulseAudio API. */

  593.      LINUX_OSS,      /*!< The Linux Open Sound System API. */

  594. +    UNIX_PULSE,     /*!< The PulseAudio API. */

  595.      UNIX_JACK,      /*!< The Jack Low-Latency Audio Server API. */

  596.      MACOSX_CORE,    /*!< Macintosh OS-X Core Audio API. */

  597.      WINDOWS_WASAPI, /*!< The Microsoft WASAPI API. */

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

  599.    ~RtAudio();

  600.  

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

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

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

  604.  

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

  606.    /*!

  607. @@ -597,7 +588,7 @@ class RTAUDIO_DLL_PUBLIC RtAudio

  608.    typedef uintptr_t ThreadHandle;

  609.    typedef CRITICAL_SECTION StreamMutex;

  610.  

  611. -#elif defined(__LINUX_ALSA__) || defined(__LINUX_PULSE__) || defined(__UNIX_JACK__) || defined(__LINUX_OSS__) || defined(__MACOSX_CORE__)

  612. +#elif defined(__LINUX_ALSA__) || defined(__UNIX_PULSE__) || defined(__UNIX_JACK__) || defined(__LINUX_OSS__) || defined(__MACOSX_CORE__)

  613.    // Using pthread library for various flavors of unix.

  614.    #include <pthread.h>

  615.  

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

  617.  

  618.    RtApi();

  619.    virtual ~RtApi();

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

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

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

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

  624.    virtual unsigned int getDefaultInputDevice( void );

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

  626.  //

  627.  // **************************************************************** //

  628.  

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

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

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

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

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

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

  635.  

  636.    RtApiCore();

  637.    ~RtApiCore();

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

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

  640.    unsigned int getDeviceCount( void );

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

  642.    unsigned int getDefaultOutputDevice( void );

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

  644.  

  645.    RtApiJack();

  646.    ~RtApiJack();

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

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

  649.    unsigned int getDeviceCount( void );

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

  651.    void closeStream( void );

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

  653.  

  654.    RtApiAsio();

  655.    ~RtApiAsio();

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

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

  658.    unsigned int getDeviceCount( void );

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

  660.    void closeStream( void );

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

  662.  

  663.    RtApiDs();

  664.    ~RtApiDs();

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

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

  667.    unsigned int getDeviceCount( void );

  668.    unsigned int getDefaultOutputDevice( void );

  669.    unsigned int getDefaultInputDevice( void );

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

  671.    RtApiWasapi();

  672.    ~RtApiWasapi();

  673.  

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

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

  676.    unsigned int getDeviceCount( void );

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

  678.    unsigned int getDefaultOutputDevice( void );

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

  680.  

  681.    RtApiAlsa();

  682.    ~RtApiAlsa();

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

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

  685.    unsigned int getDeviceCount( void );

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

  687.    void closeStream( void );

  688. @@ -1076,13 +1067,13 @@ public:

  689.  

  690.  #endif

  691.  

  692. -#if defined(__LINUX_PULSE__)

  693. +#if defined(__UNIX_PULSE__)

  694.  

  695.  class RtApiPulse: public RtApi

  696.  {

  697.  public:

  698.    ~RtApiPulse();

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

  700. +  RtAudio::Api getCurrentApi() const { return RtAudio::UNIX_PULSE; }

  701.    unsigned int getDeviceCount( void );

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

  703.    void closeStream( void );

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

  705.  

  706.    RtApiOss();

  707.    ~RtApiOss();

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

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

  710.    unsigned int getDeviceCount( void );

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

  712.    void closeStream( void );

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

  714.  public:

  715.  

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

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

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

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

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

  721.    void closeStream( void ) {}

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

  723. index 64d2dbb..860675c 100644

  724. --- a/include/iasiodrv.h

  725. +++ b/include/iasiodrv.h

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

  727. +#pragma once

  728.  #include "asiosys.h"

  729.  #include "asio.h"

  730.