Commit 608ba988 authored by sletz's avatar sletz
Browse files

Update ALSA driver in progress(2).

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4200 0c269be4-1314-0410-8aa9-9f06e86f4224
parent f5672fc3
......@@ -50,7 +50,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "memops.h"
#include "JackServerGlobals.h"
//#define DEBUG_WAKEUP 1
namespace Jack
......
......@@ -24,7 +24,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackAudioDriver.h"
#include "JackThreadedDriver.h"
#include "JackTime.h"
#include "alsa_driver.h"
namespace Jack
......@@ -42,77 +41,7 @@ class JackAlsaDriver : public JackAudioDriver
jack_driver_t* fDriver;
int fReservedCaptureDevice;
int fReservedPlaybackDevice;
void alsa_driver_release_channel_dependent_memory(alsa_driver_t *driver);
int alsa_driver_check_capabilities(alsa_driver_t *driver);
int alsa_driver_check_card_type(alsa_driver_t *driver);
int alsa_driver_hammerfall_hardware(alsa_driver_t *driver);
int alsa_driver_hdsp_hardware(alsa_driver_t *driver);
int alsa_driver_ice1712_hardware(alsa_driver_t *driver);
int alsa_driver_usx2y_hardware(alsa_driver_t *driver);
int alsa_driver_generic_hardware(alsa_driver_t *driver);
int alsa_driver_hw_specific(alsa_driver_t *driver, int hw_monitoring,
int hw_metering);
int alsa_driver_setup_io_function_pointers (alsa_driver_t *driver);
int alsa_driver_configure_stream(alsa_driver_t *driver, char *device_name,
const char *stream_name,
snd_pcm_t *handle,
snd_pcm_hw_params_t *hw_params,
snd_pcm_sw_params_t *sw_params,
unsigned int *nperiodsp,
unsigned long *nchns,
unsigned long sample_width);
int alsa_driver_set_parameters(alsa_driver_t *driver,
jack_nframes_t frames_per_cycle,
jack_nframes_t user_nperiods,
jack_nframes_t rate);
int alsa_driver_reset_parameters(alsa_driver_t *driver,
jack_nframes_t frames_per_cycle,
jack_nframes_t user_nperiods,
jack_nframes_t rate);
int alsa_driver_get_channel_addresses(alsa_driver_t *driver,
snd_pcm_uframes_t *capture_avail,
snd_pcm_uframes_t *playback_avail,
snd_pcm_uframes_t *capture_offset,
snd_pcm_uframes_t *playback_offset);
jack_driver_t * alsa_driver_new(const char *name, char *playback_alsa_device,
char *capture_alsa_device,
jack_client_t *client,
jack_nframes_t frames_per_cycle,
jack_nframes_t user_nperiods,
jack_nframes_t rate,
int hw_monitoring,
int hw_metering,
int capturing,
int playing,
DitherAlgorithm dither,
int soft_mode,
int monitor,
int user_capture_nchnls,
int user_playback_nchnls,
int shorts_first,
jack_nframes_t capture_latency,
jack_nframes_t playback_latency,
alsa_midi_t *midi);
void alsa_driver_delete(alsa_driver_t *driver);
int alsa_driver_start(alsa_driver_t *driver);
int alsa_driver_stop(alsa_driver_t *driver);
int alsa_driver_read(alsa_driver_t *driver, jack_nframes_t nframes);
int alsa_driver_write(alsa_driver_t *driver, jack_nframes_t nframes);
jack_nframes_t alsa_driver_wait(alsa_driver_t *driver, int extra_fd, int *status, float
*delayed_usecs);
void alsa_driver_silence_untouched_channels(alsa_driver_t *driver,
jack_nframes_t nframes);
int alsa_driver_restart(alsa_driver_t *driver);
int alsa_driver_xrun_recovery(alsa_driver_t *driver, float *delayed_usecs);
void jack_driver_init(jack_driver_t *driver);
void jack_driver_nt_init(jack_driver_nt_t * driver);
......@@ -164,7 +93,7 @@ class JackAlsaDriver : public JackAudioDriver
int SetBufferSize(jack_nframes_t buffer_size);
// jack api emulation for the midi driver
// JACK API emulation for the midi driver
int is_realtime() const;
int create_thread(pthread_t *thread, int prio, int rt, void *(*start_func)(void*), void *arg);
......
This diff is collapsed.
......@@ -1598,6 +1598,7 @@
4B98AE010931D30C0091932A /* JackDebugClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackDebugClient.h; path = ../common/JackDebugClient.h; sourceTree = SOURCE_ROOT; };
4B9A25B30DBF8330006E9FBC /* JackError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackError.cpp; path = ../common/JackError.cpp; sourceTree = SOURCE_ROOT; };
4B9A26000DBF8584006E9FBC /* jslist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jslist.h; path = ../common/jack/jslist.h; sourceTree = SOURCE_ROOT; };
4BA2574C132FB49B009F2D3F /* alsa_driver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = alsa_driver.c; path = ../linux/alsa/alsa_driver.c; sourceTree = SOURCE_ROOT; };
4BA339AC10B2E36800190E3B /* Jackservermp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackservermp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4BA577BC08BF8BE200F82DE1 /* testSynchroClient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSynchroClient.cpp; path = ../tests/testSynchroClient.cpp; sourceTree = SOURCE_ROOT; };
4BA577FB08BF8E4600F82DE1 /* testSynchroServer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSynchroServer.cpp; path = ../tests/testSynchroServer.cpp; sourceTree = SOURCE_ROOT; };
......@@ -2683,6 +2684,7 @@
4B05A09D0DF72C6000840F4C /* Additional */ = {
isa = PBXGroup;
children = (
4BA2574C132FB49B009F2D3F /* alsa_driver.c */,
4B05A08A0DF72BF600840F4C /* Windows */,
4B05A0420DF72B8500840F4C /* Linux */,
);
......
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