summaryrefslogtreecommitdiffstats
path: root/sys/dxr3
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dxr3')
-rw-r--r--sys/dxr3/dxr3audiosink.c19
-rw-r--r--sys/dxr3/dxr3audiosink.h4
-rw-r--r--sys/dxr3/dxr3spusink.c17
-rw-r--r--sys/dxr3/dxr3spusink.h4
-rw-r--r--sys/dxr3/dxr3videosink.c17
-rw-r--r--sys/dxr3/dxr3videosink.h4
6 files changed, 34 insertions, 31 deletions
diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c
index 2e7026f9..3ac65218 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -214,7 +214,7 @@ dxr3audiosink_init (Dxr3AudioSink * sink)
gst_pad_set_chain_function (sink->ac3_sinkpad, dxr3audiosink_chain_ac3);
gst_element_add_pad (GST_ELEMENT (sink), sink->ac3_sinkpad);
- GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0;
@@ -285,7 +285,8 @@ dxr3audiosink_get_property (GObject * object, guint prop_id,
static gboolean
dxr3audiosink_open (Dxr3AudioSink * sink)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN),
+ FALSE);
/* Compute the name of the audio device file. */
sink->audio_filename = g_strdup_printf ("/dev/em8300_ma-%d",
@@ -311,7 +312,7 @@ dxr3audiosink_open (Dxr3AudioSink * sink)
return FALSE;
}
- GST_FLAG_SET (sink, DXR3AUDIOSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3AUDIOSINK_OPEN);
dxr3audiosink_set_mode_pcm (sink);
@@ -414,7 +415,7 @@ dxr3audiosink_set_mode_ac3 (Dxr3AudioSink * sink)
static void
dxr3audiosink_close (Dxr3AudioSink * sink)
{
- g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN));
if (close (sink->audio_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@@ -430,7 +431,7 @@ dxr3audiosink_close (Dxr3AudioSink * sink)
return;
}
- GST_FLAG_UNSET (sink, DXR3AUDIOSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, DXR3AUDIOSINK_OPEN);
g_free (sink->audio_filename);
sink->audio_filename = NULL;
@@ -543,7 +544,7 @@ dxr3audiosink_chain_pcm (GstPad * pad, GstData * _data)
dxr3audiosink_set_mode_pcm (sink);
}
- if (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
/* We have a new scr value. */
sink->scr = GSTTIME_TO_MPEGTIME (GST_BUFFER_TIMESTAMP (buf));
@@ -608,7 +609,7 @@ dxr3audiosink_chain_ac3 (GstPad * pad, GstData * _data)
dxr3audiosink_set_mode_ac3 (sink);
}
- if (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
int event;
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
@@ -709,11 +710,11 @@ dxr3audiosink_change_state (GstElement * element, GstStateChange transition)
GST_STATE_CHANGE_FAILURE);
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
- if (GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
dxr3audiosink_close (DXR3AUDIOSINK (element));
}
} else {
- if (!GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
if (!dxr3audiosink_open (DXR3AUDIOSINK (element))) {
return GST_STATE_CHANGE_FAILURE;
}
diff --git a/sys/dxr3/dxr3audiosink.h b/sys/dxr3/dxr3audiosink.h
index 28bb34ec..787e20f7 100644
--- a/sys/dxr3/dxr3audiosink.h
+++ b/sys/dxr3/dxr3audiosink.h
@@ -46,8 +46,8 @@ typedef struct _Dxr3AudioSinkClass Dxr3AudioSinkClass;
typedef enum {
- DXR3AUDIOSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- DXR3AUDIOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ DXR3AUDIOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ DXR3AUDIOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3AudioSinkFlags;
diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index badc2e41..59d965af 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -207,7 +207,7 @@ dxr3spusink_init (Dxr3SpuSink * sink)
gst_element_add_pad (GST_ELEMENT (sink), pad);
gst_pad_set_chain_function (pad, dxr3spusink_chain);
- GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0;
@@ -256,7 +256,8 @@ dxr3spusink_get_property (GObject * object, guint prop_id,
static gboolean
dxr3spusink_open (Dxr3SpuSink * sink)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN),
+ FALSE);
/* Compute the name of the spu device file. */
sink->spu_filename = g_strdup_printf ("/dev/em8300_sp-%d", sink->card_number);
@@ -281,7 +282,7 @@ dxr3spusink_open (Dxr3SpuSink * sink)
return FALSE;
}
- GST_FLAG_SET (sink, DXR3SPUSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3SPUSINK_OPEN);
return TRUE;
}
@@ -290,7 +291,7 @@ dxr3spusink_open (Dxr3SpuSink * sink)
static void
dxr3spusink_close (Dxr3SpuSink * sink)
{
- g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN));
if (close (sink->spu_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@@ -306,7 +307,7 @@ dxr3spusink_close (Dxr3SpuSink * sink)
return;
}
- GST_FLAG_UNSET (sink, DXR3SPUSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, DXR3SPUSINK_OPEN);
free (sink->spu_filename);
sink->spu_filename = NULL;
@@ -377,7 +378,7 @@ dxr3spusink_chain (GstPad * pad, GstData * _data)
return;
}
- if (GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN)) {
/* If we have PTS information for the SPU unit, register it now.
The card needs the PTS to be written *before* the actual data. */
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
@@ -405,7 +406,7 @@ dxr3spusink_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
- if (!GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
if (!dxr3spusink_open (DXR3SPUSINK (element))) {
return GST_STATE_CHANGE_FAILURE;
}
@@ -420,7 +421,7 @@ dxr3spusink_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
case GST_STATE_CHANGE_READY_TO_NULL:
- if (GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
dxr3spusink_close (DXR3SPUSINK (element));
}
break;
diff --git a/sys/dxr3/dxr3spusink.h b/sys/dxr3/dxr3spusink.h
index e2551714..e1563ab6 100644
--- a/sys/dxr3/dxr3spusink.h
+++ b/sys/dxr3/dxr3spusink.h
@@ -44,8 +44,8 @@ typedef struct _Dxr3SpuSinkClass Dxr3SpuSinkClass;
typedef enum {
- DXR3SPUSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- DXR3SPUSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ DXR3SPUSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ DXR3SPUSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3SpuSinkFlags;
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index c2222e85..0832ec56 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -204,7 +204,7 @@ dxr3videosink_init (Dxr3VideoSink * sink)
gst_element_add_pad (GST_ELEMENT (sink), pad);
gst_pad_set_chain_function (pad, dxr3videosink_chain);
- GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0;
@@ -258,7 +258,8 @@ dxr3videosink_get_property (GObject * object, guint prop_id,
static gboolean
dxr3videosink_open (Dxr3VideoSink * sink)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN),
+ FALSE);
/* Compute the name of the video device file. */
sink->video_filename = g_strdup_printf ("/dev/em8300_mv-%d",
@@ -284,7 +285,7 @@ dxr3videosink_open (Dxr3VideoSink * sink)
return FALSE;
}
- GST_FLAG_SET (sink, DXR3VIDEOSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3VIDEOSINK_OPEN);
return TRUE;
}
@@ -293,7 +294,7 @@ dxr3videosink_open (Dxr3VideoSink * sink)
static void
dxr3videosink_close (Dxr3VideoSink * sink)
{
- g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN));
if (close (sink->video_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@@ -309,7 +310,7 @@ dxr3videosink_close (Dxr3VideoSink * sink)
return;
}
- GST_FLAG_UNSET (sink, DXR3VIDEOSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, DXR3VIDEOSINK_OPEN);
free (sink->video_filename);
sink->video_filename = NULL;
@@ -423,7 +424,7 @@ dxr3videosink_write_data (Dxr3VideoSink * sink, guint cut)
g_return_if_fail (sink->cur_buf != NULL);
- if (GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN)) {
if (sink->cur_ts != GST_CLOCK_TIME_NONE) {
guint pts;
@@ -642,7 +643,7 @@ dxr3videosink_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
- if (!GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
if (!dxr3videosink_open (DXR3VIDEOSINK (element))) {
return GST_STATE_CHANGE_FAILURE;
}
@@ -661,7 +662,7 @@ dxr3videosink_change_state (GstElement * element, GstStateChange transition)
dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_STOP);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
- if (GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
dxr3videosink_close (DXR3VIDEOSINK (element));
}
break;
diff --git a/sys/dxr3/dxr3videosink.h b/sys/dxr3/dxr3videosink.h
index b0e5cadf..4af1de1b 100644
--- a/sys/dxr3/dxr3videosink.h
+++ b/sys/dxr3/dxr3videosink.h
@@ -44,8 +44,8 @@ typedef struct _Dxr3VideoSinkClass Dxr3VideoSinkClass;
typedef enum {
- DXR3VIDEOSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- DXR3VIDEOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ DXR3VIDEOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ DXR3VIDEOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3VideoSinkFlags;
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-03 08:23:39 +0000