diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-12 01:44:39 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-12 01:44:39 +0000 |
| commit | ed180322f83ac97c66f1bed574cfe3b946261407 (patch) | |
| tree | 04c554a09a45861571c9c710227c85ef2dd3279d | |
| parent | 1d562461018061538f884b5c3720902a8b0e8135 (diff) | |
| download | xine-lib-ed180322f83ac97c66f1bed574cfe3b946261407.tar.gz xine-lib-ed180322f83ac97c66f1bed574cfe3b946261407.tar.bz2 | |
Fix using va_arg without explicit NULL 'terminator'
CVS patchset: 5892
CVS date: 2003/12/12 01:44:39
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 87ac533b9..9b7bba302 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.120 2003/12/07 15:34:29 f1rmb Exp $ + * $Id: audio_alsa_out.c,v 1.121 2003/12/12 01:44:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -977,7 +977,7 @@ static int ao_alsa_ctrl(ao_driver_t *this_gen, int cmd, ...) { xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "audio_alsa_out: Pause call failed. (err=%d:%s)\n",err, snd_strerror(err)); this->has_pause_resume = 0; - ao_alsa_ctrl(this_gen, AO_CTRL_PLAY_PAUSE); + ao_alsa_ctrl(this_gen, AO_CTRL_PLAY_PAUSE, NULL); } } else { if ((err=snd_pcm_reset(this->audio_fd)) < 0) { diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index f49186860..688709a4a 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.157 2003/12/10 20:51:01 miguelfreitas Exp $ + * $Id: audio_out.c,v 1.158 2003/12/12 01:44:40 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> @@ -893,7 +893,7 @@ static void *ao_loop (void *this_gen) { pthread_mutex_lock(&this->flush_audio_driver_lock); if (this->flush_audio_driver) { - this->ao.control(&this->ao, AO_CTRL_FLUSH_BUFFERS); + this->ao.control(&this->ao, AO_CTRL_FLUSH_BUFFERS, NULL); this->flush_audio_driver--; pthread_cond_broadcast(&this->flush_audio_driver_reached); } diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 68e1f4c43..b5a0316d2 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.274 2003/12/05 15:55:05 f1rmb Exp $ + * $Id: xine.c,v 1.275 2003/12/12 01:44:40 f1rmb Exp $ */ /* @@ -141,10 +141,10 @@ static void __set_speed_internal (xine_stream_t *stream, int speed) { * samples from the sound driver */ if (speed != XINE_SPEED_NORMAL && speed != XINE_SPEED_PAUSE) - stream->audio_out->control (stream->audio_out, AO_CTRL_FLUSH_BUFFERS); + stream->audio_out->control (stream->audio_out, AO_CTRL_FLUSH_BUFFERS, NULL); stream->audio_out->control(stream->audio_out, - speed == XINE_SPEED_PAUSE ? AO_CTRL_PLAY_PAUSE : AO_CTRL_PLAY_RESUME); + speed == XINE_SPEED_PAUSE ? AO_CTRL_PLAY_PAUSE : AO_CTRL_PLAY_RESUME, NULL); } } @@ -897,7 +897,7 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) { /* remove buffered samples from the sound device driver */ /* why? */ /*if (stream->audio_out) - stream->audio_out->control (stream->audio_out, AO_CTRL_FLUSH_BUFFERS); + stream->audio_out->control (stream->audio_out, AO_CTRL_FLUSH_BUFFERS, NULL); */ stream->status = XINE_STATUS_STOP; |