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.

1 files changed, 103 insertions, 0 deletions

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);
+}