summaryrefslogtreecommitdiff
path: root/sys/oss
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-12-06 19:44:58 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-12-06 19:44:58 +0000
commit3ecf433432289b9c1990165f65bdd51aaad2eaa7 (patch)
treedc7bd5c5b4eb37d49b1a37ca1f33c9d9ed2a8374 /sys/oss
parentf2085bd7ef2a4e685b8a58ae0848c43aab0d8747 (diff)
expand tabs
Original commit message from CVS: expand tabs
Diffstat (limited to 'sys/oss')
-rw-r--r--sys/oss/gstossdmabuffer.h8
-rw-r--r--sys/oss/gstossmixer.h34
-rw-r--r--sys/oss/gstossmixerelement.h18
-rw-r--r--sys/oss/gstossmixertrack.h8
-rw-r--r--sys/oss/gstosssink.c26
-rw-r--r--sys/oss/gstosssink.h2
-rw-r--r--sys/oss/gstosssrc.c42
-rw-r--r--sys/oss/gstosssrc.h2
8 files changed, 70 insertions, 70 deletions
diff --git a/sys/oss/gstossdmabuffer.h b/sys/oss/gstossdmabuffer.h
index 27b62fab6..5e5938243 100644
--- a/sys/oss/gstossdmabuffer.h
+++ b/sys/oss/gstossdmabuffer.h
@@ -39,15 +39,15 @@ G_BEGIN_DECLS
#define GST_OSSELEMENT_GET(obj) GST_OSSELEMENT (obj->element)
typedef enum {
- GST_OSSDMABUFFER_OPEN = (1 << 0),
+ GST_OSSDMABUFFER_OPEN = (1 << 0),
} GstOssDMABufferFlags;
typedef struct _GstOssDMABuffer GstOssDMABuffer;
typedef struct _GstOssDMABufferClass GstOssDMABufferClass;
#define GST_OSSDMABUFFER_THREAD(buf) (GST_OSSDMABUFFER(buf)->thread)
-#define GST_OSSDMABUFFER_LOCK GST_OBJECT_LOCK
-#define GST_OSSDMABUFFER_UNLOCK GST_OBJECT_UNLOCK
+#define GST_OSSDMABUFFER_LOCK GST_OBJECT_LOCK
+#define GST_OSSDMABUFFER_UNLOCK GST_OBJECT_UNLOCK
#define GST_OSSDMABUFFER_COND(buf) (GST_OSSDMABUFFER(buf)->cond)
#define GST_OSSDMABUFFER_SIGNAL(buf) (g_cond_signal (GST_OSSDMABUFFER_COND (buf)))
#define GST_OSSDMABUFFER_WAIT(buf) (g_cond_wait (GST_OSSDMABUFFER_COND (buf), GST_OBJECT_GET_LOCK (buf)))
@@ -55,7 +55,7 @@ typedef struct _GstOssDMABufferClass GstOssDMABufferClass;
struct _GstOssDMABuffer {
GstRingBuffer buffer;
- GstOssElement *element;
+ GstOssElement *element;
int fd;
int caps;
diff --git a/sys/oss/gstossmixer.h b/sys/oss/gstossmixer.h
index c5a8f3251..d2e06fed9 100644
--- a/sys/oss/gstossmixer.h
+++ b/sys/oss/gstossmixer.h
@@ -33,7 +33,7 @@
G_BEGIN_DECLS
-#define GST_OSS_MIXER(obj) ((GstOssMixer*)(obj))
+#define GST_OSS_MIXER(obj) ((GstOssMixer*)(obj))
typedef enum {
@@ -47,38 +47,38 @@ typedef struct _GstOssMixer GstOssMixer;
struct _GstOssMixer {
- GList * tracklist; /* list of available tracks */
+ GList * tracklist; /* list of available tracks */
- gint mixer_fd;
+ gint mixer_fd;
- gchar * device;
- gchar * cardname;
+ gchar * device;
+ gchar * cardname;
- gint recmask;
- gint recdevs;
- gint stereomask;
- gint devmask;
- gint mixcaps;
+ gint recmask;
+ gint recdevs;
+ gint stereomask;
+ gint devmask;
+ gint mixcaps;
GstOssMixerDirection dir;
};
-GstOssMixer* gst_ossmixer_new (const gchar *device,
+GstOssMixer* gst_ossmixer_new (const gchar *device,
GstOssMixerDirection dir);
-void gst_ossmixer_free (GstOssMixer *mixer);
+void gst_ossmixer_free (GstOssMixer *mixer);
-const GList* gst_ossmixer_list_tracks (GstOssMixer * mixer);
-void gst_ossmixer_set_volume (GstOssMixer * mixer,
+const GList* gst_ossmixer_list_tracks (GstOssMixer * mixer);
+void gst_ossmixer_set_volume (GstOssMixer * mixer,
GstMixerTrack * track,
gint * volumes);
-void gst_ossmixer_get_volume (GstOssMixer * mixer,
+void gst_ossmixer_get_volume (GstOssMixer * mixer,
GstMixerTrack * track,
gint * volumes);
-void gst_ossmixer_set_record (GstOssMixer * mixer,
+void gst_ossmixer_set_record (GstOssMixer * mixer,
GstMixerTrack * track,
gboolean record);
-void gst_ossmixer_set_mute (GstOssMixer * mixer,
+void gst_ossmixer_set_mute (GstOssMixer * mixer,
GstMixerTrack * track,
gboolean mute);
diff --git a/sys/oss/gstossmixerelement.h b/sys/oss/gstossmixerelement.h
index 8755c5150..e32fc3532 100644
--- a/sys/oss/gstossmixerelement.h
+++ b/sys/oss/gstossmixerelement.h
@@ -27,11 +27,11 @@
G_BEGIN_DECLS
-#define GST_OSS_MIXER_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS_MIXER_ELEMENT,GstOssMixerElement))
-#define GST_OSS_MIXER_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS_MIXER_ELEMENT,GstOssMixerElementClass))
-#define GST_IS_OSS_MIXER_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS_MIXER_ELEMENT))
-#define GST_IS_OSS_MIXER_ELEMENT_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS_MIXER_ELEMENT))
-#define GST_TYPE_OSS_MIXER_ELEMENT (gst_oss_mixer_element_get_type())
+#define GST_OSS_MIXER_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSS_MIXER_ELEMENT,GstOssMixerElement))
+#define GST_OSS_MIXER_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSS_MIXER_ELEMENT,GstOssMixerElementClass))
+#define GST_IS_OSS_MIXER_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSS_MIXER_ELEMENT))
+#define GST_IS_OSS_MIXER_ELEMENT_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSS_MIXER_ELEMENT))
+#define GST_TYPE_OSS_MIXER_ELEMENT (gst_oss_mixer_element_get_type())
typedef struct _GstOssMixerElement GstOssMixerElement;
@@ -39,17 +39,17 @@ typedef struct _GstOssMixerElementClass GstOssMixerElementClass;
struct _GstOssMixerElement {
- GstElement parent;
+ GstElement parent;
- GstOssMixer *mixer;
+ GstOssMixer *mixer;
};
struct _GstOssMixerElementClass {
- GstElementClass parent;
+ GstElementClass parent;
};
-GType gst_oss_mixer_element_get_type (void);
+GType gst_oss_mixer_element_get_type (void);
G_END_DECLS
diff --git a/sys/oss/gstossmixertrack.h b/sys/oss/gstossmixertrack.h
index 1350a0261..2e62ec85a 100644
--- a/sys/oss/gstossmixertrack.h
+++ b/sys/oss/gstossmixertrack.h
@@ -33,10 +33,10 @@ G_BEGIN_DECLS
(gst_ossmixer_track_get_type ())
#define GST_OSSMIXER_TRACK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_OSSMIXER_TRACK, \
- GstOssMixerTrack))
+ GstOssMixerTrack))
#define GST_OSSMIXER_TRACK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_OSSMIXER_TRACK, \
- GstOssMixerTrackClass))
+ GstOssMixerTrackClass))
#define GST_IS_OSSMIXER_TRACK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_OSSMIXER_TRACK))
#define GST_IS_OSSMIXER_TRACK_CLASS(klass) \
@@ -53,8 +53,8 @@ typedef struct _GstOssMixerTrackClass {
GstMixerTrackClass parent;
} GstOssMixerTrackClass;
-GType gst_ossmixer_track_get_type (void);
-GstMixerTrack* gst_ossmixer_track_new (gint mixer_fd,
+GType gst_ossmixer_track_get_type (void);
+GstMixerTrack* gst_ossmixer_track_new (gint mixer_fd,
gint track_num, gint max_chans, gint flags);
G_END_DECLS
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index b0d4a9870..206de4c0d 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -72,7 +72,7 @@ enum
LAST_SIGNAL
};
-#define DEFAULT_DEVICE "/dev/dsp"
+#define DEFAULT_DEVICE "/dev/dsp"
enum
{
PROP_0,
@@ -275,28 +275,28 @@ ilog2 (gint x)
return (x & 0x0000003f) - 1;
}
-#define SET_PARAM(_oss, _name, _val, _detail) \
-G_STMT_START { \
- int _tmp = _val; \
- if (ioctl(_oss->fd, _name, &_tmp) == -1) { \
+#define SET_PARAM(_oss, _name, _val, _detail) \
+G_STMT_START { \
+ int _tmp = _val; \
+ if (ioctl(_oss->fd, _name, &_tmp) == -1) { \
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_WRITE, \
("Unable to set param " _detail ": %s", \
g_strerror (errno)), \
(NULL)); \
- return FALSE; \
- } \
- GST_DEBUG(_detail " %d", _tmp); \
+ return FALSE; \
+ } \
+ GST_DEBUG(_detail " %d", _tmp); \
} G_STMT_END
-#define GET_PARAM(_oss, _name, _val, _detail) \
-G_STMT_START { \
- if (ioctl(oss->fd, _name, _val) == -1) { \
+#define GET_PARAM(_oss, _name, _val, _detail) \
+G_STMT_START { \
+ if (ioctl(oss->fd, _name, _val) == -1) { \
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_WRITE, \
("Unable to get param " _detail ": %s", \
g_strerror (errno)), \
(NULL)); \
- return FALSE; \
- } \
+ return FALSE; \
+ } \
} G_STMT_END
static gint
diff --git a/sys/oss/gstosssink.h b/sys/oss/gstosssink.h
index f22828bbe..a61b019b0 100644
--- a/sys/oss/gstosssink.h
+++ b/sys/oss/gstosssink.h
@@ -45,7 +45,7 @@ struct _GstOssSink {
GstAudioSink sink;
gchar *device;
- gint fd;
+ gint fd;
gint bytes_per_sample;
GstCaps *probed_caps;
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index 37f26938b..b0db3279d 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -41,8 +41,8 @@ GST_ELEMENT_DETAILS ("Audio Source (OSS)",
"Capture from a sound card via OSS",
"Erik Walthinsen <omega@cse.ogi.edu>, " "Wim Taymans <wim@fluendo.com>");
-#define DEFAULT_DEVICE "/dev/dsp"
-#define DEFAULT_DEVICE_NAME ""
+#define DEFAULT_DEVICE "/dev/dsp"
+#define DEFAULT_DEVICE_NAME ""
enum
{
@@ -234,29 +234,29 @@ ilog2 (gint x)
return (x & 0x0000003f) - 1;
}
-#define SET_PARAM(_oss, _name, _val) \
-G_STMT_START { \
- int _tmp = _val; \
- if (ioctl(_oss->fd, _name, &_tmp) == -1) { \
+#define SET_PARAM(_oss, _name, _val) \
+G_STMT_START { \
+ int _tmp = _val; \
+ if (ioctl(_oss->fd, _name, &_tmp) == -1) { \
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ, \
- ("Unable to set param "G_STRINGIFY (_name)": %s", \
- g_strerror (errno)), \
- (NULL)); \
- return FALSE; \
- } \
- GST_DEBUG_OBJECT (_oss, G_STRINGIFY (_name)" %d", _tmp); \
+ ("Unable to set param "G_STRINGIFY (_name)": %s", \
+ g_strerror (errno)), \
+ (NULL)); \
+ return FALSE; \
+ } \
+ GST_DEBUG_OBJECT (_oss, G_STRINGIFY (_name)" %d", _tmp); \
} G_STMT_END
-#define GET_PARAM(_oss, _name, _val) \
-G_STMT_START { \
- if (ioctl(oss->fd, _name, _val) == -1) { \
+#define GET_PARAM(_oss, _name, _val) \
+G_STMT_START { \
+ if (ioctl(oss->fd, _name, _val) == -1) { \
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ, \
- ("Unable to get param "G_STRINGIFY (_name)": %s", \
- g_strerror (errno)), \
- (NULL)); \
- return FALSE; \
- } \
- GST_DEBUG_OBJECT (_oss, G_STRINGIFY (_name)" %d", _val); \
+ ("Unable to get param "G_STRINGIFY (_name)": %s", \
+ g_strerror (errno)), \
+ (NULL)); \
+ return FALSE; \
+ } \
+ GST_DEBUG_OBJECT (_oss, G_STRINGIFY (_name)" %d", _val); \
} G_STMT_END
static gint
diff --git a/sys/oss/gstosssrc.h b/sys/oss/gstosssrc.h
index a3b5ba6fc..6f6f58faf 100644
--- a/sys/oss/gstosssrc.h
+++ b/sys/oss/gstosssrc.h
@@ -46,7 +46,7 @@ struct _GstOssSrc {
GstAudioSrc src;
gint fd;
- gint bytes_per_sample;
+ gint bytes_per_sample;
gchar *device;
gchar *device_name;