summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/metronom.c9
-rw-r--r--src/xine-engine/video_decoder.c4
-rw-r--r--src/xine-engine/xine.c4
3 files changed, 7 insertions, 10 deletions
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index c1f54405a..224348c3a 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.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: metronom.c,v 1.7 2001/06/03 18:08:56 guenter Exp $
+ * $Id: metronom.c,v 1.8 2001/06/04 17:13:36 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -39,7 +39,7 @@
#define MAX_PTS_TOLERANCE 5000
#define MAX_VIDEO_DELTA 1600
#define AUDIO_SAMPLE_NUM 32768
-#define MAX_WRAP_TOLERANCE 180000
+#define MAX_WRAP_TOLERANCE 90000
static void metronom_reset (metronom_t *this) {
@@ -66,11 +66,6 @@ static void metronom_reset (metronom_t *this) {
this->av_offset = 0;
- this->stopped = 1;
-
- this->last_pts = 0;
- this->start_pts = 0;
-
pthread_mutex_unlock (&this->lock);
}
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 325e86c0f..bbe5214b6 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_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: video_decoder.c,v 1.18 2001/06/04 17:01:47 f1rmb Exp $
+ * $Id: video_decoder.c,v 1.19 2001/06/04 17:13:36 guenter Exp $
*
*/
@@ -69,7 +69,7 @@ void *video_decoder_loop (void *this_gen) {
case BUF_VIDEO_AVI:
streamtype = (buf->type>>16) & 0xFF;
-
+
decoder = this->video_decoder_plugins [streamtype];
if (decoder) {
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 69ee62a2c..26352da6d 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.21 2001/06/03 18:08:56 guenter Exp $
+ * $Id: xine.c,v 1.22 2001/06/04 17:13:36 guenter Exp $
*
* top-level xine functions
*
@@ -466,6 +466,8 @@ void xine_select_audio_channel (xine_t *this, int channel) {
this->audio_channel = channel;
+ /* this->metronom->reset(this->metronom); */
+
pthread_mutex_unlock (&this->xine_lock);
}