diff options
| author | Andy Wingo <wingo@pobox.com> | 2005-07-08 11:19:19 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2005-07-08 11:19:19 +0000 |
| commit | 6fc2023e8fec8c86ba1008edfd68e8998729318b (patch) | |
| tree | 83d01640f8ff7789ac5894c16cb5245b3bd57c8b /sys/oss/gstosselement.h | |
| parent | 266b874436d0b23d96d07bc09ad52e363c275b58 (diff) | |
sys/oss/: Port from THREADED+wim's fixes.
Original commit message from CVS:
2005-07-08 Andy Wingo <wingo@pobox.com>
* sys/oss/: Port from THREADED+wim's fixes.
Diffstat (limited to 'sys/oss/gstosselement.h')
| -rw-r--r-- | sys/oss/gstosselement.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sys/oss/gstosselement.h b/sys/oss/gstosselement.h index fb161ad6..b895d42b 100644 --- a/sys/oss/gstosselement.h +++ b/sys/oss/gstosselement.h @@ -26,9 +26,7 @@ #include <gst/gst.h> #include <sys/types.h> -/* debugging category */ -GST_DEBUG_CATEGORY_EXTERN (oss_debug); -#define GST_CAT_DEFAULT oss_debug +#include "gstosshelper.h" G_BEGIN_DECLS @@ -48,16 +46,6 @@ G_BEGIN_DECLS typedef struct _GstOssElement GstOssElement; typedef struct _GstOssElementClass GstOssElementClass; -typedef enum { - GST_OSSELEMENT_READ, - GST_OSSELEMENT_WRITE, -} GstOssOpenMode; - -typedef struct _GstOssDeviceCombination { - gchar *dsp, *mixer; - dev_t dev; -} GstOssDeviceCombination; - struct _GstOssElement { /* yes, we're a gstelement too */ @@ -73,7 +61,6 @@ struct _GstOssElement gint fragment; guint64 fragment_time; gint fragment_size; - GstOssOpenMode mode; GstCaps *probed_caps; /* stats bytes per *second* */ @@ -90,6 +77,7 @@ struct _GstOssElement gint depth; gint channels; gint rate; + gint mode; /* mixer stuff */ GList *tracklist; @@ -115,8 +103,12 @@ gboolean gst_osselement_parse_caps (GstOssElement *oss, gboolean gst_osselement_merge_fixed_caps (GstOssElement *oss, GstCaps *caps); +gboolean gst_osselement_open_audio (GstOssElement *oss, GstOssOpenMode mode); gboolean gst_osselement_sync_parms (GstOssElement *oss); void gst_osselement_reset (GstOssElement *oss); +void gst_osselement_close_audio (GstOssElement *oss); + + gboolean gst_osselement_convert (GstOssElement *oss, GstFormat src_format, |