Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/alsa-plugins-02-oss.diff
author jurikm
Wed, 20 Oct 2010 21:13:00 +0000
changeset 2969 986a1305a085
parent 388 9f564876c65d
permissions -rw-r--r--
SFEalsa-plugins.spec: bump to 1.0.23
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2969
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     1
 
diff -ur alsa-plugins-1.0.14.orig/oss/pcm_oss.c alsa-plugins-1.0.14/oss/pcm_oss.c
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     2
 
--- alsa-plugins-1.0.14.orig/oss/pcm_oss.c	2007-05-31 15:06:51.000000000 +0700
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     3
 
+++ alsa-plugins-1.0.14/oss/pcm_oss.c	2007-08-12 00:37:48.119259201 +0700
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     4
 
@@ -22,7 +22,11 @@
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     5
 
 #include <sys/ioctl.h>
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     6
 
 #include <alsa/asoundlib.h>
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     7
 
 #include <alsa/pcm_external.h>
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     8
 
+#if defined(HAVE_LINUX_SOUNDCARD_H)
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
     9
 
 #include <linux/soundcard.h>
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    10
 
+#else
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    11
 
+#include <sys/soundcard.h>
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    12
 
+#endif
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    13
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    14
 
 typedef struct snd_pcm_oss {
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    15
 
 	snd_pcm_ioplug_t io;
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    16
 
--- alsa-plugins-1.0.23.orig/oss/ctl_oss.c	Mon Sep 20 00:06:53 2010
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    17
 
+++ alsa-plugins-1.0.23/oss/ctl_oss.c	Mon Sep 20 00:09:55 2010
388
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    18
 
@@ -26,7 +26,11 @@
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    19
 
 #include <sys/ioctl.h>
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    20
 
 #include <alsa/asoundlib.h>
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    21
 
 #include <alsa/control_external.h>
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    22
 
+#if defined(HAVE_LINUX_SOUNDCARD_H)
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    23
 
 #include <linux/soundcard.h>
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    24
 
+#else
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    25
 
+#include <sys/soundcard.h>
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    26
 
+#endif
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    27
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    28
 
 typedef struct snd_ctl_oss {
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    29
 
 	snd_ctl_ext_t ext;
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    30
 
@@ -61,11 +65,17 @@
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    31
 
 	[SOUND_MIXER_DIGITAL1] = "IEC958 Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    32
 
 	[SOUND_MIXER_DIGITAL2] = "Digital Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    33
 
 	[SOUND_MIXER_DIGITAL3] = "Digital1 Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    34
 
+#ifdef SOUND_MIXER_PHONEIN
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    35
 
 	[SOUND_MIXER_PHONEIN] =	"Phone Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    36
 
+#endif
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    37
 
+#ifdef SOUND_MIXER_PHONEOUT
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    38
 
 	[SOUND_MIXER_PHONEOUT] = "Master Mono Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    39
 
+#endif
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    40
 
 	[SOUND_MIXER_VIDEO] =	"Video Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    41
 
 	[SOUND_MIXER_RADIO] =	"Radio Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    42
 
+#ifdef SOUND_MIXER_MONITOR
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    43
 
 	[SOUND_MIXER_MONITOR] =	"Monitor Playback Volume",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    44
 
+#endif
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    45
 
 };
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    46
2969
986a1305a085 SFEalsa-plugins.spec: bump to 1.0.23
jurikm
parents: 388
diff changeset 
    47
 
 static const char *const rec_devices[SOUND_MIXER_NRDEVICES] = {
388
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    48
 
@@ -81,7 +91,9 @@
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    49
 
 	[SOUND_MIXER_DIGITAL1] = "IEC958 Capture Switch",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    50
 
 	[SOUND_MIXER_DIGITAL2] = "Digital Capture Switch",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    51
 
 	[SOUND_MIXER_DIGITAL3] = "Digital1 Capture Switch",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    52
 
+#ifdef SOUND_MIXER_PHONEIN
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    53
 
 	[SOUND_MIXER_PHONEIN] =	"Phone Capture Switch",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    54
 
+#endif
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    55
 
 	[SOUND_MIXER_VIDEO] =	"Video Capture Switch",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    56
 
 	[SOUND_MIXER_RADIO] =	"Radio Capture Switch",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    57
 
 };
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    58
 
@@ -99,7 +111,9 @@
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    59
 
 	[SOUND_MIXER_DIGITAL1] = "IEC958",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    60
 
 	[SOUND_MIXER_DIGITAL2] = "Digital",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    61
 
 	[SOUND_MIXER_DIGITAL3] = "Digital1",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    62
 
+#ifdef SOUND_MIXER_PHONEIN
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    63
 
 	[SOUND_MIXER_PHONEIN] =	"Phone",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    64
 
+#endif
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    65
 
 	[SOUND_MIXER_VIDEO] =	"Video",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    66
 
 	[SOUND_MIXER_RADIO] =	"Radio",
9f564876c65d 2007-08-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    67
 
 };
upstream/spec-files-extra