mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: move scenarios to validate/scenarios/

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=746465
This commit is contained in:
Guillaume Desmottes 2015-03-20 10:06:35 +01:00 committed by Thibault Saunier
parent e7762d13cc
commit 2778e501c4
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
validate/data/Makefile.am
View file

@ -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 \

8
validate/docs/validate/envvariables.xml
View file

@ -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: <filename>.local/share/gstreamer-&GST_API_VERSION;/validate-scenario</filename>
and the system wide user data directory: <filename>/usr/lib/gstreamer-&GST_API_VERSION;/validate-scenario</filename>
specified in the XDG standard: <filename>.local/share/gstreamer-&GST_API_VERSION;/validate/scenarios</filename>
and the system wide user data directory: <filename>/usr/lib/gstreamer-&GST_API_VERSION;/validate/scenarios</filename>
</para>
</formalpara>
@ -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: <filename>.local/share/gstreamer-&GST_API_VERSION;/validate-scenario</filename>
and the system wide user data directory: <filename>/usr/lib/gstreamer-&GST_API_VERSION;/validate-scenario</filename>
specified in the XDG standard: <filename>.local/share/gstreamer-&GST_API_VERSION;/validate/scenarios</filename>
and the system wide user data directory: <filename>/usr/lib/gstreamer-&GST_API_VERSION;/validate/scenarios</filename>
</para>
</formalpara>

4
validate/docs/validate/scenarios.xml
View file

@ -45,8 +45,8 @@
</para>
<para>
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.
</para>
<para>

13
validate/gst/validate/gst-validate-scenario.c
View file

@ -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);