diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-05 20:54:37 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-05 20:54:37 +0000 |
| commit | 52ae732957764b953b3b2491afda4376ce595c43 (patch) | |
| tree | 9d227674f6c3467f1a9ae60bce88ab29a37265f8 /src/audio_out/audio_oss_out.c | |
| parent | d84e2d680f143bfe1fbbf987f5a9bdd5318284ed (diff) | |
| download | xine-lib-52ae732957764b953b3b2491afda4376ce595c43.tar.gz xine-lib-52ae732957764b953b3b2491afda4376ce595c43.tar.bz2 | |
- win32 bugfixes
- asf bugfixes
- ffmpeg supporting ms iso mpeg4
- softsync fix by Bill Fink
CVS patchset: 2216
CVS date: 2002/07/05 20:54:37
Diffstat (limited to 'src/audio_out/audio_oss_out.c')
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index af1264a7a..429e084ae 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.70 2002/07/01 13:51:27 miguelfreitas Exp $ + * $Id: audio_oss_out.c,v 1.71 2002/07/05 20:54:37 miguelfreitas Exp $ * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -589,7 +589,8 @@ static int ao_oss_ctrl(ao_driver_t *this_gen, int cmd, ...) { case AO_CTRL_PLAY_PAUSE: printf ("audio_oss_out: AO_CTRL_PLAY_PAUSE\n"); - ioctl(this->audio_fd, SNDCTL_DSP_RESET, NULL); + if (this->sync_method != OSS_SYNC_SOFTSYNC) + ioctl(this->audio_fd, SNDCTL_DSP_RESET, NULL); /* Uncomment the following lines if RESET causes problems * ao_oss_close(this_gen); * ao_oss_open(this_gen, this->bits_per_sample, this->input_sample_rate, this->mode); @@ -602,7 +603,8 @@ static int ao_oss_ctrl(ao_driver_t *this_gen, int cmd, ...) { case AO_CTRL_FLUSH_BUFFERS: printf ("audio_oss_out: AO_CTRL_FLUSH_BUFFERS\n"); - ioctl(this->audio_fd, SNDCTL_DSP_RESET, NULL); + if (this->sync_method != OSS_SYNC_SOFTSYNC) + ioctl(this->audio_fd, SNDCTL_DSP_RESET, NULL); break; } |