diff options
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 14 | ||||
| -rw-r--r-- | src/libac3/xine_decoder.c | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 095e6baa5..fb5906776 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.19 2001/06/24 23:08:42 guenter Exp $ + * $Id: audio_oss_out.c,v 1.20 2001/07/14 17:45:06 jcdutton Exp $ */ /* required for swab() */ @@ -284,11 +284,12 @@ static int ao_write_audio_data(ao_functions_t *this_gen, vpts = this->metronom->got_audio_samples (this->metronom, pts_, num_samples); - xprintf (VERBOSE|AUDIO, "audio_oss_out: got %d samples, vpts=%d\n", - num_samples, vpts); + xprintf (VERBOSE|AUDIO, "audio_oss_out: got %d samples, vpts=%d pts=%d\n", + num_samples, vpts,pts_); if (vpts<this->last_audio_vpts) { /* reject this */ + xprintf (VERBOSE|AUDIO, "audio_oss_out: rejected sample vpts=%d, last_audio_vpts=%d\n", vpts,this->last_audio_vpts) return 1; } @@ -313,15 +314,12 @@ static int ao_write_audio_data(ao_functions_t *this_gen, buffer_vpts += (this->bytes_in_buffer - pos) * 1024 / this->bytes_per_kpts; /* - printf ("audio_oss_out: got audio package vpts = %d, buffer_vpts = %d\n", - vpts, buffer_vpts); - */ - - /* * calculate gap: */ gap = vpts - buffer_vpts; + xprintf (VERBOSE|AUDIO, "audio_oss_out: buff=%d pos=%d buf_vpts=%d gap=%d\n", + this->bytes_in_buffer, pos,buffer_vpts,gap); bDropPackage = 0; diff --git a/src/libac3/xine_decoder.c b/src/libac3/xine_decoder.c index 04b4e114c..6374afc07 100644 --- a/src/libac3/xine_decoder.c +++ b/src/libac3/xine_decoder.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_decoder.c,v 1.12 2001/07/10 22:11:06 guenter Exp $ + * $Id: xine_decoder.c,v 1.13 2001/07/14 17:45:07 jcdutton Exp $ * * stuff needed to turn libac3 into a xine decoder plugin */ @@ -139,7 +139,7 @@ void ac3dec_init (audio_decoder_t *this_gen, ao_functions_t *audio_out) { /* else if (this->audio_caps & AO_CAP_MODE_STEREO) defaults are ok */ - } else { + } else if (!(this->audio_caps & AO_CAP_MODE_STEREO)) { printf ("HELP! a mono-only audio driver?!\n"); this->ac3_flags_map[AC3_MONO] = AC3_MONO; |