Browse Source

Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2583 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
e00a874be0
4 changed files with 5 additions and 4 deletions
  1. +1
    -0
      common/JackCallbackNetIOAdapter.h
  2. +1
    -2
      common/JackNetIOAdapter.cpp
  3. +2
    -1
      common/JackNetIOAdapter.h
  4. +1
    -1
      common/wscript

+ 1
- 0
common/JackCallbackNetIOAdapter.h View File

@@ -28,6 +28,7 @@ namespace Jack


class JackCallbackNetIOAdapter : public JackNetIOAdapter class JackCallbackNetIOAdapter : public JackNetIOAdapter
{ {
private: private:
jack_ringbuffer_t* fCaptureRingBuffer; jack_ringbuffer_t* fCaptureRingBuffer;


+ 1
- 2
common/JackNetIOAdapter.cpp View File

@@ -28,7 +28,6 @@ using namespace std;
namespace Jack namespace Jack
{ {



JackNetIOAdapter::JackNetIOAdapter(jack_client_t* jack_client, JackNetIOAdapter::JackNetIOAdapter(jack_client_t* jack_client,
JackIOAdapterInterface* audio_io, JackIOAdapterInterface* audio_io,
int input, int input,
@@ -64,7 +63,7 @@ fail:


JackNetIOAdapter::~JackNetIOAdapter() JackNetIOAdapter::~JackNetIOAdapter()
{ {
// When called Close has already been sued for the client, thus ports are already unregistered.
// When called, Close has already been used for the client, thus ports are already unregistered.
delete fIOAdapter; delete fIOAdapter;
} }




+ 2
- 1
common/JackNetIOAdapter.h View File

@@ -28,6 +28,7 @@ namespace Jack


class JackNetIOAdapter class JackNetIOAdapter
{ {
protected: protected:
int fCaptureChannels; int fCaptureChannels;
@@ -39,7 +40,7 @@ namespace Jack
jack_client_t* fJackClient; jack_client_t* fJackClient;
JackIOAdapterInterface* fIOAdapter; JackIOAdapterInterface* fIOAdapter;
void FreePorts();
void FreePorts();
public: public:


+ 1
- 1
common/wscript View File

@@ -198,7 +198,7 @@ def build(bld):


process = create_jack_process_obj(bld, 'netioadapter', 'JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../windows/JackPortAudioIOAdapter.cpp', serverlib) process = create_jack_process_obj(bld, 'netioadapter', 'JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../windows/JackPortAudioIOAdapter.cpp', serverlib)
if bld.env()['IS_MACOSX']: if bld.env()['IS_MACOSX']:
process.env.append_value("LINKFLAGS", "../macosx/libportaudio.a -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreServices ")
process.env.append_value("LINKFLAGS", "../macosx/libportaudio.a -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreServices")


install_files('PREFIX', 'include/jack', 'jack/*.h') install_files('PREFIX', 'include/jack', 'jack/*.h')




Loading…
Cancel
Save