From: Thomas Vander Stichele Date: Tue, 22 Nov 2005 17:39:29 +0000 (+0000) Subject: remove deprecated properties fix up enums to correctly have short lowercase dashed... X-Git-Tag: 1.19.3~511^2~12489 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0759093ebcec8fb8f237150b9a3213864079d70;p=platform%2Fupstream%2Fgstreamer.git remove deprecated properties fix up enums to correctly have short lowercase dashed nicks Original commit message from CVS: remove deprecated properties fix up enums to correctly have short lowercase dashed nicks --- diff --git a/ChangeLog b/ChangeLog index 7696b5e..a93ff77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2005-11-22 Thomas Vander Stichele + + * docs/libs/tmpl/gstaudio.sgml: + update + * ext/cdparanoia/gstcdparanoia.c: (gst_paranoia_mode_get_type), + (gst_paranoia_endian_get_type): + * ext/theora/theoraenc.c: (gst_border_mode_get_type): + * gst/audioscale/gstaudioscale.c: (gst_audioscale_method_get_type): + * gst/audiotestsrc/gstaudiotestsrc.c: + (gst_audiostestsrc_wave_get_type): + * gst/playback/gststreaminfo.c: (gst_stream_type_get_type): + * gst/tcp/gstfdset.c: (gst_fdset_mode_get_type): + * gst/tcp/gstmultifdsink.c: (gst_recover_policy_get_type), + (gst_sync_method_get_type), (gst_unit_type_get_type), + (gst_client_status_get_type), (gst_multifdsink_class_init), + (gst_multifdsink_new_client), (gst_multifdsink_recover_client), + (gst_multifdsink_queue_buffer), (gst_multifdsink_set_property), + (gst_multifdsink_get_property): + * gst/tcp/gstmultifdsink.h: + * gst/videoscale/gstvideoscale.c: (gst_videoscale_method_get_type): + * gst/videotestsrc/gstvideotestsrc.c: + (gst_videotestsrc_pattern_get_type): + remove deprecated properties + fix up enums to correctly have short lowercase dashed nicks + 2005-11-22 Michael Smith * gst/videorate/gstvideorate.c: (gst_videorate_chain): diff --git a/docs/libs/tmpl/gstaudio.sgml b/docs/libs/tmpl/gstaudio.sgml index 33cf785..326af51 100644 --- a/docs/libs/tmpl/gstaudio.sgml +++ b/docs/libs/tmpl/gstaudio.sgml @@ -48,34 +48,6 @@ a support library for audio elements @Returns: - - - - - -@pad: -@Returns: - - - - - - - -@pad: -@buf: -@Returns: - - - - - - - -@pad: -@Returns: - - diff --git a/ext/cdparanoia/gstcdparanoia.c b/ext/cdparanoia/gstcdparanoia.c index 1a4bea4..7ea7c3e 100644 --- a/ext/cdparanoia/gstcdparanoia.c +++ b/ext/cdparanoia/gstcdparanoia.c @@ -72,9 +72,9 @@ gst_paranoia_mode_get_type (void) { static GType paranoia_mode_type = 0; static GEnumValue paranoia_modes[] = { - {PARANOIA_MODE_DISABLE, "0", "Disable paranoid checking"}, - {PARANOIA_MODE_OVERLAP, "4", "cdda2wav-style overlap checking"}, - {PARANOIA_MODE_FULL, "255", "Full paranoia"}, + {PARANOIA_MODE_DISABLE, "Disable paranoid checking", "disable"}, + {PARANOIA_MODE_OVERLAP, "cdda2wav-style overlap checking", "overlap"}, + {PARANOIA_MODE_FULL, "Full paranoia", "full"}, {0, NULL, NULL}, }; @@ -91,8 +91,8 @@ gst_paranoia_endian_get_type (void) { static GType paranoia_endian_type = 0; static GEnumValue paranoia_endians[] = { - {0, "0", "treat drive as little endian"}, - {1, "1", "treat drive as big endian"}, + {0, "treat drive as little endian", "little-endian"}, + {1, "treat drive as big endian", "big-endian"}, {0, NULL, NULL}, }; diff --git a/ext/theora/theoraenc.c b/ext/theora/theoraenc.c index b60e10c..43c757c 100644 --- a/ext/theora/theoraenc.c +++ b/ext/theora/theoraenc.c @@ -52,9 +52,9 @@ gst_border_mode_get_type (void) { static GType border_mode_type = 0; static GEnumValue border_mode[] = { - {BORDER_NONE, "BORDER_NONE", "No Border"}, - {BORDER_BLACK, "BORDER_BLACK", "Black Border"}, - {BORDER_MIRROR, "BORDER_MIRROR", "Mirror image in borders"}, + {BORDER_NONE, "No Border", "none"}, + {BORDER_BLACK, "Black Border", "black"}, + {BORDER_MIRROR, "Mirror image in borders", "mirror"}, {0, NULL, NULL}, }; diff --git a/gst/audioscale/gstaudioscale.c b/gst/audioscale/gstaudioscale.c index 1c0883f..160c4ab 100644 --- a/gst/audioscale/gstaudioscale.c +++ b/gst/audioscale/gstaudioscale.c @@ -85,9 +85,9 @@ gst_audioscale_method_get_type (void) { static GType audioscale_method_type = 0; static GEnumValue audioscale_methods[] = { - {GST_RESAMPLE_NEAREST, "0", "Nearest"}, - {GST_RESAMPLE_BILINEAR, "1", "Bilinear"}, - {GST_RESAMPLE_SINC, "2", "Sinc"}, + {GST_RESAMPLE_NEAREST, "Nearest", "nearest"}, + {GST_RESAMPLE_BILINEAR, "Bilinear", "bilinear"}, + {GST_RESAMPLE_SINC, "Sinc", "sinc"}, {0, NULL, NULL}, }; diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c index 6750a94..64b40e6 100644 --- a/gst/audiotestsrc/gstaudiotestsrc.c +++ b/gst/audiotestsrc/gstaudiotestsrc.c @@ -95,13 +95,13 @@ gst_audiostestsrc_wave_get_type (void) { static GType audiostestsrc_wave_type = 0; static GEnumValue audiostestsrc_waves[] = { - {GST_AUDIOTESTSRC_WAVE_SINE, "0", "Sine"}, - {GST_AUDIOTESTSRC_WAVE_SQUARE, "1", "Square"}, - {GST_AUDIOTESTSRC_WAVE_SAW, "2", "Saw"}, - {GST_AUDIOTESTSRC_WAVE_TRIANGLE, "3", "Triangle"}, - {GST_AUDIOTESTSRC_WAVE_SILENCE, "4", "Silence"}, - {GST_AUDIOTESTSRC_WAVE_WHITE_NOISE, "5", "White noise"}, - {GST_AUDIOTESTSRC_WAVE_PINK_NOISE, "6", "Pink noise"}, + {GST_AUDIOTESTSRC_WAVE_SINE, "Sine", "sine"}, + {GST_AUDIOTESTSRC_WAVE_SQUARE, "Square", "square"}, + {GST_AUDIOTESTSRC_WAVE_SAW, "Saw", "saw"}, + {GST_AUDIOTESTSRC_WAVE_TRIANGLE, "Triangle", "triangle"}, + {GST_AUDIOTESTSRC_WAVE_SILENCE, "Silence", "silence"}, + {GST_AUDIOTESTSRC_WAVE_WHITE_NOISE, "White noise", "white-noise"}, + {GST_AUDIOTESTSRC_WAVE_PINK_NOISE, "Pink noise", "pink-noise"}, {0, NULL, NULL}, }; diff --git a/gst/playback/gststreaminfo.c b/gst/playback/gststreaminfo.c index 23fe015..5a1ea66 100644 --- a/gst/playback/gststreaminfo.c +++ b/gst/playback/gststreaminfo.c @@ -56,12 +56,12 @@ gst_stream_type_get_type (void) { static GType stream_type_type = 0; static GEnumValue stream_type[] = { - {GST_STREAM_TYPE_UNKNOWN, "GST_STREAM_TYPE_UNKNOWN", "Unknown stream"}, - {GST_STREAM_TYPE_AUDIO, "GST_STREAM_TYPE_AUDIO", "Audio stream"}, - {GST_STREAM_TYPE_VIDEO, "GST_STREAM_TYPE_VIDEO", "Video stream"}, - {GST_STREAM_TYPE_TEXT, "GST_STREAM_TYPE_TEXT", "Text stream"}, - {GST_STREAM_TYPE_ELEMENT, "GST_STREAM_TYPE_ELEMENT", - "Stream handled by element"}, + {GST_STREAM_TYPE_UNKNOWN, "Unknown stream", "unknown"}, + {GST_STREAM_TYPE_AUDIO, "Audio stream", "audio"}, + {GST_STREAM_TYPE_VIDEO, "Video stream", "video"}, + {GST_STREAM_TYPE_TEXT, "Text stream", "text"}, + {GST_STREAM_TYPE_ELEMENT, + "Stream handled by element", "element"}, {0, NULL, NULL}, }; diff --git a/gst/tcp/gstfdset.c b/gst/tcp/gstfdset.c index f462241..5365e6b 100644 --- a/gst/tcp/gstfdset.c +++ b/gst/tcp/gstfdset.c @@ -37,9 +37,9 @@ gst_fdset_mode_get_type (void) { static GType fdset_mode_type = 0; static GEnumValue fdset_mode[] = { - {GST_FDSET_MODE_SELECT, "GST_FDSET_MODE_SELECT", "Select"}, - {GST_FDSET_MODE_POLL, "GST_FDSET_MODE_POLL", "Poll"}, - {GST_FDSET_MODE_EPOLL, "GST_FDSET_MODE_EPOLL", "EPoll"}, + {GST_FDSET_MODE_SELECT, "Select", "select"}, + {GST_FDSET_MODE_POLL, "Poll", "poll"}, + {GST_FDSET_MODE_EPOLL, "EPoll", "epoll"}, {0, NULL, NULL}, }; diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 930487e..40d08eb 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -105,7 +105,7 @@ enum #define DEFAULT_UNITS_SOFT_MAX -1 #define DEFAULT_RECOVER_POLICY GST_RECOVER_POLICY_NONE #define DEFAULT_TIMEOUT 0 -#define DEFAULT_SYNC_METHOD GST_SYNC_METHOD_NONE +#define DEFAULT_SYNC_METHOD GST_SYNC_METHOD_LATEST enum { @@ -125,7 +125,6 @@ enum ARG_RECOVER_POLICY, ARG_TIMEOUT, - ARG_SYNC_CLIENTS, /* deprecated */ ARG_SYNC_METHOD, ARG_BYTES_TO_SERVE, ARG_BYTES_SERVED, @@ -137,14 +136,14 @@ gst_recover_policy_get_type (void) { static GType recover_policy_type = 0; static GEnumValue recover_policy[] = { - {GST_RECOVER_POLICY_NONE, "GST_RECOVER_POLICY_NONE", - "Do not try to recover"}, - {GST_RECOVER_POLICY_RESYNC_START, "GST_RECOVER_POLICY_RESYNC_START", - "Resync client to most recent buffer"}, - {GST_RECOVER_POLICY_RESYNC_SOFT, "GST_RECOVER_POLICY_RESYNC_SOFT", - "Resync client to soft limit"}, - {GST_RECOVER_POLICY_RESYNC_KEYFRAME, "GST_RECOVER_POLICY_RESYNC_KEYFRAME", - "Resync client to most recent keyframe"}, + {GST_RECOVER_POLICY_NONE, + "Do not try to recover", "none"}, + {GST_RECOVER_POLICY_RESYNC_LATEST, + "Resync client to latest buffer", "latest"}, + {GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT, + "Resync client to soft limit", "soft-limit"}, + {GST_RECOVER_POLICY_RESYNC_KEYFRAME, + "Resync client to most recent keyframe", "keyframe"}, {0, NULL, NULL}, }; @@ -161,12 +160,13 @@ gst_sync_method_get_type (void) { static GType sync_method_type = 0; static GEnumValue sync_method[] = { - {GST_SYNC_METHOD_NONE, "GST_SYNC_METHOD_NONE", - "Serve new client the latest buffer"}, - {GST_SYNC_METHOD_WAIT, "GST_SYNC_METHOD_WAIT", - "Make the new client wait for the next keyframe"}, - {GST_SYNC_METHOD_BURST, "GST_SYNC_METHOD_BURST", - "Serve the new client the last keyframe, aka burst"}, + {GST_SYNC_METHOD_LATEST, + "Serve starting from the latest buffer", "latest"}, + {GST_SYNC_METHOD_NEXT_KEYFRAME, + "Serve starting from the next keyframe", "next-keyframe"}, + {GST_SYNC_METHOD_LATEST_KEYFRAME, + "Serve everything since the latest keyframe (burst)", + "latest-keyframe"}, {0, NULL, NULL}, }; @@ -183,9 +183,9 @@ gst_unit_type_get_type (void) { static GType unit_type_type = 0; static GEnumValue unit_type[] = { - {GST_UNIT_TYPE_BUFFERS, "GST_UNIT_TYPE_BUFFERS", "Buffers"}, - {GST_UNIT_TYPE_BYTES, "GST_UNIT_TYPE_BYTES", "Bytes"}, - {GST_UNIT_TYPE_TIME, "GST_UNIT_TYPE_TIME", "Time"}, + {GST_UNIT_TYPE_BUFFERS, "Buffers", "buffers"}, + {GST_UNIT_TYPE_BYTES, "Bytes", "bytes"}, + {GST_UNIT_TYPE_TIME, "Time", "time"}, {0, NULL, NULL}, }; @@ -202,12 +202,12 @@ gst_client_status_get_type (void) { static GType client_status_type = 0; static GEnumValue client_status[] = { - {GST_CLIENT_STATUS_OK, "GST_CLIENT_STATUS_OK", "OK"}, - {GST_CLIENT_STATUS_CLOSED, "GST_CLIENT_STATUS_CLOSED", "Closed"}, - {GST_CLIENT_STATUS_REMOVED, "GST_CLIENT_STATUS_REMOVED", "Removed"}, - {GST_CLIENT_STATUS_SLOW, "GST_CLIENT_STATUS_SLOW", "Too slow"}, - {GST_CLIENT_STATUS_ERROR, "GST_CLIENT_STATUS_ERROR", "Error"}, - {GST_CLIENT_STATUS_DUPLICATE, "GST_CLIENT_STATUS_DUPLICATE", "Duplicate"}, + {GST_CLIENT_STATUS_OK, "ok"}, + {GST_CLIENT_STATUS_CLOSED, "Closed", "closed"}, + {GST_CLIENT_STATUS_REMOVED, "Removed", "removed"}, + {GST_CLIENT_STATUS_SLOW, "Too slow", "slow"}, + {GST_CLIENT_STATUS_ERROR, "Error", "error"}, + {GST_CLIENT_STATUS_DUPLICATE, "Duplicate", "duplicate"}, {0, NULL, NULL}, }; @@ -322,10 +322,6 @@ gst_multifdsink_class_init (GstMultiFdSinkClass * klass) g_param_spec_uint64 ("timeout", "Timeout", "Maximum inactivity timeout in nanoseconds for a client (0 = no limit)", 0, G_MAXUINT64, DEFAULT_TIMEOUT, G_PARAM_READWRITE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SYNC_CLIENTS, - g_param_spec_boolean ("sync-clients", "Sync clients", - "(DEPRECATED) Sync clients to a keyframe", - DEFAULT_SYNC_METHOD == GST_SYNC_METHOD_WAIT, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SYNC_METHOD, g_param_spec_enum ("sync-method", "Sync Method", "How to sync new clients to the stream", @@ -860,7 +856,7 @@ gst_multifdsink_new_client (GstMultiFdSink * sink, GstTCPClient * client) gint result; switch (sink->sync_method) { - case GST_SYNC_METHOD_WAIT: + case GST_SYNC_METHOD_NEXT_KEYFRAME: { /* if the buffer at the head of the queue is a sync point we can proceed, * else we need to skip the buffer and wait for a new one */ @@ -895,12 +891,12 @@ gst_multifdsink_new_client (GstMultiFdSink * sink, GstTCPClient * client) } break; } - case GST_SYNC_METHOD_BURST: + case GST_SYNC_METHOD_LATEST_KEYFRAME: { /* FIXME for new clients we constantly scan the complete * buffer queue for sync point whenever a buffer is added. This is * suboptimal because if we cannot find a sync point the first time, - * the algorithm should behave as GST_SYNC_METHOD_WAIT */ + * the algorithm should behave as GST_SYNC_METHOD_NEXT_KEYFRAME */ gint i, len; GST_LOG_OBJECT (sink, "[fd %5d] new client, bufpos %d, bursting keyframe", @@ -1142,11 +1138,11 @@ gst_multifdsink_recover_client (GstMultiFdSink * sink, GstTCPClient * client) * the hard max */ newbufpos = client->bufpos; break; - case GST_RECOVER_POLICY_RESYNC_START: + case GST_RECOVER_POLICY_RESYNC_LATEST: /* move to beginning of queue */ newbufpos = -1; break; - case GST_RECOVER_POLICY_RESYNC_SOFT: + case GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT: /* move to beginning of soft max */ newbufpos = sink->units_soft_max; break; @@ -1268,7 +1264,7 @@ gst_multifdsink_queue_buffer (GstMultiFdSink * sink, GstBuffer * buf) /* now look for sync points and make sure there is at least one * sync point in the queue. We only do this if the burst mode * is enabled. */ - if (sink->sync_method == GST_SYNC_METHOD_BURST) { + if (sink->sync_method == GST_SYNC_METHOD_LATEST_KEYFRAME) { /* no point in searching beyond the queue length */ gint limit = queuelen; GstBuffer *buf; @@ -1575,13 +1571,6 @@ gst_multifdsink_set_property (GObject * object, guint prop_id, case ARG_TIMEOUT: multifdsink->timeout = g_value_get_uint64 (value); break; - case ARG_SYNC_CLIENTS: - if (g_value_get_boolean (value) == TRUE) { - multifdsink->sync_method = GST_SYNC_METHOD_WAIT; - } else { - multifdsink->sync_method = GST_SYNC_METHOD_NONE; - } - break; case ARG_SYNC_METHOD: multifdsink->sync_method = g_value_get_enum (value); break; @@ -1638,10 +1627,6 @@ gst_multifdsink_get_property (GObject * object, guint prop_id, GValue * value, case ARG_TIMEOUT: g_value_set_uint64 (value, multifdsink->timeout); break; - case ARG_SYNC_CLIENTS: - g_value_set_boolean (value, - multifdsink->sync_method == GST_SYNC_METHOD_WAIT); - break; case ARG_SYNC_METHOD: g_value_set_enum (value, multifdsink->sync_method); break; diff --git a/gst/tcp/gstmultifdsink.h b/gst/tcp/gstmultifdsink.h index ae33b6a..bf42e82 100644 --- a/gst/tcp/gstmultifdsink.h +++ b/gst/tcp/gstmultifdsink.h @@ -56,16 +56,16 @@ typedef enum { typedef enum { GST_RECOVER_POLICY_NONE, - GST_RECOVER_POLICY_RESYNC_START, - GST_RECOVER_POLICY_RESYNC_SOFT, + GST_RECOVER_POLICY_RESYNC_LATEST, + GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT, GST_RECOVER_POLICY_RESYNC_KEYFRAME, } GstRecoverPolicy; typedef enum { - GST_SYNC_METHOD_NONE, - GST_SYNC_METHOD_WAIT, - GST_SYNC_METHOD_BURST, + GST_SYNC_METHOD_LATEST, + GST_SYNC_METHOD_NEXT_KEYFRAME, + GST_SYNC_METHOD_LATEST_KEYFRAME, } GstSyncMethod; typedef enum diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index d9c91f3..bb0ba48 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -91,10 +91,11 @@ gst_videoscale_method_get_type (void) { static GType videoscale_method_type = 0; static GEnumValue videoscale_methods[] = { - {GST_VIDEOSCALE_POINT_SAMPLE, "0", "Point Sample (not implemented)"}, - {GST_VIDEOSCALE_NEAREST, "1", "Nearest"}, - {GST_VIDEOSCALE_BILINEAR, "2", "Bilinear"}, - {GST_VIDEOSCALE_BICUBIC, "3", "Bicubic (not implemented)"}, + {GST_VIDEOSCALE_POINT_SAMPLE, "Point Sample (not implemented)", + "point-sample"}, + {GST_VIDEOSCALE_NEAREST, "Nearest Neighbour", "nearest-neighbour"}, + {GST_VIDEOSCALE_BILINEAR, "Bilinear", "bilinear"}, + {GST_VIDEOSCALE_BICUBIC, "Bicubic (not implemented)", "bicubic"}, {0, NULL, NULL}, }; diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index 7ef4e83..f26c69d 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -93,9 +93,9 @@ gst_videotestsrc_pattern_get_type (void) { static GType videotestsrc_pattern_type = 0; static GEnumValue pattern_types[] = { - {GST_VIDEOTESTSRC_SMPTE, "smpte", "SMPTE 100% color bars"}, - {GST_VIDEOTESTSRC_SNOW, "snow", "Random (television snow)"}, - {GST_VIDEOTESTSRC_BLACK, "black", "100% Black"}, + {GST_VIDEOTESTSRC_SMPTE, "SMPTE 100% color bars", "smpte"}, + {GST_VIDEOTESTSRC_SNOW, "Random (television snow)", "snow"}, + {GST_VIDEOTESTSRC_BLACK, "100% Black", "black"}, {0, NULL, NULL}, };