Changeset 2076:13dee50aead2 in roaraudio for plugins/gstreamer0.10

Timestamp:

07/19/09 05:51:19 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got the gnome mixer to display a dummy slider :)

Location:

plugins/gstreamer0.10

Files:

• roarmixer.c (modified) (7 diffs)
• roarmixer.h (modified) (4 diffs)

plugins/gstreamer0.10/roarmixer.c

@@ -152 +152 @@
 }
 
+G_DEFINE_TYPE (GstRoarMixerTrack, gst_roarmixer_track, GST_TYPE_MIXER_TRACK);
+
 GstRoarMixer*    gst_roarmixer_new                (const gchar *device,
                                                  GstRoarMixerDirection dir) {
   GstRoarMixer *ret = NULL;
+
+  ROAR_WARN("gst_roarmixer_new(device='%s', dir=0x%.4x) = ?", device, dir);
 
   g_return_val_if_fail(device != NULL, NULL);
@@ -172 +176 @@
    goto error;
 
+  ROAR_WARN("gst_roarmixer_new(device='%s', dir=0x%.4x) = %p", device, dir, ret);
   return ret;
 
@@ -178 +183 @@
     gst_roarmixer_free (ret);
 
+  ROAR_WARN("gst_roarmixer_new(device='%s', dir=0x%.4x) = NULL // Error?", device, dir);
   return NULL;
 }
@@ -183 +189 @@
 void            gst_roarmixer_free               (GstRoarMixer *mixer) {
   g_return_if_fail(mixer != NULL);
+
+  ROAR_WARN("gst_roarmixer_free(mixer=%p) = ?", mixer);
 
   if (mixer->device) {
@@ -203 +211 @@
 
   g_free (mixer);
+
+  ROAR_WARN("gst_roarmixer_free(mixer=%p) = (void)", mixer);
 }
 
@@ -217 +227 @@
 }
 
+void            gst_roarmixer_updatestreamlist   (GstRoarMixer *mixer) {
+  gboolean record = FALSE;
+  gboolean input  = FALSE;
+  gint  master = 0;
+  gint  i      = 0;
+  gint  channels = 2;
+  GstMixerTrack *track;
+
+  ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p) = ?", mixer);
+
+  if (mixer->tracklist) {
+    ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p) = (void)", mixer);
+    return;
+  }
+
+      track = gst_roarmixer_track_new (mixer, i, channels,
+          (record ? GST_MIXER_TRACK_RECORD : 0) |
+          (input ? GST_MIXER_TRACK_INPUT :
+              GST_MIXER_TRACK_OUTPUT) |
+          ((master != i) ? 0 : GST_MIXER_TRACK_MASTER));
+      mixer->tracklist = g_list_append (mixer->tracklist, track);
+
+  ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p) = (void)", mixer);
+}
+
 const GList*    gst_roarmixer_list_tracks        (GstRoarMixer * mixer) {
+ ROAR_WARN("gst_roarmixer_list_tracks(mixer=%p) = ?", mixer);
+
+ gst_roarmixer_updatestreamlist(mixer);
+
  return (const GList *) mixer->tracklist;
 }
@@ -238 +277 @@
 }
 
+// tracks:
+#define MASK_BIT_IS_SET(mask, bit) \
+  (mask & (1 << bit))
+
+static void
+gst_roarmixer_track_class_init (GstRoarMixerTrackClass * klass)
+{
+  /* nop */
+}
+
+static void
+gst_roarmixer_track_init (GstRoarMixerTrack * track)
+{
+  //memset(track, 0, sizeof(*track));
+  track->stream_id = -1;
+}
+
+GstMixerTrack *
+gst_roarmixer_track_new (GstRoarMixer * mixer,
+    gint stream_id, gint max_chans, gint flags)
+{
+  GstRoarMixerTrack *roartrack;
+  GstMixerTrack *track;
+
+  ROAR_WARN("gst_roarmixer_track_new(mixer=%p, stream_id=%i, max_chans=%i, flags=0x%.4x) = ?", mixer, stream_id, max_chans, flags);
+
+  roartrack = g_object_new (GST_TYPE_ROARMIXER_TRACK, NULL);
+  ROAR_WARN("gst_roarmixer_track_new(*): roartrack=%p", roartrack);
+  track = GST_MIXER_TRACK (roartrack);
+  track->label = g_strdup ("TRACKLABLE");
+  track->num_channels = max_chans;
+  track->flags = flags;
+  track->min_volume = 0;
+  track->max_volume = 65535;
+  roartrack->stream_id = stream_id;
+
+  /* volume */
+  ROAR_WARN("gst_roarmixer_track_new(mixer=%p, stream_id=%i, max_chans=%i, flags=0x%.4x) = %p", mixer, stream_id, max_chans, flags, track);
+  return track;
+}
+
 //ll

plugins/gstreamer0.10/roarmixer.h

@@ -45 +45 @@
 #define GST_TYPE_ROAR_MIXER_ELEMENT              (gst_roar_mixer_element_get_type())
 
+#define GST_TYPE_ROARMIXER_TRACK \
+  (gst_roarmixer_track_get_type ())
+#define GST_ROARMIXER_TRACK(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_ROARMIXER_TRACK, \
+                               GstRoarMixerTrack))
+#define GST_ROARMIXER_TRACK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_ROARMIXER_TRACK, \
+                            GstRoarMixerTrackClass))
+#define GST_IS_ROARMIXER_TRACK(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_ROARMIXER_TRACK))
+#define GST_IS_ROARMIXER_TRACK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_ROARMIXER_TRACK))
+
 
 typedef struct _GstRoarMixerElement GstRoarMixerElement;
@@ -72 +85 @@
 #define GST_ROAR_MIXER(obj)              ((GstRoarMixer*)(obj))
 
-#define GST_TYPE_ROARMIXER \
-  (gst_roarmixer_get_type())
-
 struct _GstRoarMixer {
   GList *               tracklist;      /* list of available tracks */
@@ -106 +116 @@
                                                  GstRoarMixerDirection dir);
 void            gst_roarmixer_free               (GstRoarMixer *mixer);
+void            gst_roarmixer_updatestreamlist   (GstRoarMixer *mixer);
 
 const GList*    gst_roarmixer_list_tracks        (GstRoarMixer * mixer);
@@ -120 +131 @@
                                                  GstMixerTrack * track,
                                                  gboolean mute);
+
+GType           gst_roarmixer_track_get_type     (void);
+GstMixerTrack *
+gst_roarmixer_track_new (GstRoarMixer * mixer,
+    gint stream_id, gint max_chans, gint flags);
 
 #define GST_IMPLEMENT_ROAR_MIXER_METHODS(Type, interface_as_function)            \