Commit 0551a8b2 authored by Jan Schmidt's avatar Jan Schmidt

Pull changes from 0.10.9.2 pre-release branch moving the libcdio

Original commit message from CVS:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* docs/plugins/inspect/plugin-cdio.xml:
* ext/Makefile.am:
* ext/cdio/Makefile.am:
* ext/cdio/gstcdio.c:
* ext/cdio/gstcdio.h:
* ext/cdio/gstcdiocddasrc.c:
* ext/cdio/gstcdiocddasrc.h:
Pull changes from 0.10.9.2 pre-release branch moving the libcdio
CDDA source to -ugly.
* po/LINGUAS:
* po/POTFILES.in:
* po/id.po:
Pull in new translation from 0.10.9.2 release branch.
parent 925d6f34
2008-08-12 Jan Schmidt <jan.schmidt@sun.com>
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* docs/plugins/inspect/plugin-cdio.xml:
* ext/Makefile.am:
* ext/cdio/Makefile.am:
* ext/cdio/gstcdio.c:
* ext/cdio/gstcdio.h:
* ext/cdio/gstcdiocddasrc.c:
* ext/cdio/gstcdiocddasrc.h:
Pull changes from 0.10.9.2 pre-release branch moving the libcdio
CDDA source to -ugly.
* po/LINGUAS:
* po/POTFILES.in:
* po/id.po:
Pull in new translation from 0.10.9.2 release branch.
2008-08-11 Edward Hervey <edward.hervey@collabora.co.uk>
* docs/plugins/Makefile.am:
......
......@@ -79,7 +79,6 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/annodex/gstcmmldec.h \
$(top_srcdir)/ext/annodex/gstcmmlenc.h \
$(top_srcdir)/ext/cairo/gsttimeoverlay.h \
$(top_srcdir)/ext/cdio/gstcdiocddasrc.h \
$(top_srcdir)/ext/dv/gstdvdec.h \
$(top_srcdir)/ext/dv/gstdvdemux.h \
$(top_srcdir)/ext/esd/esdsink.h \
......
......@@ -32,7 +32,6 @@
<xi:include href="xml/element-avisubtitle.xml" />
<xi:include href="xml/element-cacasink.xml" />
<xi:include href="xml/element-cairotimeoverlay.xml" />
<xi:include href="xml/element-cdiocddasrc.xml" />
<xi:include href="xml/element-cmmldec.xml" />
<xi:include href="xml/element-cmmlenc.xml" />
<xi:include href="xml/element-deinterleave.xml" />
......@@ -122,7 +121,6 @@
<xi:include href="xml/plugin-avi.xml" />
<xi:include href="xml/plugin-cacasink.xml" />
<xi:include href="xml/plugin-cairo.xml" />
<xi:include href="xml/plugin-cdio.xml" />
<xi:include href="xml/plugin-cutter.xml" />
<xi:include href="xml/plugin-debug.xml" />
<xi:include href="xml/plugin-directdraw.xml" />
......
......@@ -339,20 +339,6 @@ GST_IS_CMML_ENC_CLASS
gst_cmml_enc_plugin_init
</SECTION>
<SECTION>
<FILE>element-cdiocddasrc</FILE>
<TITLE>cdiocddasrc</TITLE>
GstCdioCddaSrc
<SUBSECTION Standard>
GstCdioCddaSrcClass
GST_TYPE_CDIO_CDDA_SRC
GST_CDIO_CDDA_SRC
GST_CDIO_CDDA_SRC_CLASS
GST_IS_CDIO_CDDA_SRC
GST_IS_CDIO_CDDA_SRC_CLASS
gst_cdio_cdda_src_get_type
</SECTION>
<SECTION>
<FILE>element-deinterleave</FILE>
<TITLE>deinterleave</TITLE>
......
<plugin>
<name>cdio</name>
<description>Read audio from audio CDs</description>
<filename>../../ext/cdio/.libs/libgstcdio.so</filename>
<basename>libgstcdio.so</basename>
<version>0.10.9</version>
<license>GPL</license>
<source>gst-plugins-good</source>
<package>GStreamer Good Plug-ins source release</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>cdiocddasrc</name>
<longname>CD audio source (CDDA)</longname>
<class>Source/File</class>
<description>Read audio from CD using libcdio</description>
<author>Tim-Philipp Müller &lt;tim centricular net&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)44100, channels=(int)2</details>
</caps>
</pads>
</element>
</elements>
</plugin>
\ No newline at end of file
......@@ -16,12 +16,6 @@ else
CAIRO_DIR =
endif
if USE_CDIO
CDIO_DIR = cdio
else
CDIO_DIR =
endif
if USE_ESD
ESD_DIR = esd
else
......@@ -135,7 +129,6 @@ SUBDIRS = \
$(AALIB_DIR) \
$(ANNODEX_DIR) \
$(CAIRO_DIR) \
$(CDIO_DIR) \
$(DV1394_DIR) \
$(ESD_DIR) \
$(FLAC_DIR) \
......@@ -159,7 +152,6 @@ DIST_SUBDIRS = \
aalib \
annodex \
cairo \
cdio \
dv \
esd \
flac \
......
plugin_LTLIBRARIES = libgstcdio.la
libgstcdio_la_SOURCES = \
gstcdio.c \
gstcdiocddasrc.c
libgstcdio_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(CDIO_CFLAGS)
libgstcdio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstcdda-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) \
$(CDIO_LIBS)
libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
gstcdio.h \
gstcdiocddasrc.h
/* GStreamer
* Copyright (C) 1999 Erik Walthinsen <omega@cse.ogi.edu>
* Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
*
* 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.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstcdio.h"
#include "gstcdiocddasrc.h"
#include <cdio/logging.h>
GST_DEBUG_CATEGORY (gst_cdio_debug);
void
gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
{
const gchar *txt;
txt = cdtext_get_const (field, cdtext);
if (txt == NULL || *txt == '\0') {
GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
return;
}
/* FIXME: beautify strings (they might be all uppercase for example)? */
/* FIXME: what encoding are these strings in? Let's hope ASCII or UTF-8 */
if (!g_utf8_validate (txt, -1, NULL)) {
GST_WARNING_OBJECT (src, "CD-TEXT string is not UTF-8! (%s)", gst_tag);
return;
}
if (*p_tags == NULL)
*p_tags = gst_tag_list_new ();
gst_tag_list_add (*p_tags, GST_TAG_MERGE_REPLACE, gst_tag, txt, NULL);
GST_DEBUG_OBJECT (src, "CD-TEXT: %s = %s", gst_tag, txt);
}
GstTagList *
gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
{
GstTagList *tags = NULL;
cdtext_t *t;
t = cdio_get_cdtext (cdio, track);
if (t == NULL) {
GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
return NULL;
}
gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
return tags;
}
void
gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
{
cdtext_t *t;
t = cdio_get_cdtext (cdio, 0);
if (t == NULL) {
GST_DEBUG_OBJECT (src, "no CD-TEXT for album %u");
return;
}
/* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
}
static void
gst_cdio_log_handler (cdio_log_level_t level, const char *msg)
{
const gchar *level_str[] = { "DEBUG", "INFO", "WARN", "ERROR", "ASSERT" };
const gchar *s;
s = level_str[CLAMP (level, 1, G_N_ELEMENTS (level_str)) - 1];
GST_DEBUG ("CDIO-%s: %s", s, GST_STR_NULL (msg));
}
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "cdiocddasrc", GST_RANK_SECONDARY - 1,
GST_TYPE_CDIO_CDDA_SRC))
return FALSE;
cdio_log_set_handler (gst_cdio_log_handler);
GST_DEBUG_CATEGORY_INIT (gst_cdio_debug, "cdio", 0, "libcdio elements");
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"cdio",
"Read audio from audio CDs",
plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
/* GStreamer
* Copyright (C) 1999 Erik Walthinsen <omega@cse.ogi.edu>
* Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
*
* 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_CDIO_H__
#define __GST_CDIO_H__
#include <gst/gst.h>
#include <cdio/cdio.h>
#include <cdio/cdtext.h>
GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
#define GST_CAT_DEFAULT gst_cdio_debug
void gst_cdio_add_cdtext_field (GstObject * src,
cdtext_t * cdtext,
cdtext_field_t field,
const gchar * gst_tag,
GstTagList ** p_tags);
GstTagList * gst_cdio_get_cdtext (GstObject * src,
CdIo * cdio,
track_t track);
void gst_cdio_add_cdtext_album_tags (GstObject * src,
CdIo * cdio,
GstTagList * tags);
#endif /* __GST_CDIO_H__ */
This diff is collapsed.
/* GStreamer
* Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
*
* 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_CDIO_CDDA_SRC_H__
#define __GST_CDIO_CDDA_SRC_H__
#include <gst/cdda/gstcddabasesrc.h>
#include <cdio/cdio.h>
#define GST_TYPE_CDIO_CDDA_SRC (gst_cdio_cdda_src_get_type ())
#define GST_CDIO_CDDA_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_CDIO_CDDA_SRC, GstCdioCddaSrc))
#define GST_CDIO_CDDA_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CDIO_CDDA_SRC, GstCdioCddaSrcClass))
#define GST_IS_CDIO_CDDA_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_CDIO_CDDA_SRC))
#define GST_IS_CDIO_CDDA_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_CDIO_CDDA_SRC))
typedef struct _GstCdioCddaSrc GstCdioCddaSrc;
typedef struct _GstCdioCddaSrcClass GstCdioCddaSrcClass;
struct _GstCdioCddaSrc
{
GstCddaBaseSrc cddabasesrc;
gint read_speed; /* ATOMIC */
CdIo *cdio; /* NULL if not open */
};
struct _GstCdioCddaSrcClass
{
GstCddaBaseSrcClass cddabasesrc_class;
};
GType gst_cdio_cdda_src_get_type ();
#endif /* __GST_CDIO_CDDA_SRC_H__ */
af az bg cs da en_GB es eu fi fr hu it ja lt nb nl or pl pt_BR ru sk sq sr sv uk vi zh_CN zh_HK zh_TW
af az bg cs da en_GB es eu fi fr hu id it ja lt nb nl or pl pt_BR ru sk sq sr sv uk vi zh_CN zh_HK zh_TW
ext/cdio/gstcdiocddasrc.c
ext/esd/esdsink.c
ext/flac/gstflacdec.c
ext/jpeg/gstjpegdec.c
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment