summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2005-09-19 16:14:02 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2005-09-19 16:14:02 +0000
commit097426600056a112752e92eb1c13f0d6900f3907 (patch)
tree5cc819adfef1b280bc5bc0b7a6bd5f92edfa9f55 /src/xine-engine
parent801a491a64cb01af880bd2093b3d350be38219a7 (diff)
downloadxine-lib-097426600056a112752e92eb1c13f0d6900f3907.tar.gz
xine-lib-097426600056a112752e92eb1c13f0d6900f3907.tar.bz2
*BUGFIX*
added missing mutex init in xine_ticket (fixes pause assert with win32-pthreads) added missing destroys due to pthread doc spells and houskeeping use directx of older versions too, possibility to use xine w/o HW accel CVS patchset: 7738 CVS date: 2005/09/19 16:14:02
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/events.c6
-rw-r--r--src/xine-engine/load_plugins.c6
-rw-r--r--src/xine-engine/metronom.h3
-rw-r--r--src/xine-engine/xine.c3
4 files changed, 12 insertions, 6 deletions
diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c
index e7aa28772..ef399b5c6 100644
--- a/src/xine-engine/events.c
+++ b/src/xine-engine/events.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: events.c,v 1.27 2005/06/13 00:32:12 miguelfreitas Exp $
+ * $Id: events.c,v 1.28 2005/09/19 16:14:02 valtri Exp $
*
* Event handling functions
*
@@ -183,6 +183,10 @@ void xine_event_dispose_queue (xine_event_queue_t *queue) {
xine_event_free (event);
}
+ pthread_mutex_destroy(&queue->lock);
+ pthread_cond_destroy(&queue->new_event);
+ pthread_cond_destroy(&queue->events_processed);
+
free (queue);
}
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index d7005b733..24f51af45 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.215 2005/09/11 22:07:48 miguelfreitas Exp $
+ * $Id: load_plugins.c,v 1.216 2005/09/19 16:14:02 valtri Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -2506,7 +2506,9 @@ void _x_dispose_plugins (xine_t *this) {
for (i = 0; this->plugin_catalog->prio_desc[i]; i++)
free(this->plugin_catalog->prio_desc[i]);
-
+
+ pthread_mutex_destroy(&this->plugin_catalog->lock);
+
free (this->plugin_catalog);
}
}
diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h
index 78834e02a..2a8f0e94d 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.62 2004/09/26 22:54:52 valtri Exp $
+ * $Id: metronom.h,v 1.63 2005/09/19 16:14:02 valtri Exp $
*
* metronom: general pts => virtual calculation/assoc
*
@@ -202,7 +202,6 @@ struct metronom_s {
int discontinuity_handled_count;
pthread_cond_t video_discontinuity_reached;
pthread_cond_t audio_discontinuity_reached;
- pthread_cond_t cancel;
int force_video_jump;
int force_audio_jump;
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 40b773af7..ce37b289e 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.317 2005/09/11 22:07:48 miguelfreitas Exp $
+ * $Id: xine.c,v 1.318 2005/09/19 16:14:02 valtri Exp $
*/
/*
@@ -232,6 +232,7 @@ static xine_ticket_t *ticket_init(void) {
pthread_mutex_init(&port_ticket->lock, NULL);
pthread_mutex_init(&port_ticket->revoke_lock, NULL);
pthread_cond_init(&port_ticket->issued, NULL);
+ pthread_cond_init(&port_ticket->revoked, NULL);
return port_ticket;
}