summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-05-27 03:36:17 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-05-27 03:36:17 +0000
commit2652468b976e56a219c35259e03efc8f1e189e13 (patch)
treed24b947e4dcfd3efee18897e2bf72e2d14518ce3
parentb897ebfaec8e13384bc51e164197bc7acfda0c7d (diff)
downloadgst-plugins-bad-2652468b976e56a219c35259e03efc8f1e189e13.tar.gz
gst-plugins-bad-2652468b976e56a219c35259e03efc8f1e189e13.tar.bz2
gst-plugins-bad-2652468b976e56a219c35259e03efc8f1e189e13.zip
ext/alsa/: Add enumerations (as GstMixerOptions). Make correct distinction between input/output tracks. Add capture/p...
Original commit message from CVS: * ext/alsa/Makefile.am: * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_interface_init), (gst_alsa_mixer_build_list), (gst_alsa_mixer_get_volume), (gst_alsa_mixer_set_volume), (gst_alsa_mixer_set_mute), (gst_alsa_mixer_set_record), (gst_alsa_mixer_set_option), (gst_alsa_mixer_get_option): * ext/alsa/gstalsamixer.h: * ext/alsa/gstalsamixeroptions.c: (gst_alsa_mixer_options_get_type), (gst_alsa_mixer_options_class_init), (gst_alsa_mixer_options_init), (gst_alsa_mixer_options_new): * ext/alsa/gstalsamixeroptions.h: * ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new): * ext/alsa/gstalsamixertrack.h: Add enumerations (as GstMixerOptions). Make correct distinction between input/output tracks. Add capture/playback private flag. Use flag to decide on whether to set capture or playback volumes or switches. Use playback and record switches. * gst-libs/gst/mixer/Makefile.am: * gst-libs/gst/mixer/mixer-marshal.list: * gst-libs/gst/mixer/mixer.c: (gst_mixer_class_init), (gst_mixer_set_option), (gst_mixer_get_option), (gst_mixer_mute_toggled), (gst_mixer_record_toggled), (gst_mixer_volume_changed), (gst_mixer_option_changed): * gst-libs/gst/mixer/mixer.h: * gst-libs/gst/mixer/mixeroptions.c: (gst_mixer_options_get_type), (gst_mixer_options_class_init), (gst_mixer_options_init), (gst_mixer_options_dispose): * gst-libs/gst/mixer/mixeroptions.h: Add GstMixerOptions. * sys/oss/gstosselement.c: (gst_osselement_class_probe_devices): Rename Audio Mixer to OSS Mixer (similar to Alsa Mixer). Fix broken device detection on computers with multiple OSS sound cards.
-rw-r--r--ChangeLog37
-rw-r--r--gst-libs/gst/mixer/Makefile.am3
-rw-r--r--gst-libs/gst/mixer/mixer-marshal.list1
-rw-r--r--gst-libs/gst/mixer/mixer.c79
-rw-r--r--gst-libs/gst/mixer/mixer.h22
-rw-r--r--gst-libs/gst/mixer/mixeroptions.c103
-rw-r--r--gst-libs/gst/mixer/mixeroptions.h67
7 files changed, 302 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 45884808..f3945262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2004-05-26 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/alsa/Makefile.am:
+ * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_interface_init),
+ (gst_alsa_mixer_build_list), (gst_alsa_mixer_get_volume),
+ (gst_alsa_mixer_set_volume), (gst_alsa_mixer_set_mute),
+ (gst_alsa_mixer_set_record), (gst_alsa_mixer_set_option),
+ (gst_alsa_mixer_get_option):
+ * ext/alsa/gstalsamixer.h:
+ * ext/alsa/gstalsamixeroptions.c:
+ (gst_alsa_mixer_options_get_type),
+ (gst_alsa_mixer_options_class_init), (gst_alsa_mixer_options_init),
+ (gst_alsa_mixer_options_new):
+ * ext/alsa/gstalsamixeroptions.h:
+ * ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
+ * ext/alsa/gstalsamixertrack.h:
+ Add enumerations (as GstMixerOptions). Make correct distinction
+ between input/output tracks. Add capture/playback private flag.
+ Use flag to decide on whether to set capture or playback volumes
+ or switches. Use playback and record switches.
+ * gst-libs/gst/mixer/Makefile.am:
+ * gst-libs/gst/mixer/mixer-marshal.list:
+ * gst-libs/gst/mixer/mixer.c: (gst_mixer_class_init),
+ (gst_mixer_set_option), (gst_mixer_get_option),
+ (gst_mixer_mute_toggled), (gst_mixer_record_toggled),
+ (gst_mixer_volume_changed), (gst_mixer_option_changed):
+ * gst-libs/gst/mixer/mixer.h:
+ * gst-libs/gst/mixer/mixeroptions.c: (gst_mixer_options_get_type),
+ (gst_mixer_options_class_init), (gst_mixer_options_init),
+ (gst_mixer_options_dispose):
+ * gst-libs/gst/mixer/mixeroptions.h:
+ Add GstMixerOptions.
+ * sys/oss/gstosselement.c: (gst_osselement_class_probe_devices):
+ Rename Audio Mixer to OSS Mixer (similar to Alsa Mixer). Fix
+ broken device detection on computers with multiple OSS sound
+ cards.
+
2004-05-26 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_fixate):
diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index a77936c2..e556ab0e 100644
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -9,6 +9,7 @@ libgstmixerincludedir = \
mixer_headers = \
mixer.h \
+ mixeroptions.h \
mixertrack.h
built_sources = \
@@ -27,7 +28,9 @@ noinst_LTLIBRARIES = libgstmixer.la
libgstmixer_la_SOURCES = \
mixer.c \
+ mixeroptions.c \
mixertrack.c
+
nodist_libgstmixer_la_SOURCES = \
mixer-marshal.h \
$(built_sources)
diff --git a/gst-libs/gst/mixer/mixer-marshal.list b/gst-libs/gst/mixer/mixer-marshal.list
index ac2cd6b8..3bcfd839 100644
--- a/gst-libs/gst/mixer/mixer-marshal.list
+++ b/gst-libs/gst/mixer/mixer-marshal.list
@@ -1,2 +1,3 @@
VOID:OBJECT,BOOLEAN
VOID:OBJECT,POINTER
+VOID:OBJECT,STRING
diff --git a/gst-libs/gst/mixer/mixer.c b/gst-libs/gst/mixer/mixer.c
index 1db3d6a3..dcae8741 100644
--- a/gst-libs/gst/mixer/mixer.c
+++ b/gst-libs/gst/mixer/mixer.c
@@ -28,9 +28,10 @@
enum
{
- MUTE_TOGGLED,
- RECORD_TOGGLED,
- VOLUME_CHANGED,
+ SIGNAL_MUTE_TOGGLED,
+ SIGNAL_RECORD_TOGGLED,
+ SIGNAL_VOLUME_CHANGED,
+ SIGNAL_OPTION_CHANGED,
LAST_SIGNAL
};
@@ -71,27 +72,34 @@ gst_mixer_class_init (GstMixerClass * klass)
static gboolean initialized = FALSE;
if (!initialized) {
- gst_mixer_signals[RECORD_TOGGLED] =
+ gst_mixer_signals[SIGNAL_RECORD_TOGGLED] =
g_signal_new ("record-toggled",
GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMixerClass, record_toggled),
NULL, NULL,
gst_mixer_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2,
GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN);
- gst_mixer_signals[MUTE_TOGGLED] =
+ gst_mixer_signals[SIGNAL_MUTE_TOGGLED] =
g_signal_new ("mute-toggled",
GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMixerClass, mute_toggled),
NULL, NULL,
gst_mixer_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2,
GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN);
- gst_mixer_signals[VOLUME_CHANGED] =
+ gst_mixer_signals[SIGNAL_VOLUME_CHANGED] =
g_signal_new ("volume-changed",
GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMixerClass, volume_changed),
NULL, NULL,
gst_mixer_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2,
GST_TYPE_MIXER_TRACK, G_TYPE_POINTER);
+ gst_mixer_signals[SIGNAL_OPTION_CHANGED] =
+ g_signal_new ("option-changed",
+ GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstMixerClass, option_changed),
+ NULL, NULL,
+ gst_mixer_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2,
+ GST_TYPE_MIXER_OPTIONS, G_TYPE_STRING);
initialized = TRUE;
}
@@ -104,6 +112,8 @@ gst_mixer_class_init (GstMixerClass * klass)
klass->get_volume = NULL;
klass->set_mute = NULL;
klass->set_record = NULL;
+ klass->set_option = NULL;
+ klass->get_option = NULL;
}
/**
@@ -226,11 +236,52 @@ gst_mixer_set_record (GstMixer * mixer, GstMixerTrack * track, gboolean record)
}
}
+/**
+ * gst_mixer_set_option:
+ * @mixer: The #GstMixer (a #GstElement) that owns the optionlist.
+ * @opts: The #GstMixerOptions that we operate on.
+ * @value: The requested new option value.
+ *
+ * Sets a name/value option in the mixer to the requested value.
+ */
+
+void
+gst_mixer_set_option (GstMixer * mixer, GstMixerOptions * opts, gchar * value)
+{
+ GstMixerClass *klass = GST_MIXER_GET_CLASS (mixer);
+
+ if (klass->set_option) {
+ klass->set_option (mixer, opts, value);
+ }
+}
+
+/**
+ * gst_mixer_g_option:
+ * @mixer: The #GstMixer (a #GstElement) that owns the optionlist.
+ * @opts: The #GstMixerOptions that we operate on.
+ *
+ * Get the current value of a name/value option in the mixer.
+ *
+ * Returns: current value of the name/value option.
+ */
+
+const gchar *
+gst_mixer_get_option (GstMixer * mixer, GstMixerOptions * opts)
+{
+ GstMixerClass *klass = GST_MIXER_GET_CLASS (mixer);
+
+ if (klass->get_option) {
+ return klass->get_option (mixer, opts);
+ }
+
+ return NULL;
+}
+
void
gst_mixer_mute_toggled (GstMixer * mixer, GstMixerTrack * track, gboolean mute)
{
g_signal_emit (G_OBJECT (mixer),
- gst_mixer_signals[MUTE_TOGGLED], 0, track, mute);
+ gst_mixer_signals[SIGNAL_MUTE_TOGGLED], 0, track, mute);
g_signal_emit_by_name (G_OBJECT (track), "mute_toggled", mute);
}
@@ -240,7 +291,7 @@ gst_mixer_record_toggled (GstMixer * mixer,
GstMixerTrack * track, gboolean record)
{
g_signal_emit (G_OBJECT (mixer),
- gst_mixer_signals[RECORD_TOGGLED], 0, track, record);
+ gst_mixer_signals[SIGNAL_RECORD_TOGGLED], 0, track, record);
g_signal_emit_by_name (G_OBJECT (track), "record_toggled", record);
}
@@ -250,7 +301,17 @@ gst_mixer_volume_changed (GstMixer * mixer,
GstMixerTrack * track, gint * volumes)
{
g_signal_emit (G_OBJECT (mixer),
- gst_mixer_signals[VOLUME_CHANGED], 0, track, volumes);
+ gst_mixer_signals[SIGNAL_VOLUME_CHANGED], 0, track, volumes);
g_signal_emit_by_name (G_OBJECT (track), "volume_changed", volumes);
}
+
+void
+gst_mixer_option_changed (GstMixer * mixer,
+ GstMixerOptions * opts, gchar * value)
+{
+ g_signal_emit (G_OBJECT (mixer),
+ gst_mixer_signals[SIGNAL_OPTION_CHANGED], 0, opts, value);
+
+ g_signal_emit_by_name (G_OBJECT (opts), "value_changed", value);
+}
diff --git a/gst-libs/gst/mixer/mixer.h b/gst-libs/gst/mixer/mixer.h
index 50ba3fd8..2cb326dc 100644
--- a/gst-libs/gst/mixer/mixer.h
+++ b/gst-libs/gst/mixer/mixer.h
@@ -23,6 +23,7 @@
#define __GST_MIXER_H__
#include <gst/gst.h>
+#include <gst/mixer/mixeroptions.h>
#include <gst/mixer/mixertrack.h>
#include <gst/mixer/mixer-enumtypes.h>
@@ -84,7 +85,18 @@ typedef struct _GstMixerClass {
GstMixerTrack *channel,
gint *volumes);
- gpointer _gst_reserved[GST_PADDING];
+ /* use padding */
+ void (* set_option) (GstMixer *mixer,
+ GstMixerOptions *opts,
+ gchar *value);
+ const gchar * (* get_option) (GstMixer *mixer,
+ GstMixerOptions *opts);
+
+ void (* option_changed) (GstMixer *mixer,
+ GstMixerOptions *opts,
+ gchar *option);
+
+ gpointer _gst_reserved[GST_PADDING-3];
} GstMixerClass;
GType gst_mixer_get_type (void);
@@ -103,6 +115,11 @@ void gst_mixer_set_mute (GstMixer *mixer,
void gst_mixer_set_record (GstMixer *mixer,
GstMixerTrack *track,
gboolean record);
+void gst_mixer_set_option (GstMixer *mixer,
+ GstMixerOptions *opts,
+ gchar *value);
+const gchar * gst_mixer_get_option (GstMixer *mixer,
+ GstMixerOptions *opts);
/* trigger signals */
void gst_mixer_mute_toggled (GstMixer *mixer,
@@ -114,6 +131,9 @@ void gst_mixer_record_toggled (GstMixer *mixer,
void gst_mixer_volume_changed (GstMixer *mixer,
GstMixerTrack *track,
gint *volumes);
+void gst_mixer_option_changed (GstMixer *mixer,
+ GstMixerOptions *opts,
+ gchar *value);
G_END_DECLS
diff --git a/gst-libs/gst/mixer/mixeroptions.c b/gst-libs/gst/mixer/mixeroptions.c
new file mode 100644
index 00000000..5e79a414
--- /dev/null
+++ b/gst-libs/gst/mixer/mixeroptions.c
@@ -0,0 +1,103 @@
+/* GStreamer Mixer
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * mixeroptions.c: mixer track options object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mixeroptions.h"
+
+enum
+{
+ /* FILL ME */
+ SIGNAL_OPTION_CHANGED,
+ LAST_SIGNAL
+};
+
+static void gst_mixer_options_class_init (GstMixerOptionsClass * klass);
+static void gst_mixer_options_init (GstMixerOptions * mixer);
+static void gst_mixer_options_dispose (GObject * object);
+
+static GObjectClass *parent_class = NULL;
+static guint signals[LAST_SIGNAL] = { 0 };
+
+GType
+gst_mixer_options_get_type (void)
+{
+ static GType gst_mixer_options_type = 0;
+
+ if (!gst_mixer_options_type) {
+ static const GTypeInfo mixer_options_info = {
+ sizeof (GstMixerOptionsClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) gst_mixer_options_class_init,
+ NULL,
+ NULL,
+ sizeof (GstMixerOptions),
+ 0,
+ (GInstanceInitFunc) gst_mixer_options_init,
+ NULL
+ };
+
+ gst_mixer_options_type =
+ g_type_register_static (GST_TYPE_MIXER_TRACK,
+ "GstMixerOptions", &mixer_options_info, 0);
+ }
+
+ return gst_mixer_options_type;
+}
+
+static void
+gst_mixer_options_class_init (GstMixerOptionsClass * klass)
+{
+ GObjectClass *object_klass = (GObjectClass *) klass;
+
+ parent_class = g_type_class_ref (GST_TYPE_MIXER_TRACK);
+
+ signals[SIGNAL_OPTION_CHANGED] =
+ g_signal_new ("option_changed", G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstMixerOptionsClass, option_changed),
+ NULL, NULL, g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+
+ object_klass->dispose = gst_mixer_options_dispose;
+}
+
+static void
+gst_mixer_options_init (GstMixerOptions * channel)
+{
+ channel->values = NULL;
+}
+
+static void
+gst_mixer_options_dispose (GObject * object)
+{
+ GstMixerOptions *opts = GST_MIXER_OPTIONS (object);
+
+ g_list_foreach (opts->values, (GFunc) g_free, NULL);
+ g_list_free (opts->values);
+ opts->values = NULL;
+
+ if (parent_class->dispose)
+ parent_class->dispose (object);
+}
diff --git a/gst-libs/gst/mixer/mixeroptions.h b/gst-libs/gst/mixer/mixeroptions.h
new file mode 100644
index 00000000..586c9e48
--- /dev/null
+++ b/gst-libs/gst/mixer/mixeroptions.h
@@ -0,0 +1,67 @@
+/* GStreamer Mixer
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * mixeroptions.h: mixer track options object
+ * This should be a subclass of MixerItem, along with MixerOptions,
+ * but that's not possible because of API/ABI in 0.8.x. FIXME.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_MIXER_OPTIONS_H__
+#define __GST_MIXER_OPTIONS_H__
+
+#include <gst/gst.h>
+#include <gst/mixer/mixertrack.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_MIXER_OPTIONS \
+ (gst_mixer_options_get_type ())
+#define GST_MIXER_OPTIONS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MIXER_OPTIONS, \
+ GstMixerOptions))
+#define GST_MIXER_OPTIONS_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_MIXER_OPTIONS, \
+ GstMixerOptionsClass))
+#define GST_IS_MIXER_OPTIONS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MIXER_OPTIONS))
+#define GST_IS_MIXER_OPTIONS_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MIXER_OPTIONS))
+
+typedef struct _GstMixerOptions {
+ GstMixerTrack parent;
+
+ /* list of strings */
+ GList *values;
+
+ gpointer _gst_reserved[GST_PADDING];
+} GstMixerOptions;
+
+typedef struct _GstMixerOptionsClass {
+ GstMixerTrackClass parent;
+
+ void (* option_changed) (GstMixerOptions *opts,
+ gchar *value);
+
+ gpointer _gst_reserved[GST_PADDING];
+} GstMixerOptionsClass;
+
+GType gst_mixer_options_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_MIXER_OPTIONS_H__ */