Commit eaa3e116 authored by sletz's avatar sletz
Browse files

Empty JackNetAdapter is now compiled and loadable.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2743 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 653439c9
......@@ -23,8 +23,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <stdlib.h>
#include <assert.h>
namespace Jack
{
JackNetAdapter::JackNetAdapter ( jack_nframes_t buffer_size, jack_nframes_t sample_rate, const JSList* params )
{}
:JackAudioAdapterInterface(buffer_size, sample_rate),fThread(this)
{
fCaptureChannels = 2;
fPlaybackChannels = 2;
}
JackNetAdapter::~JackNetAdapter()
{}
......@@ -44,7 +51,6 @@ int JackNetAdapter::SetBufferSize ( jack_nframes_t buffer_size )
return 0;
}
bool JackNetAdapter::Init()
{
return true;
......@@ -55,6 +61,7 @@ bool JackNetAdapter::Execute()
return true;
}
} // namespace Jack
#ifdef __cplusplus
extern "C"
......@@ -62,13 +69,15 @@ extern "C"
#endif
#include "driver_interface.h"
#include "JackAudioAdapter.h"
using namespace Jack;
EXPORT jack_driver_desc_t* jack_get_descriptor()
{
jack_driver_desc_t *desc;
jack_driver_param_desc_t * params;
unsigned int i;
//unsigned int i;
desc = ( jack_driver_desc_t* ) calloc ( 1, sizeof ( jack_driver_desc_t ) );
strcpy ( desc->name, "net-adapter" );
......
......@@ -46,9 +46,8 @@ namespace Jack
public:
JackNetAdapter ( jack_nframes_t buffer_size, jack_nframes_t sample_rate, const JSList* params );
~JackNetAdapter()
{}
~JackNetAdapter();
virtual int Open();
virtual int Close();
......
......@@ -196,27 +196,38 @@ def build(bld):
create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib)
adapter_sources = [
net_adapter_sources = [
'JackResampler.cpp',
'JackLibSampleRateResampler.cpp',
'JackAudioAdapter.cpp',
'JackAudioAdapterFactory.cpp',
'JackAudioAdapter.cpp',
'JackAudioAdapterInterface.cpp',
'JackNetAdapter.cpp',
]
process = create_jack_process_obj(bld, 'netadapter', net_adapter_sources, serverlib)
process.env.append_value("LINKFLAGS", "-lsamplerate")
audio_adapter_sources = [
'JackResampler.cpp',
'JackLibSampleRateResampler.cpp',
'JackAudioAdapter.cpp',
'JackAudioAdapterInterface.cpp',
'JackAudioAdapterFactory.cpp',
]
if bld.env()['IS_MACOSX']:
adapter_sources += ['../macosx/JackCoreAudioAdapter.cpp']
process = create_jack_process_obj(bld, 'audioadapter', adapter_sources, serverlib)
audio_adapter_sources += ['../macosx/JackCoreAudioAdapter.cpp']
process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
process.env.append_value("LINKFLAGS", "../macosx/libportaudio.a -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreServices")
process.env.append_value("LINKFLAGS", "-lsamplerate")
if bld.env()['IS_LINUX']:
adapter_sources += ['../linux/alsa/JackAlsaAdapter.cpp']
process = create_jack_process_obj(bld, 'audioadapter', adapter_sources, serverlib)
audio_adapter_sources += ['../linux/alsa/JackAlsaAdapter.cpp']
process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
process.env.append_value("LINKFLAGS", "-lasound -lsamplerate")
#adapter_sources += ['../windows/JackPortAudioAdapter.cpp']
#process = create_jack_process_obj(bld, 'audioadapter', adapter_sources, serverlib)
#audio_adapter_sources += ['../windows/JackPortAudioAdapter.cpp']
#process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
install_files('PREFIX', 'include/jack', 'jack/*.h')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment