fix up more enums

Original commit message from CVS:
fix up more enums
This commit is contained in:
Thomas Vander Stichele 2005-11-22 18:11:58 +00:00
parent a6e0bc89cb
commit 842a43f802
16 changed files with 158 additions and 149 deletions

View file

@ -1,3 +1,22 @@
2005-11-22 Thomas Vander Stichele <thomas at apestaart dot org>
* ext/aalib/gstaasink.c:
* ext/dv/gstdvdec.c:
* ext/esd/esdmon.c:
* ext/flac/gstflacenc.c:
* ext/gdk_pixbuf/pixbufscale.c:
* ext/libcaca/gstcacasink.c:
* ext/shout2/gstshout2.c:
* gst/alpha/gstalpha.c:
* gst/oldcore/gstaggregator.c:
* gst/oldcore/gstshaper.c:
* gst/smpte/barboxwipes.c:
* gst/smpte/gstsmpte.c:
* gst/videobox/gstvideobox.c:
* gst/videofilter/gstvideoflip.c:
* gst/videomixer/videomixer.c:
fix up more enums
2005-11-22 Michael Smith <msmith@fluendo.com>
* gst/videomixer/videomixer.c: (gst_videomixer_pad_sink_setcaps),

View file

@ -133,8 +133,8 @@ gst_aasink_drivers_get_type (void)
for (i = 0; i < n_drivers; i++) {
driver = aa_drivers[i];
drivers[i].value = i;
drivers[i].value_name = g_strdup (driver->shortname);
drivers[i].value_nick = g_strdup (driver->name);
drivers[i].value_name = g_strdup (driver->name);
drivers[i].value_nick = g_utf8_strdown (driver->shortname, -1);
}
drivers[i].value = 0;
drivers[i].value_name = NULL;
@ -165,7 +165,8 @@ gst_aasink_dither_get_type (void)
for (i = 0; i < n_ditherers; i++) {
ditherers[i].value = i;
ditherers[i].value_name = g_strdup (aa_dithernames[i]);
ditherers[i].value_nick = g_strdup (aa_dithernames[i]);
ditherers[i].value_nick =
g_strdelimit (g_strdup (aa_dithernames[i]), " _", '-');
}
ditherers[i].value = 0;
ditherers[i].value_name = NULL;
@ -547,4 +548,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"aasink",
"ASCII Art video sink",
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

View file

