mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-16 13:26:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

remove deprecated properties fix up enums to correctly have short lowercase dashed nicks

Browse source 
Original commit message from CVS:
remove deprecated properties
fix up enums to correctly have short lowercase dashed nicks
This commit is contained in:
Thomas Vander Stichele 2005-11-22 17:39:29 +00:00
parent 9559eb697d
commit c0759093eb
12 changed files with 96 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ChangeLog
View file

@ -1,3 +1,28 @@
2005-11-22 Thomas Vander Stichele <thomas at apestaart dot org>
* 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 <msmith@fluendo.com> 2005-11-22 Michael Smith <msmith@fluendo.com>
* gst/videorate/gstvideorate.c: (gst_videorate_chain): * gst/videorate/gstvideorate.c: (gst_videorate_chain):

28
docs/libs/tmpl/gstaudio.sgml
View file

@ -48,34 +48,6 @@ a support library for audio elements
@Returns: @Returns:
<!-- ##### FUNCTION gst_audio_frame_rate ##### -->
<para>
</para>
@pad:
@Returns:
<!-- ##### FUNCTION gst_audio_length ##### -->
<para>
</para>
@pad:
@buf:
@Returns:
<!-- ##### FUNCTION gst_audio_highest_sample_value ##### -->
<para>
</para>
@pad:
@Returns:
<!-- ##### FUNCTION gst_audio_is_buffer_framed ##### --> <!-- ##### FUNCTION gst_audio_is_buffer_framed ##### -->
<para> <para>

10
ext/cdparanoia/gstcdparanoia.c
View file

@ -72,9 +72,9 @@ gst_paranoia_mode_get_type (void)
{ {
static GType paranoia_mode_type = 0; static GType paranoia_mode_type = 0;
static GEnumValue paranoia_modes[] = { static GEnumValue paranoia_modes[] = {
{PARANOIA_MODE_DISABLE, "0", "Disable paranoid checking"}, {PARANOIA_MODE_DISABLE, "Disable paranoid checking", "disable"},
{PARANOIA_MODE_OVERLAP, "4", "cdda2wav-style overlap checking"}, {PARANOIA_MODE_OVERLAP, "cdda2wav-style overlap checking", "overlap"},
{PARANOIA_MODE_FULL, "255", "Full paranoia"}, {PARANOIA_MODE_FULL, "Full paranoia", "full"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
@ -91,8 +91,8 @@ gst_paranoia_endian_get_type (void)
{ {
static GType paranoia_endian_type = 0; static GType paranoia_endian_type = 0;
static GEnumValue paranoia_endians[] = { static GEnumValue paranoia_endians[] = {
{0, "0", "treat drive as little endian"}, {0, "treat drive as little endian", "little-endian"},
{1, "1", "treat drive as big endian"}, {1, "treat drive as big endian", "big-endian"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };

6
ext/theora/theoraenc.c
View file

@ -52,9 +52,9 @@ gst_border_mode_get_type (void)
{ {
static GType border_mode_type = 0; static GType border_mode_type = 0;
static GEnumValue border_mode[] = { static GEnumValue border_mode[] = {
{BORDER_NONE, "BORDER_NONE", "No Border"}, {BORDER_NONE, "No Border", "none"},
{BORDER_BLACK, "BORDER_BLACK", "Black Border"}, {BORDER_BLACK, "Black Border", "black"},
{BORDER_MIRROR, "BORDER_MIRROR", "Mirror image in borders"}, {BORDER_MIRROR, "Mirror image in borders", "mirror"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };

6
gst/audioscale/gstaudioscale.c
View file

@ -85,9 +85,9 @@ gst_audioscale_method_get_type (void)
{ {
static GType audioscale_method_type = 0; static GType audioscale_method_type = 0;
static GEnumValue audioscale_methods[] = { static GEnumValue audioscale_methods[] = {
{GST_RESAMPLE_NEAREST, "0", "Nearest"}, {GST_RESAMPLE_NEAREST, "Nearest", "nearest"},
{GST_RESAMPLE_BILINEAR, "1", "Bilinear"}, {GST_RESAMPLE_BILINEAR, "Bilinear", "bilinear"},
{GST_RESAMPLE_SINC, "2", "Sinc"}, {GST_RESAMPLE_SINC, "Sinc", "sinc"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };

14
gst/audiotestsrc/gstaudiotestsrc.c
View file

@ -95,13 +95,13 @@ gst_audiostestsrc_wave_get_type (void)
{ {
static GType audiostestsrc_wave_type = 0; static GType audiostestsrc_wave_type = 0;
static GEnumValue audiostestsrc_waves[] = { static GEnumValue audiostestsrc_waves[] = {
{GST_AUDIOTESTSRC_WAVE_SINE, "0", "Sine"}, {GST_AUDIOTESTSRC_WAVE_SINE, "Sine", "sine"},
{GST_AUDIOTESTSRC_WAVE_SQUARE, "1", "Square"}, {GST_AUDIOTESTSRC_WAVE_SQUARE, "Square", "square"},
{GST_AUDIOTESTSRC_WAVE_SAW, "2", "Saw"}, {GST_AUDIOTESTSRC_WAVE_SAW, "Saw", "saw"},
{GST_AUDIOTESTSRC_WAVE_TRIANGLE, "3", "Triangle"}, {GST_AUDIOTESTSRC_WAVE_TRIANGLE, "Triangle", "triangle"},
{GST_AUDIOTESTSRC_WAVE_SILENCE, "4", "Silence"}, {GST_AUDIOTESTSRC_WAVE_SILENCE, "Silence", "silence"},
{GST_AUDIOTESTSRC_WAVE_WHITE_NOISE, "5", "White noise"}, {GST_AUDIOTESTSRC_WAVE_WHITE_NOISE, "White noise", "white-noise"},
{GST_AUDIOTESTSRC_WAVE_PINK_NOISE, "6", "Pink noise"}, {GST_AUDIOTESTSRC_WAVE_PINK_NOISE, "Pink noise", "pink-noise"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };

12
gst/playback/gststreaminfo.c
View file

@ -56,12 +56,12 @@ gst_stream_type_get_type (void)
{ {
static GType stream_type_type = 0; static GType stream_type_type = 0;
static GEnumValue stream_type[] = { static GEnumValue stream_type[] = {
{GST_STREAM_TYPE_UNKNOWN, "GST_STREAM_TYPE_UNKNOWN", "Unknown stream"}, {GST_STREAM_TYPE_UNKNOWN, "Unknown stream", "unknown"},
{GST_STREAM_TYPE_AUDIO, "GST_STREAM_TYPE_AUDIO", "Audio stream"}, {GST_STREAM_TYPE_AUDIO, "Audio stream", "audio"},
{GST_STREAM_TYPE_VIDEO, "GST_STREAM_TYPE_VIDEO", "Video stream"}, {GST_STREAM_TYPE_VIDEO, "Video stream", "video"},
{GST_STREAM_TYPE_TEXT, "GST_STREAM_TYPE_TEXT", "Text stream"}, {GST_STREAM_TYPE_TEXT, "Text stream", "text"},
{GST_STREAM_TYPE_ELEMENT, "GST_STREAM_TYPE_ELEMENT", {GST_STREAM_TYPE_ELEMENT,
"Stream handled by element"}, "Stream handled by element", "element"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };

6
gst/tcp/gstfdset.c
View file

@ -37,9 +37,9 @@ gst_fdset_mode_get_type (void)
{ {
static GType fdset_mode_type = 0; static GType fdset_mode_type = 0;
static GEnumValue fdset_mode[] = { static GEnumValue fdset_mode[] = {
{GST_FDSET_MODE_SELECT, "GST_FDSET_MODE_SELECT", "Select"}, {GST_FDSET_MODE_SELECT, "Select", "select"},
{GST_FDSET_MODE_POLL, "GST_FDSET_MODE_POLL", "Poll"}, {GST_FDSET_MODE_POLL, "Poll", "poll"},
{GST_FDSET_MODE_EPOLL, "GST_FDSET_MODE_EPOLL", "EPoll"}, {GST_FDSET_MODE_EPOLL, "EPoll", "epoll"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };

77
gst/tcp/gstmultifdsink.c
View file

@ -105,7 +105,7 @@ enum
#define DEFAULT_UNITS_SOFT_MAX -1 #define DEFAULT_UNITS_SOFT_MAX -1
#define DEFAULT_RECOVER_POLICY GST_RECOVER_POLICY_NONE #define DEFAULT_RECOVER_POLICY GST_RECOVER_POLICY_NONE
#define DEFAULT_TIMEOUT 0 #define DEFAULT_TIMEOUT 0
#define DEFAULT_SYNC_METHOD GST_SYNC_METHOD_NONE #define DEFAULT_SYNC_METHOD GST_SYNC_METHOD_LATEST
enum enum
{ {
@ -125,7 +125,6 @@ enum
ARG_RECOVER_POLICY, ARG_RECOVER_POLICY,
ARG_TIMEOUT, ARG_TIMEOUT,
ARG_SYNC_CLIENTS, /* deprecated */
ARG_SYNC_METHOD, ARG_SYNC_METHOD,
ARG_BYTES_TO_SERVE, ARG_BYTES_TO_SERVE,
ARG_BYTES_SERVED, ARG_BYTES_SERVED,
@ -137,14 +136,14 @@ gst_recover_policy_get_type (void)
{ {
static GType recover_policy_type = 0; static GType recover_policy_type = 0;
static GEnumValue recover_policy[] = { static GEnumValue recover_policy[] = {
{GST_RECOVER_POLICY_NONE, "GST_RECOVER_POLICY_NONE", {GST_RECOVER_POLICY_NONE,
"Do not try to recover"}, "Do not try to recover", "none"},
{GST_RECOVER_POLICY_RESYNC_START, "GST_RECOVER_POLICY_RESYNC_START", {GST_RECOVER_POLICY_RESYNC_LATEST,
"Resync client to most recent buffer"}, "Resync client to latest buffer", "latest"},
{GST_RECOVER_POLICY_RESYNC_SOFT, "GST_RECOVER_POLICY_RESYNC_SOFT", {GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT,
"Resync client to soft limit"}, "Resync client to soft limit", "soft-limit"},
{GST_RECOVER_POLICY_RESYNC_KEYFRAME, "GST_RECOVER_POLICY_RESYNC_KEYFRAME", {GST_RECOVER_POLICY_RESYNC_KEYFRAME,
"Resync client to most recent keyframe"}, "Resync client to most recent keyframe", "keyframe"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
@ -161,12 +160,13 @@ gst_sync_method_get_type (void)
{ {
static GType sync_method_type = 0; static GType sync_method_type = 0;
static GEnumValue sync_method[] = { static GEnumValue sync_method[] = {
{GST_SYNC_METHOD_NONE, "GST_SYNC_METHOD_NONE", {GST_SYNC_METHOD_LATEST,
"Serve new client the latest buffer"}, "Serve starting from the latest buffer", "latest"},
{GST_SYNC_METHOD_WAIT, "GST_SYNC_METHOD_WAIT", {GST_SYNC_METHOD_NEXT_KEYFRAME,
"Make the new client wait for the next keyframe"}, "Serve starting from the next keyframe", "next-keyframe"},
{GST_SYNC_METHOD_BURST, "GST_SYNC_METHOD_BURST", {GST_SYNC_METHOD_LATEST_KEYFRAME,
"Serve the new client the last keyframe, aka burst"}, "Serve everything since the latest keyframe (burst)",
"latest-keyframe"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
@ -183,9 +183,9 @@ gst_unit_type_get_type (void)
{ {
static GType unit_type_type = 0; static GType unit_type_type = 0;
static GEnumValue unit_type[] = { static GEnumValue unit_type[] = {
{GST_UNIT_TYPE_BUFFERS, "GST_UNIT_TYPE_BUFFERS", "Buffers"}, {GST_UNIT_TYPE_BUFFERS, "Buffers", "buffers"},
{GST_UNIT_TYPE_BYTES, "GST_UNIT_TYPE_BYTES", "Bytes"}, {GST_UNIT_TYPE_BYTES, "Bytes", "bytes"},
{GST_UNIT_TYPE_TIME, "GST_UNIT_TYPE_TIME", "Time"}, {GST_UNIT_TYPE_TIME, "Time", "time"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
@ -202,12 +202,12 @@ gst_client_status_get_type (void)
{ {
static GType client_status_type = 0; static GType client_status_type = 0;
static GEnumValue client_status[] = { static GEnumValue client_status[] = {
{GST_CLIENT_STATUS_OK, "GST_CLIENT_STATUS_OK", "OK"}, {GST_CLIENT_STATUS_OK, "ok"},
{GST_CLIENT_STATUS_CLOSED, "GST_CLIENT_STATUS_CLOSED", "Closed"}, {GST_CLIENT_STATUS_CLOSED, "Closed", "closed"},
{GST_CLIENT_STATUS_REMOVED, "GST_CLIENT_STATUS_REMOVED", "Removed"}, {GST_CLIENT_STATUS_REMOVED, "Removed", "removed"},
{GST_CLIENT_STATUS_SLOW, "GST_CLIENT_STATUS_SLOW", "Too slow"}, {GST_CLIENT_STATUS_SLOW, "Too slow", "slow"},
{GST_CLIENT_STATUS_ERROR, "GST_CLIENT_STATUS_ERROR", "Error"}, {GST_CLIENT_STATUS_ERROR, "Error", "error"},
{GST_CLIENT_STATUS_DUPLICATE, "GST_CLIENT_STATUS_DUPLICATE", "Duplicate"}, {GST_CLIENT_STATUS_DUPLICATE, "Duplicate", "duplicate"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
@ -322,10 +322,6 @@ gst_multifdsink_class_init (GstMultiFdSinkClass * klass)
g_param_spec_uint64 ("timeout", "Timeout", g_param_spec_uint64 ("timeout", "Timeout",
"Maximum inactivity timeout in nanoseconds for a client (0 = no limit)", "Maximum inactivity timeout in nanoseconds for a client (0 = no limit)",
0, G_MAXUINT64, DEFAULT_TIMEOUT, G_PARAM_READWRITE)); 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_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SYNC_METHOD,
g_param_spec_enum ("sync-method", "Sync Method", g_param_spec_enum ("sync-method", "Sync Method",
"How to sync new clients to the stream", "How to sync new clients to the stream",
@ -860,7 +856,7 @@ gst_multifdsink_new_client (GstMultiFdSink * sink, GstTCPClient * client)
gint result; gint result;
switch (sink->sync_method) { 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, /* 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 */ * 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; break;
} }
case GST_SYNC_METHOD_BURST: case GST_SYNC_METHOD_LATEST_KEYFRAME:
{ {
/* FIXME for new clients we constantly scan the complete /* FIXME for new clients we constantly scan the complete
* buffer queue for sync point whenever a buffer is added. This is * buffer queue for sync point whenever a buffer is added. This is
* suboptimal because if we cannot find a sync point the first time, * 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; gint i, len;
GST_LOG_OBJECT (sink, "[fd %5d] new client, bufpos %d, bursting keyframe", 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 */ * the hard max */
newbufpos = client->bufpos; newbufpos = client->bufpos;
break; break;
case GST_RECOVER_POLICY_RESYNC_START: case GST_RECOVER_POLICY_RESYNC_LATEST:
/* move to beginning of queue */ /* move to beginning of queue */
newbufpos = -1; newbufpos = -1;
break; break;
case GST_RECOVER_POLICY_RESYNC_SOFT: case GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT:
/* move to beginning of soft max */ /* move to beginning of soft max */
newbufpos = sink->units_soft_max; newbufpos = sink->units_soft_max;
break; 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 /* 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 * sync point in the queue. We only do this if the burst mode
* is enabled. */ * 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 */ /* no point in searching beyond the queue length */
gint limit = queuelen; gint limit = queuelen;
GstBuffer *buf; GstBuffer *buf;
@ -1575,13 +1571,6 @@ gst_multifdsink_set_property (GObject * object, guint prop_id,
case ARG_TIMEOUT: case ARG_TIMEOUT:
multifdsink->timeout = g_value_get_uint64 (value); multifdsink->timeout = g_value_get_uint64 (value);
break; 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: case ARG_SYNC_METHOD:
multifdsink->sync_method = g_value_get_enum (value); multifdsink->sync_method = g_value_get_enum (value);
break; break;
@ -1638,10 +1627,6 @@ gst_multifdsink_get_property (GObject * object, guint prop_id, GValue * value,
case ARG_TIMEOUT: case ARG_TIMEOUT:
g_value_set_uint64 (value, multifdsink->timeout); g_value_set_uint64 (value, multifdsink->timeout);
break; break;
case ARG_SYNC_CLIENTS:
g_value_set_boolean (value,
multifdsink->sync_method == GST_SYNC_METHOD_WAIT);
break;
case ARG_SYNC_METHOD: case ARG_SYNC_METHOD:
g_value_set_enum (value, multifdsink->sync_method); g_value_set_enum (value, multifdsink->sync_method);
break; break;

10
gst/tcp/gstmultifdsink.h
View file

@ -56,16 +56,16 @@ typedef enum {
typedef enum typedef enum
{ {
GST_RECOVER_POLICY_NONE, GST_RECOVER_POLICY_NONE,
GST_RECOVER_POLICY_RESYNC_START, GST_RECOVER_POLICY_RESYNC_LATEST,
GST_RECOVER_POLICY_RESYNC_SOFT, GST_RECOVER_POLICY_RESYNC_SOFT_LIMIT,
GST_RECOVER_POLICY_RESYNC_KEYFRAME, GST_RECOVER_POLICY_RESYNC_KEYFRAME,
} GstRecoverPolicy; } GstRecoverPolicy;
typedef enum typedef enum
{ {
GST_SYNC_METHOD_NONE, GST_SYNC_METHOD_LATEST,
GST_SYNC_METHOD_WAIT, GST_SYNC_METHOD_NEXT_KEYFRAME,
GST_SYNC_METHOD_BURST, GST_SYNC_METHOD_LATEST_KEYFRAME,
} GstSyncMethod; } GstSyncMethod;
typedef enum typedef enum

9
gst/videoscale/gstvideoscale.c
View file

@ -91,10 +91,11 @@ gst_videoscale_method_get_type (void)
{ {
static GType videoscale_method_type = 0; static GType videoscale_method_type = 0;
static GEnumValue videoscale_methods[] = { static GEnumValue videoscale_methods[] = {
{GST_VIDEOSCALE_POINT_SAMPLE, "0", "Point Sample (not implemented)"}, {GST_VIDEOSCALE_POINT_SAMPLE, "Point Sample (not implemented)",
{GST_VIDEOSCALE_NEAREST, "1", "Nearest"}, "point-sample"},
{GST_VIDEOSCALE_BILINEAR, "2", "Bilinear"}, {GST_VIDEOSCALE_NEAREST, "Nearest Neighbour", "nearest-neighbour"},
{GST_VIDEOSCALE_BICUBIC, "3", "Bicubic (not implemented)"}, {GST_VIDEOSCALE_BILINEAR, "Bilinear", "bilinear"},
{GST_VIDEOSCALE_BICUBIC, "Bicubic (not implemented)", "bicubic"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };

6
gst/videotestsrc/gstvideotestsrc.c
View file

@ -93,9 +93,9 @@ gst_videotestsrc_pattern_get_type (void)
{ {
static GType videotestsrc_pattern_type = 0; static GType videotestsrc_pattern_type = 0;
static GEnumValue pattern_types[] = { static GEnumValue pattern_types[] = {
{GST_VIDEOTESTSRC_SMPTE, "smpte", "SMPTE 100% color bars"}, {GST_VIDEOTESTSRC_SMPTE, "SMPTE 100% color bars", "smpte"},
{GST_VIDEOTESTSRC_SNOW, "snow", "Random (television snow)"}, {GST_VIDEOTESTSRC_SNOW, "Random (television snow)", "snow"},
{GST_VIDEOTESTSRC_BLACK, "black", "100% Black"}, {GST_VIDEOTESTSRC_BLACK, "100% Black", "black"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };