diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-22 21:19:09 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-22 21:19:09 +0000 |
| commit | c3ab539c46f71c26093ef9d22b851a60f9e49cc7 (patch) | |
| tree | 45a239f226a600e638a7065e8b699ed17c228afa | |
| parent | 66cd6367c14512c290bb681c69cfc1e271ed72c2 (diff) | |
| download | xine-lib-c3ab539c46f71c26093ef9d22b851a60f9e49cc7.tar.gz xine-lib-c3ab539c46f71c26093ef9d22b851a60f9e49cc7.tar.bz2 | |
add SLAVE_SPEED feature
CVS patchset: 5771
CVS date: 2003/11/22 21:19:09
| -rw-r--r-- | include/xine.h.in | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index b1fa34457..a6821dbcb 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -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.h.in,v 1.104 2003/11/06 22:25:54 f1rmb Exp $ + * $Id: xine.h.in,v 1.105 2003/11/22 21:19:09 f1rmb Exp $ * * public xine-lib (libxine) interface and documentation * @@ -211,6 +211,8 @@ int xine_stream_master_slave(xine_stream_t *master, xine_stream_t *slave, #define XINE_MASTER_SLAVE_PLAY (1<<0) /* slave stops on master stop */ #define XINE_MASTER_SLAVE_STOP (1<<1) +/* slave is synced to master's speed */ +#define XINE_MASTER_SLAVE_SPEED (1<<2) /* * open a stream diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 68993354b..08bd03d82 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.268 2003/11/20 00:42:14 tmattern Exp $ + * $Id: xine.c,v 1.269 2003/11/22 21:19:09 f1rmb Exp $ */ /* @@ -1435,6 +1435,9 @@ void _x_set_speed (xine_stream_t *stream, int speed) { xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "set_speed %d\n", speed); __set_speed_internal (stream, speed); + + if (stream->slave && (stream->slave_affection & XINE_MASTER_SLAVE_SPEED)) + __set_speed_internal (stream->slave, speed); pthread_mutex_unlock (&stream->frontend_lock); } |