cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made mbone/rat compiling again (double patch-file)

Browse Source 
Noticed on: bento
This commit is contained in:
Edwin Groothuis 2002-11-15 05:26:42 +00:00
parent eed2fe6117
commit d12e236676
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=70147
2 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
audio/rat30/files/patch-ac
View File

@ -1,53 +0,0 @@
--- src/auddev_freebsd.c.p1 Mon Sep 18 10:27:40 2000
+++ src/auddev_freebsd.c Mon Sep 18 10:30:42 2000
@@ -204,18 +204,10 @@
if (audio_fd <= 0) {
return;
}
- switch (iport) {
- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_MIC), &volume) == -1) {
- perror("Setting gain");
- }
- return;
- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_LINE), &volume) == -1) {
- perror("Setting gain");
- }
- return;
+ if (ioctl(audio_fd, SOUND_MIXER_WRITE_RECLEV, &volume) == -1) {
+ perror("Setting gain");
}
- printf("ERROR: Unknown iport in audio_set_gain!\n");
- abort();
+ return;
}
int
@@ -226,17 +218,8 @@
if (audio_fd <= 0) {
return (0);
}
- switch (iport) {
- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_MIC), &volume) == -1) {
- perror("Getting gain");
- }
- break;
- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_LINE), &volume) == -1) {
- perror("Getting gain");
- }
- break;
- default : printf("ERROR: Unknown iport in audio_set_gain!\n");
- abort();
+ if (ioctl(audio_fd, SOUND_MIXER_READ_RECLEV, &volume) == -1) {
+ perror("Setting gain");
}
return device_to_bat(volume & 0xff);
}
@@ -263,7 +246,7 @@
if (audio_fd <= 0) {
return (0);
}
- if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_VOLUME), &volume) == -1) {
+ if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_PCM), &volume) == -1) {
perror("Getting volume");
}
return device_to_bat(volume & 0x000000ff); /* Extract left channel volume */

53
mbone/rat30/files/patch-ac
View File

@ -1,53 +0,0 @@
--- src/auddev_freebsd.c.p1 Mon Sep 18 10:27:40 2000
+++ src/auddev_freebsd.c Mon Sep 18 10:30:42 2000
@@ -204,18 +204,10 @@
if (audio_fd <= 0) {
return;
}
- switch (iport) {
- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_MIC), &volume) == -1) {
- perror("Setting gain");
- }
- return;
- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_LINE), &volume) == -1) {
- perror("Setting gain");
- }
- return;
+ if (ioctl(audio_fd, SOUND_MIXER_WRITE_RECLEV, &volume) == -1) {
+ perror("Setting gain");
}
- printf("ERROR: Unknown iport in audio_set_gain!\n");
- abort();
+ return;
}
int
@@ -226,17 +218,8 @@
if (audio_fd <= 0) {
return (0);
}
- switch (iport) {
- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_MIC), &volume) == -1) {
- perror("Getting gain");
- }
- break;
- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_LINE), &volume) == -1) {
- perror("Getting gain");
- }
- break;
- default : printf("ERROR: Unknown iport in audio_set_gain!\n");
- abort();
+ if (ioctl(audio_fd, SOUND_MIXER_READ_RECLEV, &volume) == -1) {
+ perror("Setting gain");
}
return device_to_bat(volume & 0xff);
}
@@ -263,7 +246,7 @@
if (audio_fd <= 0) {
return (0);
}
- if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_VOLUME), &volume) == -1) {
+ if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_PCM), &volume) == -1) {
perror("Getting volume");
}
return device_to_bat(volume & 0x000000ff); /* Extract left channel volume */