summaryrefslogtreecommitdiff
path: root/src/xine-engine/metronom.h
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-11-16 12:15:21 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-11-16 12:15:21 +0000
commit8cc82907bd8a41336a93b92b989295af8fdfe231 (patch)
treeb9ef319d0462616ef7f99694df0c34734ade39d2 /src/xine-engine/metronom.h
parent5506e8aae5bfc5297b549685c928ffc29046db99 (diff)
downloadxine-lib-8cc82907bd8a41336a93b92b989295af8fdfe231.tar.gz
xine-lib-8cc82907bd8a41336a93b92b989295af8fdfe231.tar.bz2
introduce the slave metronom concept (Thibaut, Miguel: it's a bit different
from what we discussed, details on xine-devel) metronom holds a master metronom pointer now and uses this master to match its syncing CVS patchset: 5742 CVS date: 2003/11/16 12:15:21
Diffstat (limited to 'src/xine-engine/metronom.h')
-rw-r--r--src/xine-engine/metronom.h19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h
index 04304de20..1cf72eeb6 100644
--- a/src/xine-engine/metronom.h
+++ b/src/xine-engine/metronom.h
@@ -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.h,v 1.53 2003/11/15 20:43:11 mroi Exp $
+ * $Id: metronom.h,v 1.54 2003/11/16 12:15:21 mroi Exp $
*
* metronom: general pts => virtual calculation/assoc
*
@@ -166,16 +166,24 @@ struct metronom_s {
void (*set_option) (metronom_t *self, int option, int64_t value);
int64_t (*get_option) (metronom_t *self, int option);
- void (*exit) (metronom_t *self);
-
/*
- * pointer to current xine object.
+ * set a master metronom
+ * this is currently useful to sync independently generated streams
+ * (e.g. by post plugins) to the discontinuity domain of another
+ * metronom
*/
- xine_t *xine;
+ void (*set_master) (metronom_t *self, metronom_t *master);
+ void (*exit) (metronom_t *self);
+
+/*#ifdef XINE_ENGINE_INTERNAL*/
+#if 1
/*
* metronom internal stuff
*/
+ xine_t *xine;
+
+ metronom_t *master;
int64_t pts_per_smpls;
@@ -213,6 +221,7 @@ struct metronom_s {
int64_t last_video_pts;
int64_t last_audio_pts;
+#endif
};
/*