summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst/mixer
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
committerJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
commit39fd8a2dbd436cbabe5e336d1145b62c2a885ed5 (patch)
tree61df7da4a9d2b8bdb853af50a27219a8921bf5e4 /gst-libs/gst/mixer
parent1633bd8693c54cbc5f6648703a7ecf01548ec55f (diff)
downloadgst-plugins-bad-39fd8a2dbd436cbabe5e336d1145b62c2a885ed5.tar.gz
gst-plugins-bad-39fd8a2dbd436cbabe5e336d1145b62c2a885ed5.tar.bz2
gst-plugins-bad-39fd8a2dbd436cbabe5e336d1145b62c2a885ed5.zip
*.h: Revert indenting
Original commit message from CVS: * *.h: Revert indenting
Diffstat (limited to 'gst-libs/gst/mixer')
-rw-r--r--gst-libs/gst/mixer/mixer.h81
-rw-r--r--gst-libs/gst/mixer/mixertrack.h44
2 files changed, 76 insertions, 49 deletions
diff --git a/gst-libs/gst/mixer/mixer.h b/gst-libs/gst/mixer/mixer.h
index 2caad164..50ba3fd8 100644
--- a/gst-libs/gst/mixer/mixer.h
+++ b/gst-libs/gst/mixer/mixer.h
@@ -27,6 +27,7 @@
#include <gst/mixer/mixer-enumtypes.h>
G_BEGIN_DECLS
+
#define GST_TYPE_MIXER \
(gst_mixer_get_type ())
#define GST_MIXER(obj) \
@@ -39,7 +40,9 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MIXER))
#define GST_MIXER_GET_CLASS(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_MIXER, GstMixerClass))
+
#define GST_MIXER_TYPE(klass) (klass->mixer_type)
+
typedef struct _GstMixer GstMixer;
typedef enum
@@ -48,52 +51,70 @@ typedef enum
GST_MIXER_SOFTWARE
} GstMixerType;
-typedef struct _GstMixerClass
-{
+typedef struct _GstMixerClass {
GTypeInterface klass;
GstMixerType mixer_type;
-
+
/* virtual functions */
- const GList *(*list_tracks) (GstMixer * mixer);
+ const GList * (* list_tracks) (GstMixer *mixer);
- void (*set_volume) (GstMixer * mixer, GstMixerTrack * track, gint * volumes);
- void (*get_volume) (GstMixer * mixer, GstMixerTrack * track, gint * volumes);
+ void (* set_volume) (GstMixer *mixer,
+ GstMixerTrack *track,
+ gint *volumes);
+ void (* get_volume) (GstMixer *mixer,
+ GstMixerTrack *track,
+ gint *volumes);
- void (*set_mute) (GstMixer * mixer, GstMixerTrack * track, gboolean mute);
- void (*set_record) (GstMixer * mixer, GstMixerTrack * track, gboolean record);
+ void (* set_mute) (GstMixer *mixer,
+ GstMixerTrack *track,
+ gboolean mute);
+ void (* set_record) (GstMixer *mixer,
+ GstMixerTrack *track,
+ gboolean record);
/* signals */
- void (*mute_toggled) (GstMixer * mixer,
- GstMixerTrack * channel, gboolean mute);
- void (*record_toggled) (GstMixer * mixer,
- GstMixerTrack * channel, gboolean record);
- void (*volume_changed) (GstMixer * mixer,
- GstMixerTrack * channel, gint * volumes);
+ void (* mute_toggled) (GstMixer *mixer,
+ GstMixerTrack *channel,
+ gboolean mute);
+ void (* record_toggled) (GstMixer *mixer,
+ GstMixerTrack *channel,
+ gboolean record);
+ void (* volume_changed) (GstMixer *mixer,
+ GstMixerTrack *channel,
+ gint *volumes);
gpointer _gst_reserved[GST_PADDING];
} GstMixerClass;
-GType gst_mixer_get_type (void);
+GType gst_mixer_get_type (void);
/* virtual class function wrappers */
-const GList *gst_mixer_list_tracks (GstMixer * mixer);
-void gst_mixer_set_volume (GstMixer * mixer,
- GstMixerTrack * track, gint * volumes);
-void gst_mixer_get_volume (GstMixer * mixer,
- GstMixerTrack * track, gint * volumes);
-void gst_mixer_set_mute (GstMixer * mixer,
- GstMixerTrack * track, gboolean mute);
-void gst_mixer_set_record (GstMixer * mixer,
- GstMixerTrack * track, gboolean record);
+const GList * gst_mixer_list_tracks (GstMixer *mixer);
+void gst_mixer_set_volume (GstMixer *mixer,
+ GstMixerTrack *track,
+ gint *volumes);
+void gst_mixer_get_volume (GstMixer *mixer,
+ GstMixerTrack *track,
+ gint *volumes);
+void gst_mixer_set_mute (GstMixer *mixer,
+ GstMixerTrack *track,
+ gboolean mute);
+void gst_mixer_set_record (GstMixer *mixer,
+ GstMixerTrack *track,
+ gboolean record);
/* trigger signals */
-void gst_mixer_mute_toggled (GstMixer * mixer,
- GstMixerTrack * track, gboolean mute);
-void gst_mixer_record_toggled (GstMixer * mixer,
- GstMixerTrack * track, gboolean record);
-void gst_mixer_volume_changed (GstMixer * mixer,
- GstMixerTrack * track, gint * volumes);
+void gst_mixer_mute_toggled (GstMixer *mixer,
+ GstMixerTrack *track,
+ gboolean mute);
+void gst_mixer_record_toggled (GstMixer *mixer,
+ GstMixerTrack *track,
+ gboolean record);
+void gst_mixer_volume_changed (GstMixer *mixer,
+ GstMixerTrack *track,
+ gint *volumes);
G_END_DECLS
+
#endif /* __GST_MIXER_H__ */
diff --git a/gst-libs/gst/mixer/mixertrack.h b/gst-libs/gst/mixer/mixertrack.h
index 872b0904..0e05d9cb 100644
--- a/gst-libs/gst/mixer/mixertrack.h
+++ b/gst-libs/gst/mixer/mixertrack.h
@@ -25,6 +25,7 @@
#include <gst/gst.h>
G_BEGIN_DECLS
+
#define GST_TYPE_MIXER_TRACK \
(gst_mixer_track_get_type ())
#define GST_MIXER_TRACK(obj) \
@@ -37,6 +38,7 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MIXER_TRACK))
#define GST_IS_MIXER_TRACK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MIXER_TRACK))
+
/*
* Naming:
*
@@ -52,41 +54,45 @@ G_BEGIN_DECLS
* mixer, which means that setting this track will change
* the hearable volume on any output.
*/
- typedef enum
-{
- GST_MIXER_TRACK_INPUT = (1 << 0),
- GST_MIXER_TRACK_OUTPUT = (1 << 1),
- GST_MIXER_TRACK_MUTE = (1 << 2),
- GST_MIXER_TRACK_RECORD = (1 << 3),
- GST_MIXER_TRACK_MASTER = (1 << 4),
- GST_MIXER_TRACK_SOFTWARE = (1 << 5)
+
+typedef enum {
+ GST_MIXER_TRACK_INPUT = (1<<0),
+ GST_MIXER_TRACK_OUTPUT = (1<<1),
+ GST_MIXER_TRACK_MUTE = (1<<2),
+ GST_MIXER_TRACK_RECORD = (1<<3),
+ GST_MIXER_TRACK_MASTER = (1<<4),
+ GST_MIXER_TRACK_SOFTWARE = (1<<5)
} GstMixerTrackFlags;
#define GST_MIXER_TRACK_HAS_FLAG(channel, flag) \
((channel)->flags & flag)
-typedef struct _GstMixerTrack
-{
- GObject parent;
+typedef struct _GstMixerTrack {
+ GObject parent;
- gchar *label;
+ gchar *label;
GstMixerTrackFlags flags;
- gint num_channels, min_volume, max_volume;
+ gint num_channels,
+ min_volume,
+ max_volume;
} GstMixerTrack;
-typedef struct _GstMixerTrackClass
-{
+typedef struct _GstMixerTrackClass {
GObjectClass parent;
/* signals */
- void (*mute_toggled) (GstMixerTrack * channel, gboolean mute);
- void (*record_toggled) (GstMixerTrack * channel, gboolean record);
- void (*volume_changed) (GstMixerTrack * channel, gint * volumes);
+ void (* mute_toggled) (GstMixerTrack *channel,
+ gboolean mute);
+ void (* record_toggled) (GstMixerTrack *channel,
+ gboolean record);
+ void (* volume_changed) (GstMixerTrack *channel,
+ gint *volumes);
gpointer _gst_reserved[GST_PADDING];
} GstMixerTrackClass;
-GType gst_mixer_track_get_type (void);
+GType gst_mixer_track_get_type (void);
G_END_DECLS
+
#endif /* __GST_MIXER_TRACK_H__ */