summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-06-19 19:51:25 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-06-19 19:51:25 +0000
commitbbb34d2a4b221867ff276d1b59e75fa9f49ff4cb (patch)
tree61c4a2258bb4369ec94d493aafac8cbd80c16f72
parent0207ae8d246fb74bdab61b637e05baf01b437a57 (diff)
downloadxine-lib-bbb34d2a4b221867ff276d1b59e75fa9f49ff4cb.tar.gz
xine-lib-bbb34d2a4b221867ff276d1b59e75fa9f49ff4cb.tar.bz2
force slave metronoms to reinit when a new master is attached; otherwise a
visualization plugin's metronom gets confused when you wire different streams to the plugin's input CVS patchset: 6710 CVS date: 2004/06/19 19:51:25
-rw-r--r--src/xine-engine/metronom.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index 57c34698b..261b02d00 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.138 2004/04/22 23:19:03 tmattern Exp $
+ * $Id: metronom.c,v 1.139 2004/06/19 19:51:25 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -784,6 +784,8 @@ static void metronom_set_master(metronom_t *this, metronom_t *master) {
* so we need his lock too */
if (old_master) pthread_mutex_lock(&old_master->lock);
this->master = master;
+ /* new master -> we have to reinit */
+ this->discontinuity_handled_count = 0;
if (old_master) pthread_mutex_unlock(&old_master->lock);
pthread_mutex_unlock(&this->lock);
}