summaryrefslogtreecommitdiff
path: root/src/xine-engine/audio_out.c
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-10-01 23:04:57 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-10-01 23:04:57 +0000
commitc48149133f36b24fb87924209a950681be0727c7 (patch)
tree18a1126eeaecf6a6310fb9d74e91a531b2c62f40 /src/xine-engine/audio_out.c
parent9d7e1140adde62d0959af667474a54470d98968a (diff)
downloadxine-lib-c48149133f36b24fb87924209a950681be0727c7.tar.gz
xine-lib-c48149133f36b24fb87924209a950681be0727c7.tar.bz2
Add simple mixer control in xine-engine/ao plugins. Fixed some missings
in audio_decoder. xine-ui warn at compile time due of a #warning i added, i will remove it pretty soon. CVS patchset: 715 CVS date: 2001/10/01 23:04:57
Diffstat (limited to 'src/xine-engine/audio_out.c')
-rw-r--r--src/xine-engine/audio_out.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 20fd26876..27fb336b2 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
* along with self program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_out.c,v 1.17 2001/09/12 22:00:51 joachim_koenig Exp $
+ * $Id: audio_out.c,v 1.18 2001/10/01 23:04:57 f1rmb Exp $
*
* 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
* (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -406,12 +406,26 @@ static void ao_close(ao_instance_t *this)
this->driver->close(this->driver);
}
+static void ao_exit(ao_instance_t *this) {
+ this->driver->exit(this->driver);
+}
+
static uint32_t ao_get_capabilities (ao_instance_t *this) {
uint32_t result;
result=this->driver->get_capabilities(this->driver);
return result;
}
+static int ao_get_property (ao_instance_t *this, int property) {
+
+ return(this->driver->get_property(this->driver, property));
+}
+
+static int ao_set_property (ao_instance_t *this, int property, int value) {
+
+ return(this->driver->set_property(this->driver, property, value));
+}
+
ao_instance_t *ao_new_instance (ao_driver_t *driver, metronom_t *metronom,
config_values_t *config) {
@@ -425,7 +439,10 @@ ao_instance_t *ao_new_instance (ao_driver_t *driver, metronom_t *metronom,
this->open = ao_open;
this->write = ao_write;
this->close = ao_close;
+ this->exit = ao_exit;
this->get_capabilities = ao_get_capabilities;
+ this->get_property = ao_get_property;
+ this->set_property = ao_set_property;
this->audio_loop_running = 0;
this->frame_buffer = xmalloc (40000);
this->zero_space = xmalloc (ZERO_BUF_SIZE * 2 * 6);