summaryrefslogtreecommitdiff
path: root/src/audio_out
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-09-05 20:44:38 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-09-05 20:44:38 +0000
commitea37f5776a90a7f8153757052a89d589185f5d23 (patch)
treede101bed2e068b81d2abc03866112342e5858ebe /src/audio_out
parentc35a3e9d5068667992c1b104195de59721e23786 (diff)
downloadxine-lib-ea37f5776a90a7f8153757052a89d589185f5d23.tar.gz
xine-lib-ea37f5776a90a7f8153757052a89d589185f5d23.tar.bz2
make all the plugin init functions static
(geez this was a job) CVS patchset: 2616 CVS date: 2002/09/05 20:44:38
Diffstat (limited to 'src/audio_out')
-rw-r--r--src/audio_out/audio_alsa_out.c5
-rw-r--r--src/audio_out/audio_arts_out.c4
-rw-r--r--src/audio_out/audio_esd_out.c4
-rw-r--r--src/audio_out/audio_irixal_out.c4
-rw-r--r--src/audio_out/audio_oss_out.c4
-rw-r--r--src/audio_out/audio_sun_out.c4
6 files changed, 13 insertions, 12 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 5db74b169..49d33d74d 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
* (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
*
*
- * $Id: audio_alsa_out.c,v 1.76 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_alsa_out.c,v 1.77 2002/09/05 20:44:38 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -426,6 +426,7 @@ static int ao_alsa_delay (xine_ao_driver_t *this_gen)
/* snd_pcm_status_dump(pcm_stat, jcd_out); */
delay=snd_pcm_status_get_delay( pcm_stat );
/* printf("audio_alsa_out:delay:delay=%ld\n",delay); */
+ if (delay < 0) delay = 0;
return delay;
}
@@ -901,7 +902,7 @@ static void ao_alsa_mixer_init(xine_ao_driver_t *this_gen) {
/*
* Initialize plugin
*/
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
config_values_t *config = xine->config;
alsa_driver_t *this;
diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c
index f90d01bd5..a808ac1ce 100644
--- a/src/audio_out/audio_arts_out.c
+++ b/src/audio_out/audio_arts_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_arts_out.c,v 1.14 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_arts_out.c,v 1.15 2002/09/05 20:44:38 mroi Exp $
*/
/* required for swab() */
@@ -298,7 +298,7 @@ static int ao_arts_ctrl(xine_ao_driver_t *this_gen, int cmd, ...) {
}
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
/* config_values_t *config = xine->config; */
arts_driver_t *this;
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index ab489f471..5d7e32194 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_esd_out.c,v 1.20 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_esd_out.c,v 1.21 2002/09/05 20:44:38 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -362,7 +362,7 @@ static int ao_esd_ctrl(xine_ao_driver_t *this_gen, int cmd, ...) {
return 0;
}
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
config_values_t *config = xine->config;
esd_driver_t *this;
diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c
index 5b8191c16..f0ad61f17 100644
--- a/src/audio_out/audio_irixal_out.c
+++ b/src/audio_out/audio_irixal_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_irixal_out.c,v 1.8 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_irixal_out.c,v 1.9 2002/09/05 20:44:38 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -310,7 +310,7 @@ static int ao_irixal_ctrl(ao_driver_t *this_gen, int cmd, ...) {
return 0;
}
-ao_driver_t *init_audio_out_plugin (config_values_t *config)
+static void *init_audio_out_plugin (config_values_t *config)
{
irixal_driver_t *this;
ALvalue values [32];
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index d03ce62ad..53b0155c4 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_oss_out.c,v 1.72 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.73 2002/09/05 20:44:38 mroi Exp $
*
* 20-8-2001 First implementation of Audio sync and Audio driver separation.
* Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -611,7 +611,7 @@ static int ao_oss_ctrl(xine_ao_driver_t *this_gen, int cmd, ...) {
return 0;
}
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
config_values_t *config = xine->config;
oss_driver_t *this;
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index b5af274c8..78a5ef391 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_sun_out.c,v 1.21 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_sun_out.c,v 1.22 2002/09/05 20:44:38 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -650,7 +650,7 @@ static int ao_sun_ctrl(ao_driver_t *this_gen, int cmd, ...) {
return 0;
}
-ao_driver_t *init_audio_out_plugin (config_values_t *config) {
+static void *init_audio_out_plugin (config_values_t *config) {
sun_driver_t *this;
char *devname;