From 3e851ea7edffc542d98a5e8b0ee87e8db1d93498 Mon Sep 17 00:00:00 2001 From: maroy Date: Sun, 2 Jan 2005 12:04:15 +0000 Subject: [PATCH] changed the open() call, to enable opening new clips without playing the previous one --- livesupport/modules/playlistExecutor/src/HelixPlayer.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx b/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx index f5d38bdd1..4298c20d6 100644 --- a/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx +++ b/livesupport/modules/playlistExecutor/src/HelixPlayer.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.6 $ + Version : $Revision: 1.7 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/Attic/HelixPlayer.cxx,v $ ------------------------------------------------------------------------------*/ @@ -237,7 +237,9 @@ HelixPlayer :: open(const std::string fileUrl) if (HXR_OK != player->OpenURL(fileUrl.c_str())) { throw std::invalid_argument("can't open URL"); } - if (sourceCount == player->GetSourceCount()) { + // if the source count was not 0 before OpenURL(), the source is simply + // replaced + if (!sourceCount && sourceCount == player->GetSourceCount()) { throw std::invalid_argument("can't open URL"); } }