Commit 21c3b522 authored by Andy Wingo's avatar Andy Wingo

gst/audiorate/gstaudiorate.c (gst_audiorate_class_init): Pacify

Original commit message from CVS:
2005-05-05  Andy Wingo  <wingo@pobox.com>

* gst/audiorate/gstaudiorate.c (gst_audiorate_class_init): Pacify
GObject.
* configure.ac: Return audiorate and subparse from the ghetto.
Re-enable -Wall -Werror.
* gst/subparse/gstsubparse.c:
* gst/subparse/gstsubparse.h: Port to 0.9. Can operate loop-based
or chain-based. Cleaned up a bit. Not tested.
parent 5cfa8900
2005-05-05 Andy Wingo <wingo@pobox.com>
* gst/audiorate/gstaudiorate.c (gst_audiorate_class_init): Pacify
GObject.
* configure.ac: Return audiorate and subparse from the ghetto.
Re-enable -Wall -Werror.
* gst/subparse/gstsubparse.c:
* gst/subparse/gstsubparse.h: Port to 0.9. Can operate loop-based
or chain-based. Cleaned up a bit. Not tested.
2005-05-05 Christian Schaller <christian@fluendo.com>
* Makefile.am: remove stuff that is not building
......
......@@ -64,11 +64,11 @@ dnl decide on error flags
AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
if test "x$GST_WALL" = "xyes"; then
GST_ERROR="$GST_ERROR -Wall"
GST_ERROR="$GST_ERROR -Wall"
dnl if test "x$GST_CVS" = "xyes"; then
dnl AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
dnl fi
if test "x$GST_CVS" = "xyes"; then
AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
fi
fi
dnl determine c++ compiler
......@@ -372,9 +372,11 @@ GST_PLUGINS_ALL="\
adder \
audioconvert \
audioscale \
audiorate \
ffmpegcolorspace \
playback \
sine \
subparse \
typefind \
videotestsrc \
"
......@@ -865,9 +867,11 @@ gst/Makefile
gst/adder/Makefile
gst/audioconvert/Makefile
gst/audioscale/Makefile
gst/audiorate/Makefile
gst/ffmpegcolorspace/Makefile
gst/playback/Makefile
gst/sine/Makefile
gst/subparse/Makefile
gst/typefind/Makefile
gst/videotestsrc/Makefile
sys/Makefile
......
......@@ -161,6 +161,9 @@ gst_audiorate_class_init (GstAudiorateClass * klass)
parent_class = g_type_class_peek_parent (klass);
object_class->set_property = gst_audiorate_set_property;
object_class->get_property = gst_audiorate_get_property;
g_object_class_install_property (object_class, ARG_IN,
g_param_spec_uint64 ("in", "In",
"Number of input samples", 0, G_MAXUINT64, 0, G_PARAM_READABLE));
......@@ -178,10 +181,6 @@ gst_audiorate_class_init (GstAudiorateClass * klass)
"Don't emit notify for dropped and duplicated frames",
DEFAULT_SILENT, G_PARAM_READWRITE));
object_class->set_property = gst_audiorate_set_property;
object_class->get_property = gst_audiorate_get_property;
element_class->change_state = gst_audiorate_change_state;
}
......
This diff is collapsed.
......@@ -39,11 +39,23 @@ G_BEGIN_DECLS
typedef struct _GstSubparse GstSubparse;
typedef struct _GstSubparseClass GstSubparseClass;
typedef void (* GstSubparseInit) (GstSubparse *self);
typedef gchar * (* GstSubparseParser) (GstSubparse *self,
guint64 *out_start_time,
guint64 *out_end_time,
gboolean after_seek);
/* format enum */
typedef enum
{
GST_SUB_PARSE_FORMAT_UNKNOWN = 0,
GST_SUB_PARSE_FORMAT_MDVDSUB = 1,
GST_SUB_PARSE_FORMAT_SUBRIP = 2,
GST_SUB_PARSE_FORMAT_MPSUB = 3
} GstSubParseFormat;
typedef struct {
int state;
GString *buf;
guint64 start_time;
guint64 duration;
} ParserState;
typedef gchar* (*Parser) (ParserState *state, const gchar *line);
struct _GstSubparse {
GstElement element;
......@@ -51,29 +63,16 @@ struct _GstSubparse {
GstPad *sinkpad,*srcpad;
GString *textbuf;
struct {
GstSubparseInit deinit;
GstSubparseParser parse;
gint type;
} parser;
GstSubParseFormat parser_type;
gboolean parser_detected;
union {
struct {
int state;
GString *buf;
guint64 time1, time2;
} subrip;
struct {
int state;
GString *buf;
guint64 time;
} mpsub;
} state;
Parser parse_line;
ParserState state;
/* seek */
guint64 seek_time;
gboolean flush;
guint64 offset;
guint64 next_offset;
};
struct _GstSubparseClass {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment