Merge branch 'master' into no-self-connect

Conflicts:
	common/JackEngine.cpp
	common/JackServerGlobals.cpp
	common/Jackdmp.cpp

ChangeLog

@@ -27,11 +27,102 @@ Mario Lang
 Arnold Krille
 Jan Engelhardt
 Adrian Knoth
-David Garcia Garzon
+David Garcia Garzon
+Valerio Pilo
 
 ---------------------------
  Jackdmp changes log
----------------------------
+---------------------------
+
+2011-03-13 Stephane Letz <[email protected]>
+
+ * Rework internal slave driver management, JackServerGlobals now handle same parameters as jackdmp.
+
+2011-03-11 Stephane Letz <[email protected]>
+
+ * Correct JackNetMaster::SetBufferSize.
+ * Use jack_default_audio_sample_t instead of float consistently, fix ticket #201."
+ * -X now allows to add several slave backends, add -I to load several internal clients.
+
+2011-03-10 Stephane Letz <[email protected]>
+
+ * Latency callback must always be activated.
+ * Correct TopologicalSort. 
+ * Add jack_midi_dump client.
+ * Synchronize netjack1 with JACK1 version.
+ * Synchronize jack_connect/jack_disconnect with JACK1 version.
+
+2011-03-09 Stephane Letz <[email protected]>
+
+ * jack_client_has_session_callback implementation.
+ * Fix jdelay for new latency API.
+ * Check requested buffer size and limit to 1..8192 - avoids wierd behaviour caused by jack_bufsize foobar.
+ * jack_port_type_get_buffer_size implementation.
+ * Stop using alloca and allocate buffer on the heap for alsa_io.
+ * Rename jdelay to jack_iodelay as per Fons' request.
+ * Call buffer size callback in activate (actually this is done on client side in the RT thread Init method).
+ * JackEngine::ComputeTotalLatencies in progress.
+
+2011-03-08 Stephane Letz <[email protected]>
+
+ * Use of latency range in all backends.
+ * ComputeTotalLatencies now a client/server call.
+ * Add latent test client for latency API.
+ * Also print playback and capture latency in jack_lsp.
+
+2011-03-04 Stephane Letz <[email protected]>
+
+ * Revert r4119 (RT notification in the server). JackAudioDriver::ProcessSync now skip backend write in case of graph process failure.
+ * Fix incorrect error codes in alsa/usx2y.c and alsa/JackAlsaDriver.cpp.
+ * Synchronize public headers with JACK1. Update OSX project.
+ * New latency API implementation (in progress).
+
+2011-02-09 Stephane Letz <[email protected]>
+
+ * Remove JackPortIsActive flag.
+
+2011-02-07 Stephane Letz <[email protected]>
+
+ * Valerio Pilo second CAS for ARMv7 patch.
+
+2011-02-03 Stephane Letz <[email protected]>
+
+ * Valerio Pilo CAS for ARMv7 patch.
+
+2011-01-11 Stephane Letz <[email protected]>
+
+ * Adrian Knoth jack_lsp patch.
+
+2010-11-17 Stephane Letz <[email protected]>
+
+ * ALSA backend : suspend/resume handling (jack1 r4075).
+ * Correct dummy driver.
+
+2010-11-05 Stephane Letz <[email protected]>
+
+ * In jackdmp.cpp, jackctl_setup_signals moved before jackctl_server_start. 
+ * Correct symbols export in backends on OSX.
+
+2010-11-03 Stephane Letz <[email protected]>
+
+ * Improve backend error handling: fatal error returned by Read/Write now cause a Process failure (so a thread exit for blocking backends). Recoverable ones (XRuns..) are now treated internally in ALSA, FreeBob and FFADO backends.
+
+2010-10-30 Stephane Letz <[email protected]>
+
+ * Correct JackServer::Open to avoid a race when control API is used on OSX. 
+
+2010-10-29 Stephane Letz <[email protected]>
+
+ * Correct lsp.c code.
+ * Add note about unique port-name requirement.
+
+2010-09-08 Stephane Letz <[email protected]>
+
+ * Sync JackAlsaDriver::alsa_driver_check_card_type with JACK1 backend.
+
+2010-08-30 Stephane Letz <[email protected]>
+
+ * Version 1.9.7 started.
 
 2010-08-25 Stephane Letz <[email protected]>
 

common/JackAudioAdapter.cpp

@@ -36,17 +36,17 @@ namespace Jack
  int JackAudioAdapter::Process (jack_nframes_t frames, void* arg)
  {
  JackAudioAdapter* adapter = static_cast<JackAudioAdapter*>(arg);
- float* inputBuffer[adapter->fAudioAdapter->GetInputs()];
- float* outputBuffer[adapter->fAudioAdapter->GetOutputs()];
+ jack_default_audio_sample_t* inputBuffer[adapter->fAudioAdapter->GetInputs()];
+ jack_default_audio_sample_t* outputBuffer[adapter->fAudioAdapter->GetOutputs()];
 
  // Always clear output
  for (int i = 0; i < adapter->fAudioAdapter->GetInputs(); i++) {
- inputBuffer[i] = (float*)jack_port_get_buffer(adapter->fCapturePortList[i], frames);
- memset(inputBuffer[i], 0, frames * sizeof(float));
+ inputBuffer[i] = (jack_default_audio_sample_t*)jack_port_get_buffer(adapter->fCapturePortList[i], frames);
+ memset(inputBuffer[i], 0, frames * sizeof(jack_default_audio_sample_t));
  }
 
  for (int i = 0; i < adapter->fAudioAdapter->GetOutputs(); i++) {
- outputBuffer[i] = (float*)jack_port_get_buffer(adapter->fPlaybackPortList[i], frames);
+ outputBuffer[i] = (jack_default_audio_sample_t*)jack_port_get_buffer(adapter->fPlaybackPortList[i], frames);
  }
 
  adapter->fAudioAdapter->PullAndPush(inputBuffer, outputBuffer, frames);

common/JackAudioAdapterInterface.h

@@ -88,18 +88,18 @@ namespace Jack
 
  JackResampler** fCaptureRingBuffer;
  JackResampler** fPlaybackRingBuffer;
- 
+
  unsigned int fQuality;
  unsigned int fRingbufferCurSize;
  jack_time_t fPullAndPushTime;
- 
+
  bool fRunning;
  bool fAdaptative;
- 
+
  void ResetRingBuffers();
  void AdaptRingBufferSize();
  void GrowRingBufferSize();
- 
+
  public:
 
  JackAudioAdapterInterface ( jack_nframes_t buffer_size, jack_nframes_t sample_rate ):
@@ -122,15 +122,15 @@ namespace Jack
  {}
 
  virtual void Reset();
- 
+
  void Create();
  void Destroy();
- 
+
  virtual int Open()
  {
  return 0;
  }
- 
+
  virtual int Close()
  {
  return 0;
@@ -139,15 +139,15 @@ namespace Jack
  virtual int SetHostBufferSize ( jack_nframes_t buffer_size )
  {
  fHostBufferSize = buffer_size;
- if (fAdaptative) 
+ if (fAdaptative)
  AdaptRingBufferSize();
  return 0;
  }
 
  virtual int SetAdaptedBufferSize ( jack_nframes_t buffer_size )
  {
  fAdaptedBufferSize = buffer_size;
- if (fAdaptative) 
+ if (fAdaptative)
  AdaptRingBufferSize();
  return 0;
  }
@@ -179,7 +179,7 @@ namespace Jack
  SetAdaptedSampleRate ( sample_rate );
  return 0;
  }
- 
+
  void SetInputs ( int inputs )
  {
  jack_log ( "JackAudioAdapterInterface::SetInputs %d", inputs );
@@ -203,10 +203,10 @@ namespace Jack
  jack_log ( "JackAudioAdapterInterface::GetOutputs %d", fPlaybackChannels );
  return fPlaybackChannels;
  }
- 
- int PushAndPull(float** inputBuffer, float** outputBuffer, unsigned int inNumberFrames);
- int PullAndPush(float** inputBuffer, float** outputBuffer, unsigned int inNumberFrames);
- 
+
+ int PushAndPull(jack_default_audio_sample_t** inputBuffer, jack_default_audio_sample_t** outputBuffer, unsigned int inNumberFrames);
+ int PullAndPush(jack_default_audio_sample_t** inputBuffer, jack_default_audio_sample_t** outputBuffer, unsigned int inNumberFrames);
+
  };
 
 }