diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
commit | 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 (patch) | |
tree | 9b071a8105704e992946dcd6b801e9fcb7635142 /audio/umix/files/patch-src_driver__oss.c | |
parent | MooseFS is a Fault tolerant, High Available, Highly Performing, Scale-Out, (diff) |
Cleanup patches, a* categories.
Rename them to follow the make makepatch naming, and regenerate them.
With hat: portmgr
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=419133
Diffstat (limited to 'audio/umix/files/patch-src_driver__oss.c')
-rw-r--r-- | audio/umix/files/patch-src_driver__oss.c | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/audio/umix/files/patch-src_driver__oss.c b/audio/umix/files/patch-src_driver__oss.c new file mode 100644 index 000000000000..22c8776cc6e7 --- /dev/null +++ b/audio/umix/files/patch-src_driver__oss.c @@ -0,0 +1,64 @@ +--- src/driver_oss.c.orig 2003-08-31 13:32:02 UTC ++++ src/driver_oss.c +@@ -27,7 +27,7 @@ + #if defined(__linux__) + #include <sys/soundcard.h> + #elif defined(__FreeBSD__) +- #include "machine/soundcard.h" ++ #include <sys/soundcard.h> + #elif defined(__NetBSD__) + #include <soundcard.h> + #endif +@@ -253,8 +253,10 @@ int oss_open(const char *path) + * oss_open() before initializing. */ + int oss_init(void) + { ++#if 0 + /* this is an OSS structure, defined in soundcard.h */ + struct mixer_info oss_info; ++#endif + int old_mixer; + int ch; + int i; +@@ -288,9 +290,13 @@ int oss_init(void) + mixer_ptr->numchan = SOUND_MIXER_NRDEVICES; + mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES); + ++#if 0 + /* get the mixer name */ + eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); + strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name)); ++#else ++ strncpy(mixer_ptr->name, "", 1); ++#endif + + mixer_ptr->curr_chan = 0; + #ifdef UMIX_DEBUG +@@ -329,9 +335,11 @@ int oss_init(void) + oss_set_curr_chan(i); + oss_update(OSS_UPD_READ); + } ++#if 0 + /* init the modify counter */ + eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); + mixer_ptr->modifycount = oss_info.modify_counter; ++#endif + + #ifdef UMIX_DEBUG + err_msg("oss_init: initialized #%d with %d channels", +@@ -388,6 +396,7 @@ int oss_opt_to_chan_num(const char *str) + * the device and compares it to the old */ + static int oss_check_update(void) + { ++#if 0 + struct mixer_info oss_info; + + eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); +@@ -396,6 +405,7 @@ static int oss_check_update(void) + mixer_ptr->modifycount = oss_info.modify_counter; + return 1; + } ++#endif + + return 0; + } |