@ -95,13 +95,12 @@ gst_dvdec_quality_get_type (void)
if (qtype == 0) {
static const GEnumValue values[] = {
{0, "DV_QUALITY_FASTEST", "Fastest decoding, low-quality mono"},
{1, "DV_QUALITY_AC_1", "Mono decoding using the first AC coefficient"},
{2, "DV_QUALITY_AC_2", "Highest quality mono decoding"},
{3, "DV_QUALITY_DC|DV_QUALITY_COLOUR", "Fastest colour decoding"},
{4, "DV_QUALITY_AC_1|DV_QUALITY_COLOUR",
"Colour, using only the first AC coefficient"},
{5, "DV_QUALITY_BEST", "Highest quality colour decoding"},
{0, "Monochrome, DC (Fastest)", "fastest"},
{1, "Monochrome, first AC coefficient", "monochrome-ac"},
{2, "Monochrome, highest quality", "monochrome-best"},
{3, "Colour, DC, fastest", "colour-fastest"},
{4, "Colour, using only the first AC coefficient", "colour-ac"},
{5, "Highest quality colour decoding", "best"},
{0, NULL, NULL},
};

View file

@ -93,8 +93,8 @@ gst_esdmon_depths_get_type (void)
{
static GType esdmon_depths_type = 0;
static GEnumValue esdmon_depths[] = {
{8, "8", "8 Bits"},
{16, "16", "16 Bits"},
{8, "8 Bits", "8"},
{16, "16 Bits", "16"},
{0, NULL, NULL},
};
@ -111,8 +111,8 @@ gst_esdmon_channels_get_type (void)
{
static GType esdmon_channels_type = 0;
static GEnumValue esdmon_channels[] = {
{1, "1", "Mono"},
{2, "2", "Stereo"},
{1, "Mono", "mono"},
{2, "Stereo", "stereo"},
{0, NULL, NULL},
};

View file

@ -159,16 +159,16 @@ gst_flacenc_quality_get_type (void)
if (qtype == 0) {
static const GEnumValue values[] = {
{0, "0", "0 - Fastest compression"},
{0, "0 - Fastest compression", "0"},
{1, "1", "1"},
{2, "2", "2"},
{3, "3", "3"},
{4, "4", "4"},
{5, "5", "5 - Default"},
{5, "5 - Default", "5"},
{6, "6", "6"},
{7, "7", "7"},
{8, "8", "8 - Highest compression "},
{9, "9", "9 - Insane"},
{8, "8 - Highest compression", "8"},
{9, "9 - Insane", "9"},
{0, NULL, NULL}
};

View file

@ -81,10 +81,10 @@ gst_pixbufscale_method_get_type (void)
{
static GType pixbufscale_method_type = 0;
static GEnumValue pixbufscale_methods[] = {
{GST_PIXBUFSCALE_NEAREST, "0", "Nearest Neighbour"},
{GST_PIXBUFSCALE_TILES, "1", "Tiles"},
{GST_PIXBUFSCALE_BILINEAR, "2", "Bilinear"},
{GST_PIXBUFSCALE_HYPER, "3", "Hyper"},
{GST_PIXBUFSCALE_NEAREST, "Nearest Neighbour", "nearest"},
{GST_PIXBUFSCALE_TILES, "Tiles", "tiles"},
{GST_PIXBUFSCALE_BILINEAR, "Bilinear", "bilinear"},
{GST_PIXBUFSCALE_HYPER, "Hyper", "hyper"},
{0, NULL, NULL},
};

View file

@ -108,28 +108,17 @@ gst_cacasink_dither_get_type (void)
{
static GType dither_type = 0;
if (!dither_type) {
GEnumValue *dithers;
gint n_dithers;
gint i;
gchar *caca_dithernames[] = {
"NONE", "ORDERED2", "ORDERED4", "ORDERED8", "RANDOM", NULL
static GEnumValue dither_types[] = {
{CACA_DITHERING_NONE, "No dithering", "none"},
{CACA_DITHERING_ORDERED2, "Ordered 2x2 Bayer dithering", "2x2"},
{CACA_DITHERING_ORDERED4, "Ordered 4x4 Bayer dithering", "4x4"},
{CACA_DITHERING_ORDERED8, "Ordered 8x8 Bayer dithering", "8x8"},
{CACA_DITHERING_RANDOM, "Random dithering", "random"},
{0, NULL, NULL},
};
n_dithers = 5;
dithers = g_new0 (GEnumValue, n_dithers + 1);
for (i = 0; i < n_dithers; i++) {
dithers[i].value = i;
dithers[i].value_name = g_strdup (caca_dithernames[i]);
dithers[i].value_nick = g_strdup (caca_dithernames[i]);
}
dithers[i].value = 0;
dithers[i].value_name = NULL;
dithers[i].value_nick = NULL;
dither_type = g_enum_register_static ("GstCACASinkDithers", dithers);
if (!dither_type) {
dither_type = g_enum_register_static ("GstCACASinkDithering", dither_types);
}
return dither_type;
}
@ -161,13 +150,13 @@ gst_cacasink_class_init (GstCACASinkClass * klass)
gobject_class->get_property = gst_cacasink_get_property;
gstelement_class->change_state = gst_cacasink_change_state;
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_WIDTH, g_param_spec_int ("screen_width", "screen_width", "screen_width", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_HEIGHT, g_param_spec_int ("screen_height", "screen_height", "screen_height", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_WIDTH, g_param_spec_int ("screen-width", "screen_width", "screen_width", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_HEIGHT, g_param_spec_int ("screen-height", "screen_height", "screen_height", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DITHER,
g_param_spec_enum ("dither", "Dither Type", "Set type of Dither",
GST_TYPE_CACADITHER, 0, G_PARAM_READWRITE));
GST_TYPE_CACADITHER, CACA_DITHERING_NONE, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ANTIALIASING,
g_param_spec_boolean ("anti_aliasing", "Anti-Aliasing",
g_param_spec_boolean ("anti-aliasing", "Anti-Aliasing",
"Enables Anti-Aliasing", TRUE, G_PARAM_READWRITE));
gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_cacasink_setcaps);

View file

@ -96,10 +96,10 @@ gst_shout2send_protocol_get_type (void)
{
static GType shout2send_protocol_type = 0;
static GEnumValue shout2send_protocol[] = {
{SHOUT2SEND_PROTOCOL_XAUDIOCAST, "1",
"Xaudiocast Protocol (icecast 1.3.x)"},
{SHOUT2SEND_PROTOCOL_ICY, "2", "Icy Protocol (ShoutCast)"},
{SHOUT2SEND_PROTOCOL_HTTP, "3", "Http Protocol (icecast 2.x)"},
{SHOUT2SEND_PROTOCOL_XAUDIOCAST,
"Xaudiocast Protocol (icecast 1.3.x)", "xaudiocast"},
{SHOUT2SEND_PROTOCOL_ICY, "Icy Protocol (ShoutCast)", "icy"},
{SHOUT2SEND_PROTOCOL_HTTP, "Http Protocol (icecast 2.x)", "http"},
{0, NULL, NULL},
};

View file

@ -171,10 +171,10 @@ gst_alpha_method_get_type (void)
{
static GType alpha_method_type = 0;
static GEnumValue alpha_method[] = {
{ALPHA_METHOD_SET, "0", "Set/adjust alpha channel"},
{ALPHA_METHOD_GREEN, "1", "Chroma Key green"},
{ALPHA_METHOD_BLUE, "2", "Chroma Key blue"},
{ALPHA_METHOD_CUSTOM, "3", "Chroma Key on target_r/g/b"},
{ALPHA_METHOD_SET, "Set/adjust alpha channel", "set"},
{ALPHA_METHOD_GREEN, "Chroma Key green", "green"},
{ALPHA_METHOD_BLUE, "Chroma Key blue", "blue"},
{ALPHA_METHOD_CUSTOM, "Chroma Key on target_r/g/b", "custom"},
{0, NULL, NULL},
};

View file

@ -69,9 +69,9 @@ gst_aggregator_sched_get_type (void)
{
static GType aggregator_sched_type = 0;
static GEnumValue aggregator_sched[] = {
{AGGREGATOR_LOOP, "1", "Loop Based"},
{AGGREGATOR_LOOP_SELECT, "3", "Loop Based Select"},
{AGGREGATOR_CHAIN, "4", "Chain Based"},
{AGGREGATOR_LOOP, "Loop Based", "loop"},
{AGGREGATOR_LOOP_SELECT, "Loop Based Select", "loop-select"},
{AGGREGATOR_CHAIN, "Chain Based", "chain"},
{0, NULL, NULL},
};

View file

@ -77,8 +77,8 @@ gst_shaper_policy_get_type (void)
{
static GType shaper_policy_type = 0;
static GEnumValue shaper_policy[] = {
{SHAPER_POLICY_TIMESTAMPS, "1", "sync on timestamps"},
{SHAPER_POLICY_BUFFERSIZE, "2", "sync on buffer size"},
{SHAPER_POLICY_TIMESTAMPS, "sync on timestamps", "timestamp"},
{SHAPER_POLICY_BUFFERSIZE, "sync on buffer size", "size"},
{0, NULL, NULL},
};

View file

@ -627,283 +627,283 @@ gst_wipe_triangles_draw (GstMask * mask)
}
static GstMaskDefinition definitions[] = {
{1, "bar_wipe_lr",
{1, "bar-wipe-lr",
"A bar moves from left to right",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_1]},
{2, "bar_wipe_tb",
{2, "bar-wipe-tb",
"A bar moves from top to bottom",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_2]},
{3, "box_wipe_tl",
{3, "box-wipe-tl",
"A box expands from the upper-left corner to the lower-right corner",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_3]},
{4, "box_wipe_tr",
{4, "box-wipe-tr",
"A box expands from the upper-right corner to the lower-left corner",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_4]},
{5, "box_wipe_br",
{5, "box-wipe-br",
"A box expands from the lower-right corner to the upper-left corner",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_5]},
{6, "box_wipe_bl",
{6, "box-wipe-bl",
"A box expands from the lower-left corner to the upper-right corner",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_6]},
{7, "four_box_wipe_ci",
{7, "four-box-wipe-ci",
"A box shape expands from each of the four corners toward the center",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_7]},
{8, "four_box_wipe_co",
{8, "four-box-wipe-co",
"A box shape expands from the center of each quadrant toward the corners of each quadrant",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_8]},
{21, "barndoor_v",
{21, "barndoor-v",
"A central, vertical line splits and expands toward the left and right edges",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_21]},
{22, "barndoor_h",
{22, "barndoor-h",
"A central, horizontal line splits and expands toward the top and bottom edges",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_22]},
{23, "box_wipe_tc",
{23, "box-wipe-tc",
"A box expands from the top edge's midpoint to the bottom corners",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_23]},
{24, "box_wipe_rc",
{24, "box-wipe-rc",
"A box expands from the right edge's midpoint to the left corners",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_24]},
{25, "box_wipe_bc",
{25, "box-wipe-bc",
"A box expands from the bottom edge's midpoint to the top corners",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_25]},
{26, "box_wipe_lc",
{26, "box-wipe-lc",
"A box expands from the left edge's midpoint to the right corners",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_26]},
{41, "diagonal_tl",
{41, "diagonal-tl",
"A diagonal line moves from the upper-left corner to the lower-right corner",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_41]},
{42, "diagonal_tr",
{42, "diagonal-tr",
"A diagonal line moves from the upper right corner to the lower-left corner",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_42]},
{43, "bowtie_v",
{43, "bowtie-v",
"Two wedge shapes slide in from the top and bottom edges toward the center",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_43]},
{44, "bowtie_h",
{44, "bowtie-h",
"Two wedge shapes slide in from the left and right edges toward the center",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_44]},
{45, "barndoor_dbl",
{45, "barndoor-dbl",
"A diagonal line from the lower-left to upper-right corners splits and expands toward the opposite corners",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_45]},
{46, "barndoor_dtl",
{46, "barndoor-dtl",
"A diagonal line from upper-left to lower-right corners splits and expands toward the opposite corners",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_46]},
{47, "misc_diagonal_dbd",
{47, "misc-diagonal-dbd",
"Four wedge shapes split from the center and retract toward the four edges",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_47]},
{48, "misc_diagonal_dd",
{48, "misc-diagonal-dd",
"A diamond connecting the four edge midpoints simultaneously contracts toward the center and expands toward the edges",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_48]},
{61, "vee_d",
{61, "vee-d",
"A wedge shape moves from top to bottom",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_61]},
{62, "vee_l",
{62, "vee-l",
"A wedge shape moves from right to left",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_62]},
{63, "vee_u",
{63, "vee-u",
"A wedge shape moves from bottom to top",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_63]},
{64, "vee_r",
{64, "vee-r",
"A wedge shape moves from left to right",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_64]},
{65, "barnvee_d",
{65, "barnvee-d",
"A 'V' shape extending from the bottom edge's midpoint to the opposite corners contracts toward the center and expands toward the edges",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_65]},
{66, "barnvee_l",
{66, "barnvee-l",
"A 'V' shape extending from the left edge's midpoint to the opposite corners contracts toward the center and expands toward the edges",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_66]},
{67, "barnvee_u",
{67, "barnvee-u",
"A 'V' shape extending from the top edge's midpoint to the opposite corners contracts toward the center and expands toward the edges",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_67]},
{68, "barnvee_r",
{68, "barnvee-r",
"A 'V' shape extending from the right edge's midpoint to the opposite corners contracts toward the center and expands toward the edges",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_68]},
{101, "iris_rect",
{101, "iris-rect",
"A rectangle expands from the center.",
gst_wipe_triangles_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_101]},
{201, "clock_cw12",
{201, "clock-cw12",
"A radial hand sweeps clockwise from the twelve o'clock position",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_201]},
{202, "clock_cw3",
{202, "clock-cw3",
"A radial hand sweeps clockwise from the three o'clock position",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_202]},
{203, "clock_cw6",
{203, "clock-cw6",
"A radial hand sweeps clockwise from the six o'clock position",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_203]},
{204, "clock_cw9",
{204, "clock-cw9",
"A radial hand sweeps clockwise from the nine o'clock position",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_204]},
{205, "pinwheel_tbv",
{205, "pinwheel-tbv",
"Two radial hands sweep clockwise from the twelve and six o'clock positions",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_205]},
{206, "pinwheel_tbh",
{206, "pinwheel-tbh",
"Two radial hands sweep clockwise from the nine and three o'clock positions",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_206]},
{207, "pinwheel_fb",
{207, "pinwheel-fb",
"Four radial hands sweep clockwise",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_207]},
{211, "fan_ct",
{211, "fan-ct",
"A fan unfolds from the top edge, the fan axis at the center",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_211]},
{212, "fan_cr",
{212, "fan-cr",
"A fan unfolds from the right edge, the fan axis at the center",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_212]},
{213, "doublefan_fov",
{213, "doublefan-fov",
"Two fans, their axes at the center, unfold from the top and bottom",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_213]},
{214, "doublefan_foh",
{214, "doublefan-foh",
"Two fans, their axes at the center, unfold from the left and right",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_214]},
{221, "singlesweep_cwt",
{221, "singlesweep-cwt",
"A radial hand sweeps clockwise from the top edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_221]},
{222, "singlesweep_cwr",
{222, "singlesweep-cwr",
"A radial hand sweeps clockwise from the right edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_222]},
{223, "singlesweep_cwb",
{223, "singlesweep-cwb",
"A radial hand sweeps clockwise from the bottom edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_223]},
{224, "singlesweep_cwl",
{224, "singlesweep-cwl",
"A radial hand sweeps clockwise from the left edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_224]},
{225, "doublesweep_pv",
{225, "doublesweep-pv",
"Two radial hands sweep clockwise and counter-clockwise from the top and bottom edges' midpoints",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_225]},
{226, "doublesweep_pd",
{226, "doublesweep-pd",
"Two radial hands sweep clockwise and counter-clockwise from the left and right edges' midpoints",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_226]},
{227, "doublesweep_ov",
{227, "doublesweep-ov",
"Two radial hands attached at the top and bottom edges' midpoints sweep from right to left",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_227]},
{228, "doublesweep_oh",
{228, "doublesweep-oh",
"Two radial hands attached at the left and right edges' midpoints sweep from top to bottom",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_228]},
{231, "fan_t",
{231, "fan-t",
"A fan unfolds from the bottom, the fan axis at the top edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_231]},
{232, "fan_r",
{232, "fan-r",
"A fan unfolds from the left, the fan axis at the right edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_232]},
{233, "fan_b",
{233, "fan-b",
"A fan unfolds from the top, the fan axis at the bottom edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_233]},
{234, "fan_l",
{234, "fan-l",
"A fan unfolds from the right, the fan axis at the left edge's midpoint",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_234]},
{235, "doublefan_fiv",
{235, "doublefan-fiv",
"Two fans, their axes at the top and bottom, unfold from the center",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_235]},
{236, "doublefan_fih",
{236, "doublefan-fih",
"Two fans, their axes at the left and right, unfold from the center",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_236]},
{241, "singlesweep_cwtl",
{241, "singlesweep-cwtl",
"A radial hand sweeps clockwise from the upper-left corner",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_241]},
{242, "singlesweep_cwbl",
{242, "singlesweep-cwbl",
"A radial hand sweeps counter-clockwise from the lower-left corner.",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_242]},
{243, "singlesweep_cwbr",
{243, "singlesweep-cwbr",
"A radial hand sweeps clockwise from the lower-right corner",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_243]},
{244, "singlesweep_cwtr",
{244, "singlesweep-cwtr",
"A radial hand sweeps counter-clockwise from the upper-right corner",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_244]},
{245, "doublesweep_pdtl",
{245, "doublesweep-pdtl",
"Two radial hands attached at the upper-left and lower-right corners sweep down and up",
gst_wipe_triangles_clock_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_245]},
{246, "doublesweep_pdbl",
{246, "doublesweep-pdbl",
"Two radial hands attached at the lower-left and upper-right corners sweep down and up",
gst_wipe_triangles_clock_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_246]},
{251, "saloondoor_t",
{251, "saloondoor-t",
"Two radial hands attached at the upper-left and upper-right corners sweep down",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_251]},
{252, "saloondoor_l",
{252, "saloondoor-l",
"Two radial hands attached at the upper-left and lower-left corners sweep to the right",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_252]},
{253, "saloondoor_b",
{253, "saloondoor-b",
"Two radial hands attached at the lower-left and lower-right corners sweep up",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_253]},
{254, "saloondoor_r",
{254, "saloondoor-r",
"Two radial hands attached at the upper-right and lower-right corners sweep to the left",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_254]},
{261, "windshield_r",
{261, "windshield-r",
"Two radial hands attached at the midpoints of the top and bottom halves sweep from right to left",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_261]},
{262, "windshield_u",
{262, "windshield-u",
"Two radial hands attached at the midpoints of the left and right halves sweep from top to bottom",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_262]},
{263, "windshield_v",
{263, "windshield-v",
"Two sets of radial hands attached at the midpoints of the top and bottom halves sweep from top to bottom and bottom to top",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_263]},
{264, "windshield_h",
{264, "windshield-h",
"Two sets of radial hands attached at the midpoints of the left and right halves sweep from left to right and right to left",
gst_wipe_boxes_draw, _gst_mask_default_destroy,
&wipe_config[WIPE_CONFIG_264]},

View file

@ -95,8 +95,8 @@ gst_smpte_transition_type_get_type (void)
definitions = g_list_next (definitions);
smpte_transitions[i].value = definition->type;
smpte_transitions[i].value_name = definition->short_name;
smpte_transitions[i].value_nick = definition->long_name;
smpte_transitions[i].value_nick = definition->short_name;
smpte_transitions[i].value_name = definition->long_name;
i++;
}

View file

@ -145,9 +145,9 @@ gst_video_box_fill_get_type (void)
{
static GType video_box_fill_type = 0;
static GEnumValue video_box_fill[] = {
{VIDEO_BOX_FILL_BLACK, "0", "Black"},
{VIDEO_BOX_FILL_GREEN, "1", "Colorkey green"},
{VIDEO_BOX_FILL_BLUE, "2", "Colorkey blue"},
{VIDEO_BOX_FILL_BLACK, "Black", "black"},
{VIDEO_BOX_FILL_GREEN, "Colorkey green", "green"},
{VIDEO_BOX_FILL_BLUE, "Colorkey blue", "blue"},
{0, NULL, NULL},
};

View file

@ -68,16 +68,17 @@ gst_videoflip_method_get_type (void)
{
static GType videoflip_method_type = 0;
static GEnumValue videoflip_methods[] = {
{GST_VIDEOFLIP_METHOD_IDENTITY, "0", "Identity (no rotation)"},
{GST_VIDEOFLIP_METHOD_90R, "1", "Rotate clockwise 90 degrees"},
{GST_VIDEOFLIP_METHOD_180, "2", "Rotate 180 degrees"},
{GST_VIDEOFLIP_METHOD_90L, "3", "Rotate counter-clockwise 90 degrees"},
{GST_VIDEOFLIP_METHOD_HORIZ, "4", "Flip horizontally"},
{GST_VIDEOFLIP_METHOD_VERT, "5", "Flip vertically"},
{GST_VIDEOFLIP_METHOD_TRANS, "6",
"Flip across upper left/lower right diagonal"},
{GST_VIDEOFLIP_METHOD_OTHER, "7",
"Flip across upper right/lower left diagonal"},
{GST_VIDEOFLIP_METHOD_IDENTITY, "Identity (no rotation)", "none"},
{GST_VIDEOFLIP_METHOD_90R, "Rotate clockwise 90 degrees", "clockwise"},
{GST_VIDEOFLIP_METHOD_180, "Rotate 180 degrees", "rotate-180"},
{GST_VIDEOFLIP_METHOD_90L, "Rotate counter-clockwise 90 degrees",
"counterclockwise"},
{GST_VIDEOFLIP_METHOD_HORIZ, "Flip horizontally", "horizontal-flip"},
{GST_VIDEOFLIP_METHOD_VERT, "Flip vertically", "vertical-flip"},
{GST_VIDEOFLIP_METHOD_TRANS,
"Flip across upper left/lower right diagonal", "upper-left-diagonal"},
{GST_VIDEOFLIP_METHOD_OTHER,
"Flip across upper right/lower left diagonal", "upper-right-diagonal"},
{0, NULL, NULL},
};

View file

@ -375,9 +375,9 @@ gst_video_mixer_background_get_type (void)
{
static GType video_mixer_background_type = 0;
static GEnumValue video_mixer_background[] = {
{VIDEO_MIXER_BACKGROUND_CHECKER, "0", "Checker pattern"},
{VIDEO_MIXER_BACKGROUND_BLACK, "1", "Black"},
{VIDEO_MIXER_BACKGROUND_WHITE, "2", "White"},
{VIDEO_MIXER_BACKGROUND_CHECKER, "Checker pattern", "checker"},
{VIDEO_MIXER_BACKGROUND_BLACK, "Black", "black"},
{VIDEO_MIXER_BACKGROUND_WHITE, "White", "white"},
{0, NULL, NULL},
};