summaryrefslogtreecommitdiff
path: root/src/xine-engine/xine.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-09-18 15:37:11 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-09-18 15:37:11 +0000
commit8d1e6097673f2152fa9f98041610973d3ee6a52a (patch)
treeddac74fca0eb844d5b2daac8d818b152f98a37f8 /src/xine-engine/xine.c
parente4ac1f1382f67f61f527d41ab4f32c34720f0c2d (diff)
downloadxine-lib-8d1e6097673f2152fa9f98041610973d3ee6a52a.tar.gz
xine-lib-8d1e6097673f2152fa9f98041610973d3ee6a52a.tar.bz2
fix reentrant in event listeners by only allowing one event per type
CVS patchset: 2689 CVS date: 2002/09/18 15:37:11
Diffstat (limited to 'src/xine-engine/xine.c')
-rw-r--r--src/xine-engine/xine.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 246c7bccb..54d69de21 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.159 2002/09/18 00:51:34 guenter Exp $
+ * $Id: xine.c,v 1.160 2002/09/18 15:37:11 mroi Exp $
*
* top-level xine functions
*
@@ -649,6 +649,8 @@ void xine_exit (xine_p this_ro) {
pthread_mutex_destroy (&this->xine_lock);
pthread_mutex_destroy (&this->finished_lock);
pthread_mutex_destroy (&this->osd_lock);
+ pthread_mutex_destroy (&this->event_lock);
+ pthread_cond_destroy (&this->event_handled);
free (this);
@@ -683,7 +685,11 @@ xine_p xine_new (void) {
pthread_mutex_init (&this->finished_lock, NULL);
pthread_mutex_init (&this->osd_lock, NULL);
-
+
+ pthread_mutex_init (&this->event_lock, NULL);
+
+ pthread_cond_init (&this->event_handled, NULL);
+
this->finished_thread_running = 0;
/*