From 2778e501c4c05bb69227340bbc43e7995c8082b2 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 20 Mar 2015 10:06:35 +0100 Subject: [PATCH] validate: move scenarios to validate/scenarios/ https://bugzilla.gnome.org/show_bug.cgi?id=746465 --- validate/data/Makefile.am | 2 +- validate/docs/validate/envvariables.xml | 8 ++++---- validate/docs/validate/scenarios.xml | 4 ++-- validate/gst/validate/gst-validate-scenario.c | 13 ++++++------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/validate/data/Makefile.am b/validate/data/Makefile.am index 1f4f4a4ffd..020c8cf61d 100644 --- a/validate/data/Makefile.am +++ b/validate/data/Makefile.am @@ -1,4 +1,4 @@ -scenariosdir=${datadir}/gstreamer-$(GST_API_VERSION)/validate-scenario +scenariosdir=${datadir}/gstreamer-$(GST_API_VERSION)/validate/scenarios scenarios_DATA = simple_seeks.scenario \ seek_forward.scenario \ seek_backward.scenario \ diff --git a/validate/docs/validate/envvariables.xml b/validate/docs/validate/envvariables.xml index 43f9385967..89af17900b 100644 --- a/validate/docs/validate/envvariables.xml +++ b/validate/docs/validate/envvariables.xml @@ -84,8 +84,8 @@ scan these paths for GstValidate scenario files. By default GstValidate will look for scenarios in the user data directory as - specified in the XDG standard: .local/share/gstreamer-&GST_API_VERSION;/validate-scenario - and the system wide user data directory: /usr/lib/gstreamer-&GST_API_VERSION;/validate-scenario + specified in the XDG standard: .local/share/gstreamer-&GST_API_VERSION;/validate/scenarios + and the system wide user data directory: /usr/lib/gstreamer-&GST_API_VERSION;/validate/scenarios @@ -97,8 +97,8 @@ scan these paths for GstValidate overrides By default GstValidate will look for scenarios in the user data directory as - specified in the XDG standard: .local/share/gstreamer-&GST_API_VERSION;/validate-scenario - and the system wide user data directory: /usr/lib/gstreamer-&GST_API_VERSION;/validate-scenario + specified in the XDG standard: .local/share/gstreamer-&GST_API_VERSION;/validate/scenarios + and the system wide user data directory: /usr/lib/gstreamer-&GST_API_VERSION;/validate/scenarios diff --git a/validate/docs/validate/scenarios.xml b/validate/docs/validate/scenarios.xml index 035eeb651b..053100608d 100644 --- a/validate/docs/validate/scenarios.xml +++ b/validate/docs/validate/scenarios.xml @@ -45,8 +45,8 @@ The files to be used as scenario should have a '.scenario' extension and - should be placed either in $USER_DATA_DIR/gstreamer-1.0/validate-scenario , - $GST_DATADIR/gstreamer-1.0/validate-scenario or in a path defined in the + should be placed either in $USER_DATA_DIR/gstreamer-1.0/validate/scenarios , + $GST_DATADIR/gstreamer-1.0/validate/scenarios or in a path defined in the $GST_VALIDATE_SCENARIOS_PATH environment variable. diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c index 7053f8017c..c6623143ae 100644 --- a/validate/gst/validate/gst-validate-scenario.c +++ b/validate/gst/validate/gst-validate-scenario.c @@ -50,7 +50,7 @@ (G_TYPE_INSTANCE_GET_PRIVATE ((o), GST_TYPE_VALIDATE_SCENARIO, GstValidateScenarioPrivate)) #define GST_VALIDATE_SCENARIO_SUFFIX ".scenario" -#define GST_VALIDATE_SCENARIO_DIRECTORY "validate-scenario" +#define GST_VALIDATE_SCENARIO_DIRECTORY "scenarios" #define DEFAULT_SEEK_TOLERANCE (1 * GST_MSECOND) /* tolerance seek interval TODO make it overridable */ @@ -1919,15 +1919,14 @@ gst_validate_scenario_load (GstValidateScenario * scenario, /* Try from local profiles */ tldir = g_build_filename (g_get_user_data_dir (), - "gstreamer-" GST_API_VERSION, GST_VALIDATE_SCENARIO_DIRECTORY, - lfilename, NULL); - + "gstreamer-" GST_API_VERSION, "validate", + GST_VALIDATE_SCENARIO_DIRECTORY, lfilename, NULL); if (!(ret = _load_scenario_file (scenario, tldir, &is_config))) { g_free (tldir); /* Try from system-wide profiles */ tldir = g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION, - GST_VALIDATE_SCENARIO_DIRECTORY, lfilename, NULL); + "validate", GST_VALIDATE_SCENARIO_DIRECTORY, lfilename, NULL); if (!(ret = _load_scenario_file (scenario, tldir, &is_config))) { goto error; @@ -2319,7 +2318,7 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios, const gchar *envvar; gchar **env_scenariodir = NULL; gchar *tldir = g_build_filename (g_get_user_data_dir (), - "gstreamer-" GST_API_VERSION, GST_VALIDATE_SCENARIO_DIRECTORY, + "gstreamer-" GST_API_VERSION, "validate", GST_VALIDATE_SCENARIO_DIRECTORY, NULL); GFile *dir = g_file_new_for_path (tldir); @@ -2350,7 +2349,7 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios, g_free (tldir); tldir = g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION, - GST_VALIDATE_SCENARIO_DIRECTORY, NULL); + "validate", GST_VALIDATE_SCENARIO_DIRECTORY, NULL); dir = g_file_new_for_path (tldir); _list_scenarios_in_dir (dir, kf); g_object_unref (dir);