diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-09-03 16:38:48 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-09-03 16:38:48 +0000 |
| commit | 2e63499c00644768b0652b63673f66395def9868 (patch) | |
| tree | 9ae6b7d9793acaf685406ff6007fe1be2a24974d /src | |
| parent | 8a3ff12c05ff789466c662163e050b4bf516958c (diff) | |
| download | xine-lib-2e63499c00644768b0652b63673f66395def9868.tar.gz xine-lib-2e63499c00644768b0652b63673f66395def9868.tar.bz2 | |
fix freeze condition (more than 1 flush at the same time)
CVS patchset: 5336
CVS date: 2003/09/03 16:38:48
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/audio_out.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 43bd0b3aa..11f8592fc 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.140 2003/09/01 04:08:41 jcdutton Exp $ + * $Id: audio_out.c,v 1.141 2003/09/03 16:38:48 miguelfreitas Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -894,7 +894,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->flush_audio_driver = 0; + this->flush_audio_driver--; pthread_cond_signal(&this->flush_audio_driver_reached); } @@ -1677,7 +1677,7 @@ static void ao_flush (xine_audio_port_t *this_gen) { if( this->audio_loop_running ) { pthread_mutex_lock(&this->flush_audio_driver_lock); this->discard_buffers++; - this->flush_audio_driver = 1; + this->flush_audio_driver++; /* do not try this in paused mode */ while( this->flush_audio_driver ) { |