Remove patches that we longer need as sunaudio is disabled now.
spotted by jakemsr@
This commit is contained in:
ajacoutot
parent
687475d15a
commit
8ceec1ddcb
@ -1,56 +0,0 @@
|
||||
$OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_c,v 1.4 2009/11/29 09:17:38 ajacoutot Exp $
|
||||
--- sys/sunaudio/gstsunaudiomixerctrl.c.orig Mon Nov 23 18:25:53 2009
|
||||
+++ sys/sunaudio/gstsunaudiomixerctrl.c Mon Nov 23 18:27:36 2009
|
||||
@@ -35,7 +35,9 @@
|
||||
#include <errno.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/audio.h>
|
||||
+#if !defined(__OpenBSD__)
|
||||
#include <sys/mixer.h>
|
||||
+#endif
|
||||
|
||||
#include <gst/gst-i18n-plugin.h>
|
||||
|
||||
@@ -68,8 +70,10 @@ gst_sunaudiomixer_ctrl_open (GstSunAudioMixerCtrl * mi
|
||||
}
|
||||
mixer->mixer_fd = fd;
|
||||
|
||||
+#if defined(AUDIO_MIXER_MULTIPLE_OPEN)
|
||||
/* Try to set the multiple open flag if we can, but ignore errors */
|
||||
ioctl (mixer->mixer_fd, AUDIO_MIXER_MULTIPLE_OPEN);
|
||||
+#endif
|
||||
|
||||
GST_DEBUG_OBJECT (mixer, "Opened mixer device %s", mixer->device);
|
||||
|
||||
@@ -289,20 +293,9 @@ gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtr
|
||||
break;
|
||||
}
|
||||
|
||||
- /* Likewise reset MUTE */
|
||||
- if ((sunaudiotrack->track_num == GST_SUNAUDIO_TRACK_OUTPUT
|
||||
- && audioinfo.output_muted == 1)
|
||||
- || (sunaudiotrack->track_num != GST_SUNAUDIO_TRACK_OUTPUT && gain == 0)) {
|
||||
- /*
|
||||
- * If MUTE is set, then gain is always 0, so don't bother
|
||||
- * resetting our internal value.
|
||||
- */
|
||||
- track->flags |= GST_MIXER_TRACK_MUTE;
|
||||
- } else {
|
||||
sunaudiotrack->gain = gain;
|
||||
sunaudiotrack->balance = balance;
|
||||
track->flags &= ~GST_MIXER_TRACK_MUTE;
|
||||
- }
|
||||
}
|
||||
|
||||
void
|
||||
@@ -408,10 +401,6 @@ gst_sunaudiomixer_ctrl_set_mute (GstSunAudioMixerCtrl
|
||||
|
||||
switch (sunaudiotrack->track_num) {
|
||||
case GST_SUNAUDIO_TRACK_OUTPUT:
|
||||
- if (mute)
|
||||
- audioinfo.output_muted = 1;
|
||||
- else
|
||||
- audioinfo.output_muted = 0;
|
||||
|
||||
audioinfo.play.gain = volume;
|
||||
audioinfo.play.balance = balance;
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_h,v 1.3 2009/11/29 09:17:38 ajacoutot Exp $
|
||||
--- sys/sunaudio/gstsunaudiomixerctrl.h.orig Fri Sep 11 17:36:18 2009
|
||||
+++ sys/sunaudio/gstsunaudiomixerctrl.h Mon Nov 23 18:28:12 2009
|
||||
@@ -23,6 +23,8 @@
|
||||
#ifndef __GST_SUNAUDIO_MIXER_CTRL_H
|
||||
#define __GST_SUNAUDIO_MIXER_CTRL_H
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/ioctl.h>
|
||||
#include <sys/audioio.h>
|
||||
|
||||
#include <gst/gst.h>
|
||||
@ -1,45 +0,0 @@
|
||||
$OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.6 2010/04/28 08:03:23 ajacoutot Exp $
|
||||
--- sys/sunaudio/gstsunaudiosink.c.orig Thu Mar 18 18:55:13 2010
|
||||
+++ sys/sunaudio/gstsunaudiosink.c Wed Apr 28 09:06:23 2010
|
||||
@@ -41,7 +41,6 @@
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
-#include <stropts.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
@@ -312,13 +311,14 @@ gst_sunaudiosink_open (GstAudioSink * asink)
|
||||
sunaudiosink->info.monitor_gain);
|
||||
GST_DEBUG_OBJECT (sunaudiosink, "output_muted %d",
|
||||
sunaudiosink->info.output_muted);
|
||||
+#ifndef __OpenBSD__
|
||||
GST_DEBUG_OBJECT (sunaudiosink, "hw_features %08x",
|
||||
sunaudiosink->info.hw_features);
|
||||
GST_DEBUG_OBJECT (sunaudiosink, "sw_features %08x",
|
||||
sunaudiosink->info.sw_features);
|
||||
GST_DEBUG_OBJECT (sunaudiosink, "sw_features_enabled %08x",
|
||||
sunaudiosink->info.sw_features_enabled);
|
||||
-
|
||||
+#endif
|
||||
return TRUE;
|
||||
|
||||
open_failed:
|
||||
@@ -613,7 +613,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink)
|
||||
}
|
||||
|
||||
/* Flush the audio */
|
||||
- ret = ioctl (sunaudiosink->fd, I_FLUSH, FLUSHW);
|
||||
+ ret = ioctl (sunaudiosink->fd, AUDIO_FLUSH);
|
||||
if (ret == -1) {
|
||||
GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s",
|
||||
strerror (errno)));
|
||||
@@ -628,7 +628,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink)
|
||||
|
||||
g_cond_signal (sunaudiosink->sleep_cond);
|
||||
|
||||
- ret = ioctl (sunaudiosink->fd, I_FLUSH, FLUSHW);
|
||||
+ ret = ioctl (sunaudiosink->fd, AUDIO_FLUSH);
|
||||
if (ret == -1) {
|
||||
GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s",
|
||||
strerror (errno)));
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-sys_sunaudio_gstsunaudiosink_h,v 1.2 2008/05/13 15:11:51 espie Exp $
|
||||
--- sys/sunaudio/gstsunaudiosink.h.orig Thu Apr 3 00:37:28 2008
|
||||
+++ sys/sunaudio/gstsunaudiosink.h Mon May 12 14:28:03 2008
|
||||
@@ -26,6 +26,8 @@
|
||||
#ifndef __GST_SUNAUDIO_SINK_H__
|
||||
#define __GST_SUNAUDIO_SINK_H__
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/ioctl.h>
|
||||
#include <sys/audioio.h>
|
||||
#include <gst/gst.h>
|
||||
#include <gst/audio/gstaudiosink.h>
|
||||
@ -1,45 +0,0 @@
|
||||
$OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.6 2010/04/28 08:03:23 ajacoutot Exp $
|
||||
--- sys/sunaudio/gstsunaudiosrc.c.orig Thu Mar 18 18:55:13 2010
|
||||
+++ sys/sunaudio/gstsunaudiosrc.c Wed Apr 28 09:06:23 2010
|
||||
@@ -42,8 +42,6 @@
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
-#include <stropts.h>
|
||||
-#include <sys/mixer.h>
|
||||
|
||||
#include "gstsunaudiosrc.h"
|
||||
|
||||
@@ -263,12 +261,14 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc)
|
||||
sunaudiosrc->info.monitor_gain);
|
||||
GST_DEBUG_OBJECT (sunaudiosrc, "output_muted %d",
|
||||
sunaudiosrc->info.output_muted);
|
||||
+#ifndef __OpenBSD__
|
||||
GST_DEBUG_OBJECT (sunaudiosrc, "hw_features %08x",
|
||||
sunaudiosrc->info.hw_features);
|
||||
GST_DEBUG_OBJECT (sunaudiosrc, "sw_features %08x",
|
||||
sunaudiosrc->info.sw_features);
|
||||
GST_DEBUG_OBJECT (sunaudiosrc, "sw_features_enabled %08x",
|
||||
sunaudiosrc->info.sw_features_enabled);
|
||||
+#endif
|
||||
|
||||
if (!sunaudiosrc->mixer) {
|
||||
const char *audiodev;
|
||||
@@ -355,7 +355,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBu
|
||||
}
|
||||
|
||||
|
||||
- ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR);
|
||||
+ ioctl (sunaudiosrc->fd, AUDIO_FLUSH);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -409,7 +409,7 @@ gst_sunaudiosrc_reset (GstAudioSrc * asrc)
|
||||
}
|
||||
|
||||
/* Flush the audio */
|
||||
- ret = ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR);
|
||||
+ ret = ioctl (sunaudiosrc->fd, AUDIO_FLUSH);
|
||||
if (ret == -1) {
|
||||
GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s",
|
||||
strerror (errno)));
|
||||
Loading…
Reference in New Issue
Block a user