nettime: clean up header

This commit is contained in:
Wim Taymans 2011-11-03 14:26:12 +01:00
parent 2cb971589d
commit af69a0f296
2 changed files with 6 additions and 9 deletions

View file

@ -70,7 +70,7 @@ GST_DEBUG_CATEGORY_STATIC (ntp_debug);
#define DEFAULT_ADDRESS "0.0.0.0" #define DEFAULT_ADDRESS "0.0.0.0"
#define DEFAULT_PORT 5637 #define DEFAULT_PORT 5637
#define IS_ACTIVE(self) (g_atomic_int_get (&((self)->active.active))) #define IS_ACTIVE(self) (g_atomic_int_get (&((self)->active)))
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#define setsockopt(sock, sol_flags, reuse_flags, ru, sizeofru) setsockopt (sock, sol_flags, reuse_flags, (char *)ru, sizeofru) #define setsockopt(sock, sol_flags, reuse_flags, ru, sizeofru) setsockopt (sock, sol_flags, reuse_flags, (char *)ru, sizeofru)
@ -177,7 +177,7 @@ gst_net_time_provider_init (GstNetTimeProvider * self)
self->priv->sock.fd = -1; self->priv->sock.fd = -1;
self->address = g_strdup (DEFAULT_ADDRESS); self->address = g_strdup (DEFAULT_ADDRESS);
self->thread = NULL; self->thread = NULL;
self->active.active = TRUE; self->active = TRUE;
} }
static void static void
@ -308,7 +308,7 @@ gst_net_time_provider_set_property (GObject * object, guint prop_id,
(GstObject *) g_value_get_object (value)); (GstObject *) g_value_get_object (value));
break; break;
case PROP_ACTIVE: case PROP_ACTIVE:
g_atomic_int_set (&self->active.active, g_value_get_boolean (value)); g_atomic_int_set (&self->active, g_value_get_boolean (value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

View file

@ -83,16 +83,13 @@ struct _GstNetTimeProvider {
GstClock *clock; GstClock *clock;
union { /* has to be a gint, we use atomic ops here */
gpointer _gst_reserved1; gint active;
/* has to be a gint, we use atomic ops here */
gint active;
} active;
/*< private >*/ /*< private >*/
GstNetTimeProviderPrivate *priv; GstNetTimeProviderPrivate *priv;
gpointer _gst_reserved[GST_PADDING - 2]; gpointer _gst_reserved[GST_PADDING];
}; };
struct _GstNetTimeProviderClass { struct _GstNetTimeProviderClass {