diff options
author | Thibault Saunier <tsaunier@gnome.org> | 2014-10-12 20:07:58 +0200 |
---|---|---|
committer | Thibault Saunier <tsaunier@gnome.org> | 2014-10-12 20:10:19 +0200 |
commit | 02ab99fcbb62f6389d253eaead669d1cfd260f2c (patch) | |
tree | e395675da0fc7c815dd472c0b0ec147903698993 | |
parent | 9158bb36e30dd4069d2b8a32ced941883d69eeb4 (diff) |
validate: Rename gst_validate_add_action_type to gst_validate_register_action_type
The _register naming corresponds much better to what the method does
and makes it more similar to how we refer to this kind of action in
GStreamer.
It is a last minute API change, but that API should not change anymore
after 1.4 is released.
-rw-r--r-- | validate/docs/validate/gst-validate-sections.txt | 2 | ||||
-rw-r--r-- | validate/gst/validate/gst-validate-scenario.c | 36 | ||||
-rw-r--r-- | validate/gst/validate/gst-validate-scenario.h | 12 | ||||
-rw-r--r-- | validate/tools/gst-validate-transcoding.c | 4 | ||||
-rw-r--r-- | validate/tools/gst-validate.c | 4 |
5 files changed, 29 insertions, 29 deletions
diff --git a/validate/docs/validate/gst-validate-sections.txt b/validate/docs/validate/gst-validate-sections.txt index 174fcc7..cd84956 100644 --- a/validate/docs/validate/gst-validate-sections.txt +++ b/validate/docs/validate/gst-validate-sections.txt @@ -43,7 +43,7 @@ GstValidateScenario GstValidateScenarioClass gst_validate_print_action_types gst_validate_list_scenarios -gst_validate_add_action_type +gst_validate_register_action_type gst_validate_action_get_clocktime gst_validate_scenario_execute_seek GstValidateActionType diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c index 67fff90..e0fb4d2 100644 --- a/validate/gst/validate/gst-validate-scenario.c +++ b/validate/gst/validate/gst-validate-scenario.c @@ -58,8 +58,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_validate_scenario_debug); #undef GST_CAT_DEFAULT #define GST_CAT_DEFAULT gst_validate_scenario_debug -#define ADD_ACTION_TYPE(_tname, _function, _params, _desc, _is_config) G_STMT_START { \ - gst_validate_add_action_type ((_tname), "core", (_function), (_params), (_desc), (_is_config)); \ +#define REGISTER_ACTION_TYPE(_tname, _function, _params, _desc, _is_config) G_STMT_START { \ + gst_validate_register_action_type ((_tname), "core", (_function), (_params), (_desc), (_is_config)); \ } G_STMT_END enum @@ -1901,7 +1901,7 @@ done: } /** - * gst_validate_add_action_type: + * gst_validate_register_action_type: * @type_name: The name of the new action type to add * @implementer_namespace: The namespace of the implementer of the action type * @function: (scope notified): The function to be called to execute the action @@ -1914,7 +1914,7 @@ done: * exists, it will be overriden by that new definition */ void -gst_validate_add_action_type (const gchar * type_name, +gst_validate_register_action_type (const gchar * type_name, const gchar * implementer_namespace, GstValidateExecuteAction function, GstValidateActionParameter * parameters, @@ -2041,7 +2041,7 @@ init_scenarios (void) clean_action_str = g_regex_new ("\\\\\n|#.*\n", G_REGEX_CASELESS, 0, NULL); /* *INDENT-OFF* */ - ADD_ACTION_TYPE ("description", NULL, + REGISTER_ACTION_TYPE ("description", NULL, ((GstValidateActionParameter []) { { .name = "summary", @@ -2132,7 +2132,7 @@ init_scenarios (void) "Allows to describe the scenario in various ways", TRUE); - ADD_ACTION_TYPE ("seek", _execute_seek, + REGISTER_ACTION_TYPE ("seek", _execute_seek, ((GstValidateActionParameter []) { { .name = "start", @@ -2189,7 +2189,7 @@ init_scenarios (void) FALSE ); - ADD_ACTION_TYPE ("pause", _execute_pause, + REGISTER_ACTION_TYPE ("pause", _execute_pause, ((GstValidateActionParameter []) { { .name = "duration", @@ -2205,16 +2205,16 @@ init_scenarios (void) "parametter so the pipeline goes back to playing after that duration\n" "(in second)", FALSE); - ADD_ACTION_TYPE ("play", _execute_play, NULL, + REGISTER_ACTION_TYPE ("play", _execute_play, NULL, "Sets the pipeline state to PLAYING", FALSE); - ADD_ACTION_TYPE ("stop", _execute_stop, NULL, + REGISTER_ACTION_TYPE ("stop", _execute_stop, NULL, "Sets the pipeline state to NULL", FALSE); - ADD_ACTION_TYPE ("eos", _execute_eos, NULL, + REGISTER_ACTION_TYPE ("eos", _execute_eos, NULL, "Sends an EOS event to the pipeline", FALSE); - ADD_ACTION_TYPE ("switch-track", _execute_switch_track, + REGISTER_ACTION_TYPE ("switch-track", _execute_switch_track, ((GstValidateActionParameter []) { { .name = "type", @@ -2242,7 +2242,7 @@ init_scenarios (void) "The 'switch-track' command can be used to switch tracks.\n" , FALSE); - ADD_ACTION_TYPE ("wait", _execute_wait, + REGISTER_ACTION_TYPE ("wait", _execute_wait, ((GstValidateActionParameter []) { { .name = "duration", @@ -2253,13 +2253,13 @@ init_scenarios (void) }), "Waits during 'duration' seconds", FALSE); - ADD_ACTION_TYPE ("dot-pipeline", _execute_dot_pipeline, NULL, + REGISTER_ACTION_TYPE ("dot-pipeline", _execute_dot_pipeline, NULL, "Dots the pipeline (the 'name' property will be used in the dot filename).\n" "For more information have a look at the GST_DEBUG_BIN_TO_DOT_FILE documentation.\n" "Note that the GST_DEBUG_DUMP_DOT_DIR env variable needs to be set\n", FALSE); - ADD_ACTION_TYPE ("set-feature-rank", _set_rank, + REGISTER_ACTION_TYPE ("set-feature-rank", _set_rank, ((GstValidateActionParameter []) { { .name = "feature-name", @@ -2277,7 +2277,7 @@ init_scenarios (void) }), "Changes the ranking of a particular plugin feature", TRUE); - ADD_ACTION_TYPE ("set-state", _execute_set_state, + REGISTER_ACTION_TYPE ("set-state", _execute_set_state, ((GstValidateActionParameter []) { { .name = "state", @@ -2290,7 +2290,7 @@ init_scenarios (void) }), "Changes the state of the pipeline to any GstState", FALSE); - ADD_ACTION_TYPE ("set-property", _execute_set_property, + REGISTER_ACTION_TYPE ("set-property", _execute_set_property, ((GstValidateActionParameter []) { { .name = "target-element-name", @@ -2316,7 +2316,7 @@ init_scenarios (void) }), "Sets a property of any element in the pipeline", FALSE); - ADD_ACTION_TYPE ("set-debug-threshold", + REGISTER_ACTION_TYPE ("set-debug-threshold", _execute_set_debug_threshold, ((GstValidateActionParameter []) { @@ -2331,7 +2331,7 @@ init_scenarios (void) "Sets the debug level to be used, same format as\n" "setting the GST_DEBUG env variable", FALSE); - ADD_ACTION_TYPE ("emit-signal", _execute_emit_signal, + REGISTER_ACTION_TYPE ("emit-signal", _execute_emit_signal, ((GstValidateActionParameter []) { { diff --git a/validate/gst/validate/gst-validate-scenario.h b/validate/gst/validate/gst-validate-scenario.h index af3dcc2..571e073 100644 --- a/validate/gst/validate/gst-validate-scenario.h +++ b/validate/gst/validate/gst-validate-scenario.h @@ -61,7 +61,7 @@ typedef gboolean (*GstValidateExecuteAction) (GstValidateScenario * scenario, Gs * GstValidateAction: * @type: The type of the #GstValidateAction, which is the name of the * GstValidateActionType registered with - * #gst_validate_add_action_type + * #gst_validate_register_action_type * @name: The name of the action, set from the user in the scenario * @structure: the #GstStructure defining the action * @@ -162,11 +162,11 @@ gst_validate_list_scenarios (gchar **scenarios, gint num_scenarios, gchar * output_file); -void gst_validate_add_action_type (const gchar *type_name, - const gchar *implementer_namespace, - GstValidateExecuteAction function, - GstValidateActionParameter * parameters, - const gchar *description, gboolean is_config); +void gst_validate_register_action_type (const gchar *type_name, + const gchar *implementer_namespace, + GstValidateExecuteAction function, + GstValidateActionParameter * parameters, + const gchar *description, gboolean is_config); gboolean gst_validate_action_get_clocktime (GstValidateScenario * scenario, diff --git a/validate/tools/gst-validate-transcoding.c b/validate/tools/gst-validate-transcoding.c index 717ee1e..002319a 100644 --- a/validate/tools/gst-validate-transcoding.c +++ b/validate/tools/gst-validate-transcoding.c @@ -702,7 +702,7 @@ static void _register_actions (void) { /* *INDENT-OFF* */ - gst_validate_add_action_type ("set-restriction", "validate-transcoding", _execute_set_restriction, + gst_validate_register_action_type ("set-restriction", "validate-transcoding", _execute_set_restriction, (GstValidateActionParameter []) { { .name = "restriction-caps", @@ -716,7 +716,7 @@ _register_actions (void) "Change the restriction caps on the fly", FALSE); - gst_validate_add_action_type ("video-request-key-unit", "validate-transcoding", + gst_validate_register_action_type ("video-request-key-unit", "validate-transcoding", _execute_request_key_unit, (GstValidateActionParameter []) { { diff --git a/validate/tools/gst-validate.c b/validate/tools/gst-validate.c index e0bcb43..1a9782a 100644 --- a/validate/tools/gst-validate.c +++ b/validate/tools/gst-validate.c @@ -304,7 +304,7 @@ static void _register_playbin_actions (void) { /* *INDENT-OFF* */ - gst_validate_add_action_type ("set-subtitle", "validate-launcher", _execute_set_subtitles, + gst_validate_register_action_type ("set-subtitle", "validate-launcher", _execute_set_subtitles, (GstValidateActionParameter []) { { .name = "subtitle-file", @@ -325,7 +325,7 @@ _register_playbin_actions (void) FALSE); /* Overriding default implementation */ - gst_validate_add_action_type ("switch-track", "validate-launcher", _execute_switch_track, + gst_validate_register_action_type ("switch-track", "validate-launcher", _execute_switch_track, (GstValidateActionParameter []) { { .name = "type", |