From 842a43f80230c65d024a5859c6b67dc601e7de64 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 22 Nov 2005 18:11:58 +0000 Subject: fix up more enums Original commit message from CVS: fix up more enums --- gst/smpte/barboxwipes.c | 140 ++++++++++++++++++++++++------------------------ gst/smpte/gstsmpte.c | 4 +- 2 files changed, 72 insertions(+), 72 deletions(-) (limited to 'gst/smpte') diff --git a/gst/smpte/barboxwipes.c b/gst/smpte/barboxwipes.c index d6ccf0b8..012a4fb0 100644 --- a/gst/smpte/barboxwipes.c +++ b/gst/smpte/barboxwipes.c @@ -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]}, diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index f591d49e..bf5ed282 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -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++; } -- cgit