mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-05 06:58:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Call the version GST_MAGIC_BINARY_VERSION_STR to be more consistent and add it to the (private part) of the docs to f...

Browse source 
Original commit message from CVS:
* docs/gst/gstreamer-sections.txt:
* gst/gstregistrybinary.c: (gst_registry_binary_initialize_magic),
(gst_registry_binary_check_magic):
* gst/gstregistrybinary.h:
Call the version GST_MAGIC_BINARY_VERSION_STR to be more consistent
and add it to the (private part) of the docs to fix the build.
This commit is contained in:
Sebastian Dröge 2008-03-21 16:11:51 +00:00
parent 63c01eeacb
commit 520791d270
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-03-21 Sebastian Dröge <slomo@circular-chaos.org>
* docs/gst/gstreamer-sections.txt:
* gst/gstregistrybinary.c: (gst_registry_binary_initialize_magic),
(gst_registry_binary_check_magic):
* gst/gstregistrybinary.h:
Call the version GST_MAGIC_BINARY_VERSION_STR to be more consistent
and add it to the (private part) of the docs to fix the build.
2008-03-21 Sebastian Dröge <slomo@circular-chaos.org> 2008-03-21 Sebastian Dröge <slomo@circular-chaos.org>
* gst/gstregistrybinary.c: (gst_registry_binary_initialize_magic), * gst/gstregistrybinary.c: (gst_registry_binary_initialize_magic),

1
docs/gst/gstreamer-sections.txt
View file

@ -1745,6 +1745,7 @@ GST_TYPE_REGISTRY
<SUBSECTION Private> <SUBSECTION Private>
GST_MAGIC_BINARY_REGISTRY_LEN GST_MAGIC_BINARY_REGISTRY_LEN
GST_MAGIC_BINARY_REGISTRY_STR GST_MAGIC_BINARY_REGISTRY_STR
GST_MAGIC_BINARY_VERSION_STR
GST_MAGIC_BINARY_VERSION_LEN GST_MAGIC_BINARY_VERSION_LEN
gst_registry_get_type gst_registry_get_type
</SECTION> </SECTION>

6
gst/gstregistrybinary.c
View file

@ -145,7 +145,7 @@ gst_registry_binary_initialize_magic (GstBinaryRegistryMagic * m)
{ {
if (!strncpy (m->magic, GST_MAGIC_BINARY_REGISTRY_STR, if (!strncpy (m->magic, GST_MAGIC_BINARY_REGISTRY_STR,
GST_MAGIC_BINARY_REGISTRY_LEN) GST_MAGIC_BINARY_REGISTRY_LEN)
|| !strncpy (m->version, GST_MAGIC_BINARY_VERSION_STRING, || !strncpy (m->version, GST_MAGIC_BINARY_VERSION_STR,
GST_MAGIC_BINARY_VERSION_LEN)) { GST_MAGIC_BINARY_VERSION_LEN)) {
GST_ERROR ("Failed to write magic to the registry magic structure"); GST_ERROR ("Failed to write magic to the registry magic structure");
return FALSE; return FALSE;
@ -625,10 +625,10 @@ gst_registry_binary_check_magic (gchar ** in)
m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff); m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff);
return -1; return -1;
} }
if (strncmp (m->version, GST_MAGIC_BINARY_VERSION_STRING, if (strncmp (m->version, GST_MAGIC_BINARY_VERSION_STR,
GST_MAGIC_BINARY_VERSION_LEN)) { GST_MAGIC_BINARY_VERSION_LEN)) {
GST_WARNING ("Binary registry magic version is different : %s != %s", GST_WARNING ("Binary registry magic version is different : %s != %s",
GST_MAGIC_BINARY_VERSION_STRING, m->version); GST_MAGIC_BINARY_VERSION_STR, m->version);
return -2; return -2;
} }
return 0; return 0;

4
gst/gstregistrybinary.h
View file

@ -51,13 +51,13 @@
#define GST_MAGIC_BINARY_REGISTRY_LEN (4) #define GST_MAGIC_BINARY_REGISTRY_LEN (4)
/* /*
* GST_MAGIC_BINARY_VERSION_STRING: * GST_MAGIC_BINARY_VERSION_STR:
* *
* The current version of the binary registry format. * The current version of the binary registry format.
* This _must_ be updated whenever the registry format changes, * This _must_ be updated whenever the registry format changes,
* we currently use the core version where this change happened. * we currently use the core version where this change happened.
*/ */
#define GST_MAGIC_BINARY_VERSION_STRING ("0.10.18") #define GST_MAGIC_BINARY_VERSION_STR ("0.10.18")
/* /*
* GST_MAGIC_BINARY_VERSION_LEN: * GST_MAGIC_BINARY_VERSION_LEN: