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

encoding-target: Fixup loading/saving methods

Browse source
This commit is contained in:
Edward Hervey 2011-01-03 18:52:00 +01:00 committed by Edward Hervey
parent 536849bce5
commit 777f816ff1
5 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/libs/gst-plugins-base-libs-sections.txt
View file

@ -1961,9 +1961,9 @@ gst_encoding_target_get_profiles
gst_encoding_target_get_profile gst_encoding_target_get_profile
gst_encoding_target_add_profile gst_encoding_target_add_profile
gst_encoding_target_save gst_encoding_target_save
gst_encoding_target_save_to gst_encoding_target_save_to_file
gst_encoding_target_load gst_encoding_target_load
gst_encoding_target_load_from gst_encoding_target_load_from_file
gst_encoding_list_all_targets gst_encoding_list_all_targets
gst_encoding_list_available_categories gst_encoding_list_available_categories
<SUBSECTION Standard> <SUBSECTION Standard>

34
gst-libs/gst/pbutils/encoding-target.c
View file

@ -693,8 +693,8 @@ empty_name:
} }
/** /**
* gst_encoding_target_load_from: * gst_encoding_target_load_from_file:
* @path: The file to load the #GstEncodingTarget from * @filepath: The file location to load the #GstEncodingTarget from
* @error: If an error occured, this field will be filled in. * @error: If an error occured, this field will be filled in.
* *
* Opens the provided file and returns the contained #GstEncodingTarget. * Opens the provided file and returns the contained #GstEncodingTarget.
@ -706,13 +706,13 @@ empty_name:
*/ */
GstEncodingTarget * GstEncodingTarget *
gst_encoding_target_load_from (const gchar * path, GError ** error) gst_encoding_target_load_from_file (const gchar * filepath, GError ** error)
{ {
GKeyFile *in; GKeyFile *in;
gchar *targetname, *categoryname, *description; gchar *targetname, *categoryname, *description;
GstEncodingTarget *res = NULL; GstEncodingTarget *res = NULL;
in = load_file_and_read_header (path, &targetname, &categoryname, in = load_file_and_read_header (filepath, &targetname, &categoryname,
&description, error); &description, error);
if (!in) if (!in)
goto beach; goto beach;
@ -768,14 +768,14 @@ gst_encoding_target_subload (gchar * path, const gchar * category,
gchar *filename; gchar *filename;
filename = g_build_filename (path, category, lfilename, NULL); filename = g_build_filename (path, category, lfilename, NULL);
target = gst_encoding_target_load_from (filename, error); target = gst_encoding_target_load_from_file (filename, error);
g_free (filename); g_free (filename);
} else { } else {
GList *tmp, *tries = get_matching_filenames (path, lfilename); GList *tmp, *tries = get_matching_filenames (path, lfilename);
/* Try to find a file named %s.gstprofile in any subdirectories */ /* Try to find a file named %s.gstprofile in any subdirectories */
for (tmp = tries; tmp; tmp = tmp->next) { for (tmp = tries; tmp; tmp = tmp->next) {
target = gst_encoding_target_load_from ((gchar *) tmp->data, NULL); target = gst_encoding_target_load_from_file ((gchar *) tmp->data, NULL);
if (target) if (target)
break; break;
} }
@ -854,12 +854,12 @@ invalid_category:
} }
/** /**
* gst_encoding_target_save_to: * gst_encoding_target_save_to_file:
* @target: a #GstEncodingTarget * @target: a #GstEncodingTarget
* @path: the location to store the @target at. * @filepath: the location to store the @target at.
* @error: If an error occured, this field will be filled in. * @error: If an error occured, this field will be filled in.
* *
* Saves the @target to the provided location. * Saves the @target to the provided file location.
* *
* Since: 0.10.32 * Since: 0.10.32
* *
@ -867,17 +867,17 @@ invalid_category:
**/ **/
gboolean gboolean
gst_encoding_target_save_to (GstEncodingTarget * target, const gchar * path, gst_encoding_target_save_to_file (GstEncodingTarget * target,
GError ** error) const gchar * filepath, GError ** error)
{ {
GKeyFile *out; GKeyFile *out;
gchar *data; gchar *data;
gsize data_size; gsize data_size;
g_return_val_if_fail (GST_IS_ENCODING_TARGET (target), FALSE); g_return_val_if_fail (GST_IS_ENCODING_TARGET (target), FALSE);
g_return_val_if_fail (path != NULL, FALSE); g_return_val_if_fail (filepath != NULL, FALSE);
/* FIXME : Check path is valid and writable /* FIXME : Check filepath is valid and writable
* FIXME : Strip out profiles already present in system target */ * FIXME : Strip out profiles already present in system target */
/* Get unique name... */ /* Get unique name... */
@ -891,7 +891,7 @@ gst_encoding_target_save_to (GstEncodingTarget * target, const gchar * path,
if (!(data = g_key_file_to_data (out, &data_size, error))) if (!(data = g_key_file_to_data (out, &data_size, error)))
goto convert_failed; goto convert_failed;
if (!g_file_set_contents (path, data, data_size, error)) if (!g_file_set_contents (filepath, data, data_size, error))
goto write_failed; goto write_failed;
g_key_file_free (out); g_key_file_free (out);
@ -916,7 +916,7 @@ convert_failed:
write_failed: write_failed:
{ {
GST_ERROR ("Unable to write file %s: %s", path, (*error)->message); GST_ERROR ("Unable to write file %s: %s", filepath, (*error)->message);
g_key_file_free (out); g_key_file_free (out);
g_free (data); g_free (data);
return FALSE; return FALSE;
@ -951,7 +951,7 @@ gst_encoding_target_save (GstEncodingTarget * target, GError ** error)
GST_ENCODING_TARGET_DIRECTORY, target->category, lfilename, NULL); GST_ENCODING_TARGET_DIRECTORY, target->category, lfilename, NULL);
g_free (lfilename); g_free (lfilename);
res = gst_encoding_target_save_to (target, filename, error); res = gst_encoding_target_save_to_file (target, filename, error);
g_free (filename); g_free (filename);
return TRUE; return TRUE;
@ -1041,7 +1041,7 @@ sub_get_all_targets (gchar * subdir)
continue; continue;
fullname = g_build_filename (subdir, filename, NULL); fullname = g_build_filename (subdir, filename, NULL);
target = gst_encoding_target_load_from (fullname, NULL); target = gst_encoding_target_load_from_file (fullname, NULL);
if (target) { if (target) {
res = g_list_append (res, target); res = g_list_append (res, target);
} else } else

10
gst-libs/gst/pbutils/encoding-target.h
View file

@ -130,14 +130,14 @@ gst_encoding_target_add_profile (GstEncodingTarget *target, GstEncodingProfile *
gboolean gst_encoding_target_save (GstEncodingTarget *target, gboolean gst_encoding_target_save (GstEncodingTarget *target,
GError **error); GError **error);
gboolean gst_encoding_target_save_to (GstEncodingTarget *target, gboolean gst_encoding_target_save_to_file (GstEncodingTarget *target,
const gchar *path, const gchar *filepath,
GError **error); GError **error);
GstEncodingTarget *gst_encoding_target_load (const gchar *name, GstEncodingTarget *gst_encoding_target_load (const gchar *name,
const gchar *category, const gchar *category,
GError **error); GError **error);
GstEncodingTarget *gst_encoding_target_load_from (const gchar *path, GstEncodingTarget *gst_encoding_target_load_from_file (const gchar *filepath,
GError **error); GError **error);
GList *gst_encoding_list_available_categories (void); GList *gst_encoding_list_available_categories (void);
GList *gst_encoding_list_all_targets (const gchar * categoryname); GList *gst_encoding_list_all_targets (const gchar * categoryname);

4
tests/check/libs/profile.c
View file

@ -292,7 +292,7 @@ GST_START_TEST (test_saving_profile)
profile_file_name = g_build_filename (g_get_home_dir (), ".gstreamer-0.10", profile_file_name = g_build_filename (g_get_home_dir (), ".gstreamer-0.10",
"encoding-profiles", "herding", "myponytarget2.gep", NULL); "encoding-profiles", "herding", "myponytarget2.gep", NULL);
GST_DEBUG ("Loading target from '%s'", profile_file_name); GST_DEBUG ("Loading target from '%s'", profile_file_name);
loaded = gst_encoding_target_load_from (profile_file_name, NULL); loaded = gst_encoding_target_load_from_file (profile_file_name, NULL);
fail_unless (loaded != NULL); fail_unless (loaded != NULL);
g_free (profile_file_name); g_free (profile_file_name);
@ -415,7 +415,7 @@ GST_START_TEST (test_loading_profile)
"encoding-profiles", "herding", "myponytarget.gep", NULL); "encoding-profiles", "herding", "myponytarget.gep", NULL);
GST_DEBUG ("Loading target from '%s'", profile_file_name); GST_DEBUG ("Loading target from '%s'", profile_file_name);
target = gst_encoding_target_load_from (profile_file_name, NULL); target = gst_encoding_target_load_from_file (profile_file_name, NULL);
g_free (profile_file_name); g_free (profile_file_name);
fail_unless (target != NULL); fail_unless (target != NULL);
test_individual_target (target); test_individual_target (target);

4
win32/common/libgstpbutils.def
View file

@ -92,10 +92,10 @@ EXPORTS
gst_encoding_target_get_profiles gst_encoding_target_get_profiles
gst_encoding_target_get_type gst_encoding_target_get_type
gst_encoding_target_load gst_encoding_target_load
gst_encoding_target_load_from gst_encoding_target_load_from_file
gst_encoding_target_new gst_encoding_target_new
gst_encoding_target_save gst_encoding_target_save
gst_encoding_target_save_to gst_encoding_target_save_to_file
gst_encoding_video_profile_get_pass gst_encoding_video_profile_get_pass
gst_encoding_video_profile_get_type gst_encoding_video_profile_get_type
gst_encoding_video_profile_get_variableframerate gst_encoding_video_profile_get_variableframerate