mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-14 03:15:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

port to new gthread API

Browse source
This commit is contained in:
Wim Taymans 2012-01-19 11:34:41 +01:00
parent 7064bae5b6
commit a95015dcfd
4 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/asfdemux/gstasfdemux.c
View file

@ -32,10 +32,6 @@
#include "config.h"
#endif
/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex
* with newer GLib versions (>= 2.31.0) */
#define GLIB_DISABLE_DEPRECATION_WARNINGS
#include <gst/gstutils.h>
#include <gst/base/gstbytereader.h>
#include <gst/riff/riff-media.h>

4
gst/realmedia/rademux.c
View file

@ -41,10 +41,6 @@
#include "config.h"
#endif
/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex
* with newer GLib versions (>= 2.31.0) */
#define GLIB_DISABLE_DEPRECATION_WARNINGS
#include "rademux.h"
#include "rmdemux.h"
#include "rmutils.h"

20
gst/realmedia/rdtmanager.c
View file

@ -147,7 +147,7 @@ static void gst_rdt_manager_loop (GstPad * pad);
static guint gst_rdt_manager_signals[LAST_SIGNAL] = { 0 };
#define JBUF_LOCK(sess) (g_mutex_lock ((sess)->jbuf_lock))
#define JBUF_LOCK(sess) (g_mutex_lock (&(sess)->jbuf_lock))
#define JBUF_LOCK_CHECK(sess,label) G_STMT_START { \
JBUF_LOCK (sess); \
@ -155,8 +155,8 @@ static guint gst_rdt_manager_signals[LAST_SIGNAL] = { 0 };
goto label; \
} G_STMT_END
#define JBUF_UNLOCK(sess) (g_mutex_unlock ((sess)->jbuf_lock))
#define JBUF_WAIT(sess) (g_cond_wait ((sess)->jbuf_cond, (sess)->jbuf_lock))
#define JBUF_UNLOCK(sess) (g_mutex_unlock (&(sess)->jbuf_lock))
#define JBUF_WAIT(sess) (g_cond_wait (&(sess)->jbuf_cond, &(sess)->jbuf_lock))
#define JBUF_WAIT_CHECK(sess,label) G_STMT_START { \
JBUF_WAIT(sess); \
@ -164,7 +164,7 @@ static guint gst_rdt_manager_signals[LAST_SIGNAL] = { 0 };
goto label; \
} G_STMT_END
#define JBUF_SIGNAL(sess) (g_cond_signal ((sess)->jbuf_cond))
#define JBUF_SIGNAL(sess) (g_cond_signal (&(sess)->jbuf_cond))
/* Manages the receiving end of the packets.
*
@ -210,8 +210,8 @@ struct _GstRDTManagerSession
/* jitterbuffer, lock and cond */
RDTJitterBuffer *jbuf;
GMutex *jbuf_lock;
GCond *jbuf_cond;
GMutex jbuf_lock;
GCond jbuf_cond;
/* some accounting */
guint64 num_late;
@ -243,8 +243,8 @@ create_session (GstRDTManager * rdtmanager, gint id)
sess->id = id;
sess->dec = rdtmanager;
sess->jbuf = rdt_jitter_buffer_new ();
sess->jbuf_lock = g_mutex_new ();
sess->jbuf_cond = g_cond_new ();
g_mutex_init (&sess->jbuf_lock);
g_cond_init (&sess->jbuf_cond);
rdtmanager->sessions = g_slist_prepend (rdtmanager->sessions, sess);
return sess;
@ -316,8 +316,8 @@ static void
free_session (GstRDTManagerSession * session)
{
g_object_unref (session->jbuf);
g_cond_free (session->jbuf_cond);
g_mutex_free (session->jbuf_lock);
g_cond_clear (&session->jbuf_cond);
g_mutex_clear (&session->jbuf_lock);
g_free (session);
}

4
gst/realmedia/rmdemux.c
View file

@ -28,10 +28,6 @@
# include "config.h"
#endif
/* FIXME 0.11: suppress warnings for deprecated API such as GStaticRecMutex
* with newer GLib versions (>= 2.31.0) */
#define GLIB_DISABLE_DEPRECATION_WARNINGS
#include "rmdemux.h"
#include "rmutils.h"