summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/audio_out/audio_alsa_out.c13
-rw-r--r--src/xine-engine/audio_out.c6
-rw-r--r--src/xine-engine/xine.c4
3 files changed, 10 insertions, 13 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index f62b8f714..3a93f4a39 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.80 2002/10/10 13:12:17 jcdutton Exp $
+ * $Id: audio_alsa_out.c,v 1.81 2002/10/12 10:36:50 jcdutton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -785,15 +785,8 @@ static int ao_alsa_ctrl(xine_ao_driver_t *this_gen, int cmd, ...) {
case AO_CTRL_FLUSH_BUFFERS:
if (this->audio_fd > 0) {
- printf("audio_alsa_out: flush buffer\n");
- if ((result=snd_pcm_reset(this->audio_fd)) < 0) {
- printf("audio_alsa_out: Reset call failed err=%d\n",result);
- }
- if ((result=snd_pcm_drain(this->audio_fd)) < 0) {
- printf("audio_alsa_out: Drain call failed err=%d\n",result);
- }
- if ((result=snd_pcm_prepare(this->audio_fd)) < 0) {
- printf("audio_alsa_out: Prepare call failed err=%d\n",result);
+ if ((result=snd_pcm_drop(this->audio_fd)) < 0) {
+ printf("audio_alsa_out: Drop call failed err=%d\n",result);
}
}
break;
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index b82072d60..564ed71ab 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.67 2002/10/10 13:12:18 jcdutton Exp $
+ * $Id: audio_out.c,v 1.68 2002/10/12 10:36:52 jcdutton Exp $
*
* 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
* (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -459,9 +459,13 @@ static void *ao_loop (void *this_gen) {
case 2:
{
this->metronom->allow_full_ao_fill_gap = 1;
+#ifdef LOG
printf ("audio_out:loop:pause: I feel sleepy.\n");
+#endif
xine_usec_sleep (10000);
+#ifdef LOG
printf ("audio_out:loop:pause: I wake up.\n");
+#endif
break;
}
}
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 75416701a..3b5b47347 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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: xine.c,v 1.162 2002/10/03 17:46:29 jkeil Exp $
+ * $Id: xine.c,v 1.163 2002/10/12 10:36:52 jcdutton Exp $
*
* top-level xine functions
*
@@ -231,7 +231,7 @@ static void xine_set_speed_internal (xine_t *this, int speed) {
void xine_stop_internal (xine_t *this) {
- printf ("xine_stop\n");
+ printf ("xine_stop. status before = %d\n", this->status);
if (this->status == XINE_STATUS_STOP) {
printf ("xine_stop ignored\n");