summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/xine-engine/audio_out.c4
-rw-r--r--src/xine-engine/video_out.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 0505b440f..a612360b1 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.144 2003/09/04 13:56:23 miguelfreitas Exp $
+ * $Id: audio_out.c,v 1.145 2003/09/13 16:15:38 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>
@@ -1680,7 +1680,7 @@ static void ao_flush (xine_audio_port_t *this_gen) {
this->flush_audio_driver++;
/* do not try this in paused mode */
- while( this->flush_audio_driver ) {
+ while( this->flush_audio_driver && !this->audio_paused) {
struct timeval tv;
struct timespec ts;
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 70365a1e0..62dda64be 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_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: video_out.c,v 1.170 2003/09/05 14:39:46 miguelfreitas Exp $
+ * $Id: video_out.c,v 1.171 2003/09/13 16:15:38 miguelfreitas Exp $
*
* frame allocation / queuing / scheduling / output functions
*/
@@ -1438,7 +1438,7 @@ static void vo_flush (xine_video_port_t *this_gen) {
pthread_mutex_unlock(&this->display_img_buf_queue->mutex);
/* do not try this in paused mode */
- while(1) {
+ while(this->clock->speed != XINE_SPEED_PAUSE) {
pthread_mutex_lock(&this->display_img_buf_queue->mutex);
img = this->display_img_buf_queue->first;
pthread_mutex_unlock(&this->display_img_buf_queue->mutex);