diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-30 02:18:35 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-30 02:18:35 +0000 |
| commit | 5fd98dc3451215272aadbe93dbb7e43805050fc3 (patch) | |
| tree | 14768677bdde796f8b26e4ff9dd60643bf96d5d9 /src/xine-engine/audio_out.c | |
| parent | f32c34a198bb2f407b6ceb1157e7239d1c2f6d79 (diff) | |
| download | xine-lib-5fd98dc3451215272aadbe93dbb7e43805050fc3.tar.gz xine-lib-5fd98dc3451215272aadbe93dbb7e43805050fc3.tar.bz2 | |
gapless playback stream switching support
CVS patchset: 7784
CVS date: 2005/10/30 02:18:35
Diffstat (limited to 'src/xine-engine/audio_out.c')
| -rw-r--r-- | src/xine-engine/audio_out.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index f7120d919..d7567994c 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.193 2005/09/14 23:42:37 miguelfreitas Exp $ + * $Id: audio_out.c,v 1.194 2005/10/30 02:18:35 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> @@ -1528,7 +1528,7 @@ static void ao_close(xine_audio_port_t *this_gen, xine_stream_t *stream) { pthread_mutex_unlock(&this->streams_lock); /* close driver if no streams left */ - if (!cur && !this->grab_only) { + if (!cur && !this->grab_only && !stream->gapless_switch) { xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: no streams left, closing driver\n"); if (this->audio_loop_running) { @@ -1786,6 +1786,7 @@ static int ao_set_property (xine_audio_port_t *this_gen, int property, int value this->discard_buffers++; else this->discard_buffers--; + ret = this->discard_buffers; /* discard buffers here because we have no output thread */ |