[gstreamermm] TagList: Corrected the constness of the internal tag strings array.
- From: José Alburquerque <jaalburqu src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gstreamermm] TagList: Corrected the constness of the internal tag strings array.
- Date: Wed, 30 Sep 2009 06:35:16 +0000 (UTC)
commit fa915c1419f1f19393fbeb98a5b4b6c4c7f9ddf1
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Wed Sep 30 02:26:42 2009 -0400
TagList: Corrected the constness of the internal tag strings array.
* gstreamer/src/taglist.ccg:
* gstreamer/src/taglist.hg (_tag_strings): Corrected constness,
completing a TODO. I hope that's correct as my constness reasoning is
a little rusty. Also added a comment as to why the array is 'extern'
in scope.
ChangeLog | 14 ++++++++++++--
configure.ac | 2 +-
gstreamer/src/taglist.ccg | 2 +-
gstreamer/src/taglist.hg | 6 +++---
4 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 64fc924..b167e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,23 @@
2009-09-30 José Alburquerque <jaalburqu svn gnome org>
+ TagList: Corrected the constness of the internal tag strings array.
+
+ * gstreamer/src/taglist.ccg:
+ * gstreamer/src/taglist.hg (_tag_strings): Corrected constness,
+ completing a TODO. I hope that's correct as my constness reasoning is
+ a little rusty. Also added a comment as to why the array is 'extern'
+ in scope.
+
+2009-09-30 José Alburquerque <jaalburqu svn gnome org>
+
Check for the existence of plug-ins in the configure stage.
* configure.ac:
* gstreamer/src/Makefile.am:
* gstreamer/src/filelist.am: Move the check for the existence of
plug-ins from the build stage to the configure stage as originally
- suggest in the clean up commit by Daniel. I had been completing that
- but could not check it in soon enough before the other commits.
+ suggested in the clean up commit by Daniel. I had been completing
+ that but could not check it in soon enough before the other commits.
2009-09-29 Daniel Elstner <daniel kitta gmail com>
diff --git a/configure.ac b/configure.ac
index 805a5d0..847b155 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ if test "x$USE_MAINTAINER_MODE" != "xno"; then
for plugin_def in $GSTREAMERMM_PLUGIN_DEFS; do
plugin_name=[`echo $plugin_def | $CUT -d'=' -f 1`]
if test -n "`$GST_INSPECT $plugin_name | $HEAD -1 | $GREP 'No such element'`"; then
- AC_MSG_ERROR([The gstreamer plug-in '$plugin_name' does not exist. \
+ AC_MSG_ERROR([The gstreamer plug-in '$plugin_name' does not exist. \
If you built gst-plugins-base from source code then you might need to \
install the appropriate -dev or -devel packages or enable experimental \
plugins before rebuilding gst-plugins-base.])
diff --git a/gstreamer/src/taglist.ccg b/gstreamer/src/taglist.ccg
index aa70cb3..a2f0c10 100644
--- a/gstreamer/src/taglist.ccg
+++ b/gstreamer/src/taglist.ccg
@@ -42,7 +42,7 @@ namespace Gst
{
// Make sure the order here is the same order as in Gst:Tag.
-const char* _tag_strings[] =
+const char* const _tag_strings[] =
{
GST_TAG_TITLE,
GST_TAG_TITLE_SORTNAME,
diff --git a/gstreamer/src/taglist.hg b/gstreamer/src/taglist.hg
index d607c04..f4c4ff2 100644
--- a/gstreamer/src/taglist.hg
+++ b/gstreamer/src/taglist.hg
@@ -301,9 +301,9 @@ TAG_GEO_LOCATION_ELEVATION
std::ostream& operator<<(std::ostream& stream, Tag tag);
#ifndef DOXYGEN_SHOULD_SKIP_THIS
-// TODO: This should have been made const.
-// Why is this external at all?
-extern const char* _tag_strings[];
+// I think that the reason this is external is that tagsetter.ccg also uses
+// it.
+extern const char* const _tag_strings[];
#endif
/** A List of tags and values used to describe media metadata.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]