summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2007-12-16 19:37:20 -0800
committerChris Robinson <[email protected]>2007-12-16 19:37:20 -0800
commite773887b4b2dcece3207a8d6e52ac5e56d32cfdd (patch)
tree6e04d8e684470d5954a934823cd6716a51e781eb
parent5b85067f9c09b287622cfaea76cd3483dc79fd37 (diff)
Implement capture config option for OSS.
-rw-r--r--Alc/oss.c4
-rw-r--r--openalrc.sample2
2 files changed, 5 insertions, 1 deletions
diff --git a/Alc/oss.c b/Alc/oss.c
index 61b46ed9..ccd70186 100644
--- a/Alc/oss.c
+++ b/Alc/oss.c
@@ -303,18 +303,20 @@ static void oss_close_playback(ALCdevice *device)
static ALCboolean oss_open_capture(ALCdevice *device, const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
{
- char driver[64] = "/dev/dsp";
int numFragmentsLogSize;
int log2FragmentSize;
unsigned int periods;
audio_buf_info info;
int numChannels;
+ char driver[64];
oss_data *data;
int ossFormat;
int ossSpeed;
char *err;
int i;
+ strncpy(driver, GetConfigValue("oss", "capture", "/dev/dsp"), sizeof(driver)-1);
+ driver[sizeof(driver)-1] = 0;
if(deviceName)
{
if(strcmp(deviceName, oss_device_capture))
diff --git a/openalrc.sample b/openalrc.sample
index efd0ba86..ca6fe390 100644
--- a/openalrc.sample
+++ b/openalrc.sample
@@ -43,6 +43,8 @@ device = /dev/dsp # Sets the device name for OSS output. Default is /dev/dsp
periods = 4 # Sets the number of update buffers. Default is 4
+capture = /dev/dsp # Sets the device name for OSS capture. Default is /dev/dsp
+
[dsound] # DirectSound backend stuff
# Nothing yet...