summaryrefslogtreecommitdiffstats
path: root/ext/audiofile
diff options
context:
space:
mode:
Diffstat (limited to 'ext/audiofile')
-rw-r--r--ext/audiofile/gstafparse.c9
-rw-r--r--ext/audiofile/gstafparse.h4
-rw-r--r--ext/audiofile/gstafsink.c18
-rw-r--r--ext/audiofile/gstafsink.h4
-rw-r--r--ext/audiofile/gstafsrc.c12
-rw-r--r--ext/audiofile/gstafsrc.h4
6 files changed, 26 insertions, 25 deletions
diff --git a/ext/audiofile/gstafparse.c b/ext/audiofile/gstafparse.c
index b576e814..35b5b497 100644
--- a/ext/audiofile/gstafparse.c
+++ b/ext/audiofile/gstafparse.c
@@ -342,7 +342,8 @@ gst_afparse_plugin_init (GstPlugin * plugin)
static gboolean
gst_afparse_open_file (GstAFParse * afparse)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN),
+ FALSE);
/* open the file */
@@ -391,7 +392,7 @@ gst_afparse_open_file (GstAFParse * afparse)
"rate", G_TYPE_INT, afparse->rate,
"channels", G_TYPE_INT, afparse->channels, NULL));
- GST_FLAG_SET (afparse, GST_AFPARSE_OPEN);
+ GST_OBJECT_FLAG_SET (afparse, GST_AFPARSE_OPEN);
return TRUE;
}
@@ -399,11 +400,11 @@ gst_afparse_open_file (GstAFParse * afparse)
static void
gst_afparse_close_file (GstAFParse * afparse)
{
- g_return_if_fail (GST_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN));
if (afCloseFile (afparse->file) != 0) {
g_warning ("afparse: oops, error closing !\n");
} else {
- GST_FLAG_UNSET (afparse, GST_AFPARSE_OPEN);
+ GST_OBJECT_FLAG_UNSET (afparse, GST_AFPARSE_OPEN);
}
}
diff --git a/ext/audiofile/gstafparse.h b/ext/audiofile/gstafparse.h
index 0f636dcd..43f64f4f 100644
--- a/ext/audiofile/gstafparse.h
+++ b/ext/audiofile/gstafparse.h
@@ -54,9 +54,9 @@ typedef struct _GstAFParse GstAFParse;
typedef struct _GstAFParseClass GstAFParseClass;
typedef enum {
- GST_AFPARSE_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_AFPARSE_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_AFPARSE_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_AFPARSE_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFParseFlags;
struct _GstAFParse {
diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c
index ea331bcd..b513a198 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -292,7 +292,7 @@ gst_afsink_open_file (GstAFSink * sink)
int sample_format; /* audiofile's sample format, look in audiofile.h */
int byte_order = 0; /* audiofile's byte order defines */
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_AFSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_AFSINK_OPEN), FALSE);
/* get the audio parameters */
g_return_val_if_fail (GST_IS_PAD (sink->sinkpad), FALSE);
@@ -348,7 +348,7 @@ gst_afsink_open_file (GstAFSink * sink)
afFreeFileSetup (outfilesetup);
/* afSetVirtualByteOrder (sink->file, AF_DEFAULT_TRACK, byte_order); */
- GST_FLAG_SET (sink, GST_AFSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, GST_AFSINK_OPEN);
return TRUE;
}
@@ -357,14 +357,14 @@ static void
gst_afsink_close_file (GstAFSink * sink)
{
/* g_print ("DEBUG: closing sinkfile...\n"); */
- g_return_if_fail (GST_FLAG_IS_SET (sink, GST_AFSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_AFSINK_OPEN));
/* g_print ("DEBUG: past flag test\n"); */
/* if (fclose (sink->file) != 0) */
if (afCloseFile (sink->file) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), sink->filename), GST_ERROR_SYSTEM);
} else {
- GST_FLAG_UNSET (sink, GST_AFSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, GST_AFSINK_OPEN);
}
}
@@ -393,7 +393,7 @@ gst_afsink_chain (GstPad * pad, GstData * _data)
buf = GST_BUFFER (_data);
afsink = GST_AFSINK (gst_pad_get_parent (pad));
/* we use audiofile now
- if (GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN))
{
bytes_written = fwrite (GST_BUFFER_DATA (buf), 1, GST_BUFFER_SIZE (buf), afsink->file);
if (bytes_written < GST_BUFFER_SIZE (buf))
@@ -404,14 +404,14 @@ gst_afsink_chain (GstPad * pad, GstData * _data)
}
*/
- if (!GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
/* it's not open yet, open it */
if (!gst_afsink_open_file (afsink))
g_print ("WARNING: gstafsink: can't open file !\n");
/* return FALSE; Can't return value */
}
- if (GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
int frameCount = 0;
frameCount =
@@ -437,7 +437,7 @@ gst_afsink_change_state (GstElement * element, GstStateChange transition)
/* if going to NULL? then close the file */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
/* printf ("DEBUG: afsink state change: null pending\n"); */
- if (GST_FLAG_IS_SET (element, GST_AFSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_AFSINK_OPEN)) {
/* g_print ("DEBUG: trying to close the sink file\n"); */
gst_afsink_close_file (GST_AFSINK (element));
}
@@ -449,7 +449,7 @@ gst_afsink_change_state (GstElement * element, GstStateChange transition)
the caps are set and can be known
{
g_print ("DEBUG: it's not going to null\n");
- if (!GST_FLAG_IS_SET (element, GST_AFSINK_OPEN))
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_AFSINK_OPEN))
{
g_print ("DEBUG: GST_AFSINK_OPEN not set\n");
if (!gst_afsink_open_file (GST_AFSINK (element)))
diff --git a/ext/audiofile/gstafsink.h b/ext/audiofile/gstafsink.h
index 76ce30af..9b0d0e4e 100644
--- a/ext/audiofile/gstafsink.h
+++ b/ext/audiofile/gstafsink.h
@@ -52,9 +52,9 @@ typedef struct _GstAFSink GstAFSink;
typedef struct _GstAFSinkClass GstAFSinkClass;
typedef enum {
- GST_AFSINK_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_AFSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_AFSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_AFSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFSinkFlags;
struct _GstAFSink {
diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c
index 109bf12b..b17a8770 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -308,7 +308,7 @@ gst_afsrc_plugin_init (GstPlugin * plugin)
static gboolean
gst_afsrc_open_file (GstAFSrc * src)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (src, GST_AFSRC_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, GST_AFSRC_OPEN), FALSE);
/* open the file */
src->file = afOpenFile (src->filename, "r", AF_NULL_FILESETUP);
@@ -353,7 +353,7 @@ gst_afsrc_open_file (GstAFSrc * src)
"rate", G_TYPE_INT, src->rate,
"channels", G_TYPE_INT, src->channels, NULL));
- GST_FLAG_SET (src, GST_AFSRC_OPEN);
+ GST_OBJECT_FLAG_SET (src, GST_AFSRC_OPEN);
return TRUE;
}
@@ -362,14 +362,14 @@ static void
gst_afsrc_close_file (GstAFSrc * src)
{
/* g_print ("DEBUG: closing srcfile...\n"); */
- g_return_if_fail (GST_FLAG_IS_SET (src, GST_AFSRC_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, GST_AFSRC_OPEN));
/* g_print ("DEBUG: past flag test\n"); */
/* if (fclose (src->file) != 0) */
if (afCloseFile (src->file) != 0) {
GST_ELEMENT_ERROR (src, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), src->filename), GST_ERROR_SYSTEM);
} else {
- GST_FLAG_UNSET (src, GST_AFSRC_OPEN);
+ GST_OBJECT_FLAG_UNSET (src, GST_AFSRC_OPEN);
}
}
@@ -381,13 +381,13 @@ gst_afsrc_change_state (GstElement * element, GstStateChange transition)
/* if going to NULL then close the file */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
/* printf ("DEBUG: afsrc state change: null pending\n"); */
- if (GST_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
/* g_print ("DEBUG: trying to close the src file\n"); */
gst_afsrc_close_file (GST_AFSRC (element));
}
} else if (GST_STATE_PENDING (element) == GST_STATE_READY) {
/* g_print ("DEBUG: afsrc: ready state pending. This shouldn't happen at the *end* of a stream\n"); */
- if (!GST_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
/* g_print ("DEBUG: GST_AFSRC_OPEN not set\n"); */
if (!gst_afsrc_open_file (GST_AFSRC (element))) {
/* g_print ("DEBUG: element tries to open file\n"); */
diff --git a/ext/audiofile/gstafsrc.h b/ext/audiofile/gstafsrc.h
index c96c20c3..b5dcfba3 100644
--- a/ext/audiofile/gstafsrc.h
+++ b/ext/audiofile/gstafsrc.h
@@ -52,9 +52,9 @@ typedef struct _GstAFSrc GstAFSrc;
typedef struct _GstAFSrcClass GstAFSrcClass;
typedef enum {
- GST_AFSRC_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_AFSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_AFSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_AFSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFSrcFlags;
struct _GstAFSrc {
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-18 08:15:28 +0000