summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac29
-rw-r--r--gst-libs/gst/Makefile.am4
-rw-r--r--gst-libs/gst/tag/Makefile.am5
-rw-r--r--gst-libs/gst/tag/tag.h62
4 files changed, 89 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 80b85208..365fcfb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,7 +245,6 @@ if test "x$HAVE_GTK_22" = "xyes"; then
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK_VERSION)
GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
- GTK_SYSCONFDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
GDK_PIXBUF_LIBDIR=`$PKG_CONFIG --variable=libdir gdk-pixbuf-2.0`
GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
AC_SUBST(GTK_BASE_DIR)
@@ -279,20 +278,31 @@ AC_ARG_WITH(gdk-pixbuf-loader-dir,
# nothing specified
GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
)
-
AS_AC_EXPAND(GDK_PIXBUF_LOADER_DIR, $GDK_PIXBUF_LOADER_DIR)
AC_SUBST(GDK_PIXBUF_LOADER_DIR)
AC_MSG_NOTICE([Putting GTK+-2 pixbuf loaders in $GDK_PIXBUF_LOADER_DIR])
-GDK_PIXBUF_CONFDIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
-AC_ARG_WITH(gdk-pixbuf-conffile,
+# allow customization of pixbuf loader configuration file
+# when nothing specified, adhere to prefix settings
+# when called without any option with this argument, autodetect
+# when called with a path, set to the given path
+AC_ARG_WITH(gdk-pixbuf-conf-dir,
AC_HELP_STRING([--with-gdk-pixbuf-conf-dir],
- [path to the gdk_pixbuf config directory]),
- [if test "x${withval}" != x ; then
- GDK_PIXBUF_CONFDIR="${withval}"
+ [directory to install the gdk_pixbuf config (none for pkg-config default)]),
+ [
+ if test "x${withval}" != xyes ; then
+ GDK_PIXBUF_CONF_DIR="${withval}"
+ else
+ GDK_PIXBUF_CONF_DIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
fi
-])
-AC_SUBST(GDK_PIXBUF_CONFDIR)
+ ],
+ # nothing specified
+ GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
+ GDK_PIXBUF_CONF_DIR=${sysconfdir}/gtk-2.0
+)
+AS_AC_EXPAND(GDK_PIXBUF_CONF_DIR, $GDK_PIXBUF_CONF_DIR)
+AC_SUBST(GDK_PIXBUF_CONF_DIR)
+AC_MSG_NOTICE([Putting GTK+-2 pixbuf loader config in $GDK_PIXBUF_CONF_DIR])
dnl ===========================================================================
dnl ============================= gst plug-ins ================================
@@ -1514,6 +1524,7 @@ gst-libs/gst/play/Makefile
gst-libs/gst/propertyprobe/Makefile
gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile
+gst-libs/gst/tag/Makefile
gst-libs/gst/tuner/Makefile
gst-libs/gst/video/Makefile
gst-libs/gst/xoverlay/Makefile
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 9cb04fea..c54b55fe 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -15,13 +15,13 @@ endif
SUBDIRS = audio colorbalance floatcast \
$(GCONF_DIR) idct media-info \
mixer navigation play propertyprobe \
- resample riff tuner video \
+ resample riff tag tuner video \
$(X_DIR)
DIST_SUBDIRS = audio colorbalance floatcast \
gconf idct media-info \
mixer navigation play propertyprobe \
- resample riff tuner video \
+ resample riff tag tuner video \
xoverlay xwindowlistener
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
new file mode 100644
index 00000000..002d6ffb
--- /dev/null
+++ b/gst-libs/gst/tag/Makefile.am
@@ -0,0 +1,5 @@
+libgsttagincludedir = \
+ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tag
+
+libgsttaginclude_HEADERS = \
+ tag.h
diff --git a/gst-libs/gst/tag/tag.h b/gst-libs/gst/tag/tag.h
new file mode 100644
index 00000000..24d3a2d3
--- /dev/null
+++ b/gst-libs/gst/tag/tag.h
@@ -0,0 +1,62 @@
+/* GStreamer
+ * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __GST_TAG_H__
+#define __GST_TAG_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+
+/* functions for vorbis comment manipulation */
+
+G_CONST_RETURN gchar * gst_tag_from_vorbis_tag (const gchar * vorbis_tag);
+G_CONST_RETURN gchar * gst_tag_to_vorbis_tag (const gchar * gst_tag);
+void gst_vorbis_tag_add (GstTagList * list,
+ const gchar * tag,
+ const gchar * value);
+
+GList * gst_tag_to_vorbis_comments (const GstTagList * list,
+ const gchar * tag);
+
+/* functions to convert GstBuffers with vorbiscomment contents to GstTagLists and back */
+GstTagList * gst_tag_list_from_vorbiscomment_buffer (const GstBuffer * buffer,
+ const guint8 * id_data,
+ const guint id_data_length,
+ gchar ** vendor_string);
+GstBuffer * gst_tag_list_to_vorbiscomment_buffer (const GstTagList * list,
+ const guint8 * id_data,
+ const guint id_data_length,
+ const gchar * vendor_string);
+
+/* functions for ID3 tag manipulation */
+
+guint gst_tag_id3_genre_count (void);
+G_CONST_RETURN gchar * gst_tag_id3_genre_get (const guint id);
+GstTagList * gst_tag_list_new_from_id3v1 (const guint8 * data);
+
+G_CONST_RETURN gchar * gst_tag_from_id3_tag (const gchar * vorbis_tag);
+G_CONST_RETURN gchar * gst_tag_to_id3_tag (const gchar * gst_tag);
+
+
+G_END_DECLS
+
+#endif /* __GST_TAG_H__ */