diff options
| author | Justin Karnegas <justin@affinix.com> | 2009-01-02 20:39:34 +0000 |
|---|---|---|
| committer | Michael Smith <msmith@xiph.org> | 2009-01-02 20:39:34 +0000 |
| commit | 17bb67f873a0bd3c4e631ed510a15799c253fc18 (patch) | |
| tree | 710ea439dbb43826a10e0037ee144b6133f30b70 /sys/osxaudio/gstosxaudiosrc.h | |
| parent | 996fb72681d3da4fce8cb2e94957fe72aa832d8b (diff) | |
sys/osxaudio/: Rewrite osxaudio to work more flexibly and more reliably, using a different abstraction layer of corea...
Original commit message from CVS:
Patch by: Justin Karnegas <justin@affinix.com> and
Michael Smith <msmith@songbirdnest.com>
* sys/osxaudio/gstosxaudio.c:
* sys/osxaudio/gstosxaudioelement.c:
* sys/osxaudio/gstosxaudioelement.h:
* sys/osxaudio/gstosxaudiosink.c:
* sys/osxaudio/gstosxaudiosink.h:
* sys/osxaudio/gstosxaudiosrc.c:
* sys/osxaudio/gstosxaudiosrc.h:
* sys/osxaudio/gstosxringbuffer.c:
* sys/osxaudio/gstosxringbuffer.h:
Rewrite osxaudio to work more flexibly and more reliably, using a
different abstraction layer of coreaudio that is the recommended way of
doing low-level audio I/O on OSX.
Fixes byg #564948.
Diffstat (limited to 'sys/osxaudio/gstosxaudiosrc.h')
| -rw-r--r-- | sys/osxaudio/gstosxaudiosrc.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/osxaudio/gstosxaudiosrc.h b/sys/osxaudio/gstosxaudiosrc.h index 7336c82f..a812d9ef 100644 --- a/sys/osxaudio/gstosxaudiosrc.h +++ b/sys/osxaudio/gstosxaudiosrc.h @@ -1,7 +1,7 @@ /* * GStreamer - * Copyright 2005-2006 Zaheer Abbas Merali <zaheerabbas at merali dot org> - * + * Copyright (C) 2005-2006 Zaheer Abbas Merali <zaheerabbas at merali dot org> + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation @@ -50,7 +50,6 @@ G_BEGIN_DECLS -/* #defines don't like whitespacey bits */ #define GST_TYPE_OSX_AUDIO_SRC \ (gst_osx_audio_src_get_type()) #define GST_OSX_AUDIO_SRC(obj) \ @@ -58,7 +57,7 @@ G_BEGIN_DECLS #define GST_OSX_AUDIO_SRC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSX_AUDIO_SRC,GstOsxAudioSrcClass)) -typedef struct _GstOsxAudioSrc GstOsxAudioSrc; +typedef struct _GstOsxAudioSrc GstOsxAudioSrc; typedef struct _GstOsxAudioSrcClass GstOsxAudioSrcClass; struct _GstOsxAudioSrc @@ -66,7 +65,9 @@ struct _GstOsxAudioSrc GstBaseAudioSrc src; AudioDeviceID device_id; - AudioStreamID stream_id; + + /* actual number of channels reported by input device */ + int deviceChannels; }; struct _GstOsxAudioSrcClass |