summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4fd77c1)
raw | patch | inline | side by side (parent: 4fd77c1)
author | Wim Taymans <wim.taymans@gmail.com> | |
Tue, 20 Sep 2005 17:38:51 +0000 (17:38 +0000) | ||
committer | Wim Taymans <wim.taymans@gmail.com> | |
Tue, 20 Sep 2005 17:38:51 +0000 (17:38 +0000) |
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_base_sink_class_init),
(gst_base_sink_init):
Make sync property settable from subclass.
* gst/elements/gstfakesink.c: (gst_fake_sink_init),
(gst_fake_sink_change_state):
Set sync to FALSE by default.
* gst/base/gstbasesink.c: (gst_base_sink_class_init),
(gst_base_sink_init):
Make sync property settable from subclass.
* gst/elements/gstfakesink.c: (gst_fake_sink_init),
(gst_fake_sink_change_state):
Set sync to FALSE by default.
diff --git a/ChangeLog b/ChangeLog
index 01f443e31a23fc2145db8a4f32d795dd00ee8964..89e268e6df0fc81dfb8f95c0d8574a0d25a6315a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2005-09-20 Wim Taymans <wim@fluendo.com>
+
+ * gst/base/gstbasesink.c: (gst_base_sink_class_init),
+ (gst_base_sink_init):
+ Make sync property settable from subclass.
+
+ * gst/elements/gstfakesink.c: (gst_fake_sink_init),
+ (gst_fake_sink_change_state):
+ Set sync to FALSE by default.
+
2005-09-20 Wim Taymans <wim@fluendo.com>
* gst/gstbus.c: (poll_func), (poll_timeout), (gst_bus_poll):
diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c
index 8fa04835070b7e547cf9fe361a1ea730aaf88708..8886f6c87ec82524e53a352f4772354a43d0f977 100644 (file)
--- a/gst/base/gstbasesink.c
+++ b/gst/base/gstbasesink.c
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SYNC,
g_param_spec_boolean ("sync", "Sync", "Sync on the clock", DEFAULT_SYNC,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE));
gstelement_class->set_clock = GST_DEBUG_FUNCPTR (gst_base_sink_set_clock);
gstelement_class->change_state =
basesink->can_activate_push = DEFAULT_CAN_ACTIVATE_PUSH;
basesink->can_activate_pull = DEFAULT_CAN_ACTIVATE_PULL;
+ basesink->sync = DEFAULT_SYNC;
+
GST_FLAG_SET (basesink, GST_ELEMENT_IS_SINK);
}
index 2e7242995a549a77e20642c0aa1c392b0de4ba87..7bdaf18deac62b63246ec8ee0a4cf4c443adfc1b 100644 (file)
LAST_SIGNAL
};
+#define DEFAULT_SYNC FALSE
+
#define DEFAULT_STATE_ERROR FAKE_SINK_STATE_ERROR_NONE
#define DEFAULT_SILENT FALSE
#define DEFAULT_DUMP FALSE
-#define DEFAULT_SYNC FALSE
#define DEFAULT_SIGNAL_HANDOFFS FALSE
#define DEFAULT_LAST_MESSAGE NULL
#define DEFAULT_CAN_ACTIVATE_PUSH TRUE
{
fakesink->silent = DEFAULT_SILENT;
fakesink->dump = DEFAULT_DUMP;
+ GST_BASE_SINK (fakesink)->sync = DEFAULT_SYNC;
fakesink->last_message = g_strdup (DEFAULT_LAST_MESSAGE);
fakesink->state_error = DEFAULT_STATE_ERROR;
fakesink->signal_handoffs = DEFAULT_SIGNAL_HANDOFFS;
return ret;
+ /* ERROR */
error:
GST_ELEMENT_ERROR (element, CORE, STATE_CHANGE, (NULL), (NULL));
return GST_STATE_CHANGE_FAILURE;
index 8fa04835070b7e547cf9fe361a1ea730aaf88708..8886f6c87ec82524e53a352f4772354a43d0f977 100644 (file)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SYNC,
g_param_spec_boolean ("sync", "Sync", "Sync on the clock", DEFAULT_SYNC,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE));
gstelement_class->set_clock = GST_DEBUG_FUNCPTR (gst_base_sink_set_clock);
gstelement_class->change_state =
basesink->can_activate_push = DEFAULT_CAN_ACTIVATE_PUSH;
basesink->can_activate_pull = DEFAULT_CAN_ACTIVATE_PULL;
+ basesink->sync = DEFAULT_SYNC;
+
GST_FLAG_SET (basesink, GST_ELEMENT_IS_SINK);
}
index 2e7242995a549a77e20642c0aa1c392b0de4ba87..7bdaf18deac62b63246ec8ee0a4cf4c443adfc1b 100644 (file)
LAST_SIGNAL
};
+#define DEFAULT_SYNC FALSE
+
#define DEFAULT_STATE_ERROR FAKE_SINK_STATE_ERROR_NONE
#define DEFAULT_SILENT FALSE
#define DEFAULT_DUMP FALSE
-#define DEFAULT_SYNC FALSE
#define DEFAULT_SIGNAL_HANDOFFS FALSE
#define DEFAULT_LAST_MESSAGE NULL
#define DEFAULT_CAN_ACTIVATE_PUSH TRUE
{
fakesink->silent = DEFAULT_SILENT;
fakesink->dump = DEFAULT_DUMP;
+ GST_BASE_SINK (fakesink)->sync = DEFAULT_SYNC;
fakesink->last_message = g_strdup (DEFAULT_LAST_MESSAGE);
fakesink->state_error = DEFAULT_STATE_ERROR;
fakesink->signal_handoffs = DEFAULT_SIGNAL_HANDOFFS;
return ret;
+ /* ERROR */
error:
GST_ELEMENT_ERROR (element, CORE, STATE_CHANGE, (NULL), (NULL));
return GST_STATE_CHANGE_FAILURE;