summaryrefslogtreecommitdiff
path: root/src/xine-engine/xine.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-11-15 20:43:11 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-11-15 20:43:11 +0000
commit8ba7feda3dbbeb3c48a98ae36e67c8d66d04c3f9 (patch)
tree2c2cbd6d1e55ec2d9dc836bc89b8efe9d0ca315c /src/xine-engine/xine.c
parent9271a230caa25831202936e63cce3716ffe2011a (diff)
downloadxine-lib-8ba7feda3dbbeb3c48a98ae36e67c8d66d04c3f9.tar.gz
xine-lib-8ba7feda3dbbeb3c48a98ae36e67c8d66d04c3f9.tar.bz2
* making metronom xine_stream_t independent
* using xprintf() and lprintf() inside metronom * prebuffer is now a metronom option * some small structure cleanup CVS patchset: 5737 CVS date: 2003/11/15 20:43:11
Diffstat (limited to 'src/xine-engine/xine.c')
-rw-r--r--src/xine-engine/xine.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 2e28fc6fc..0679e4ae2 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.264 2003/11/15 14:00:35 miguelfreitas Exp $
+ * $Id: xine.c,v 1.265 2003/11/15 20:43:11 mroi Exp $
*/
/*
@@ -387,7 +387,6 @@ xine_stream_t *xine_stream_new (xine_t *this,
stream->err = 0;
stream->next_audio_port = NULL;
stream->next_video_port = NULL;
- stream->metronom_prebuffer = PREBUFFER_PTS_OFFSET;
stream->broadcaster = NULL;
/*
@@ -424,7 +423,7 @@ xine_stream_t *xine_stream_new (xine_t *this,
* create a metronom
*/
- stream->metronom = _x_metronom_init ( (ao != NULL), stream);
+ stream->metronom = _x_metronom_init ( (ao != NULL), this);
/*
* alloc fifos, init and start decoder threads
@@ -1305,7 +1304,7 @@ void xine_init (xine_t *this) {
* start metronom clock
*/
- this->clock = _x_metronom_clock_init();
+ this->clock = _x_metronom_clock_init(this);
this->clock->start_clock (this->clock, 0);