diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2004-03-05 23:44:39 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2004-03-05 23:44:39 +0000 |
| commit | a012f5ac47a2b9dc528d6c266c546962ae70fb97 (patch) | |
| tree | b6d8f6e976383cec79c951567cd1d483149e3a14 | |
| parent | 7382287411458a56e63de0617ff126be728695f1 (diff) | |
| download | xine-lib-a012f5ac47a2b9dc528d6c266c546962ae70fb97.tar.gz xine-lib-a012f5ac47a2b9dc528d6c266c546962ae70fb97.tar.bz2 | |
forgot to uncomment the pthread_{cancel,join} portion
CVS patchset: 6226
CVS date: 2004/03/05 23:44:39
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 12899d0e9..3c443070f 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.127 2004/03/05 23:01:26 f1rmb Exp $ + * $Id: audio_alsa_out.c,v 1.128 2004/03/05 23:44:39 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -829,14 +829,14 @@ static void ao_alsa_exit(ao_driver_t *this_gen) { * between closing the handle and spawning the child process * (i.e. xscreensaver). */ -/* + if(this->mixer.handle) { pthread_cancel(this->mixer.thread); pthread_join(this->mixer.thread, NULL); snd_mixer_close(this->mixer.handle); this->mixer.handle=0; } -*/ + if (this->audio_fd) snd_pcm_close(this->audio_fd); this->audio_fd=NULL; free (this); |