From 0551a8b21218c7a81fd17242274ace66c3c056f1 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Tue, 12 Aug 2008 09:22:29 +0000 Subject: 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. --- ChangeLog | 21 ++ docs/plugins/Makefile.am | 1 - docs/plugins/gst-plugins-good-plugins-docs.sgml | 2 - docs/plugins/gst-plugins-good-plugins-sections.txt | 14 - docs/plugins/inspect/plugin-cdio.xml | 28 -- ext/Makefile.am | 8 - ext/cdio/Makefile.am | 22 -- ext/cdio/gstcdio.c | 124 ------- ext/cdio/gstcdio.h | 46 --- ext/cdio/gstcdiocddasrc.c | 386 -------------------- ext/cdio/gstcdiocddasrc.h | 52 --- po/LINGUAS | 2 +- po/POTFILES.in | 1 - po/id.po | 399 +++++++++++++++++++++ 14 files changed, 421 insertions(+), 685 deletions(-) delete mode 100644 docs/plugins/inspect/plugin-cdio.xml delete mode 100644 ext/cdio/Makefile.am delete mode 100644 ext/cdio/gstcdio.c delete mode 100644 ext/cdio/gstcdio.h delete mode 100644 ext/cdio/gstcdiocddasrc.c delete mode 100644 ext/cdio/gstcdiocddasrc.h create mode 100644 po/id.po diff --git a/ChangeLog b/ChangeLog index a33c2708..e056544c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2008-08-12 Jan Schmidt + + * 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 * docs/plugins/Makefile.am: diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index c6ba7e85..6a106a60 100644 --- a/docs/plugins/Makefile.am +++ b/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 \ diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index c72f2aa0..180c182b 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -32,7 +32,6 @@ - @@ -122,7 +121,6 @@ - diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 0e56bd5c..dd63c911 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -339,20 +339,6 @@ GST_IS_CMML_ENC_CLASS gst_cmml_enc_plugin_init -
-element-cdiocddasrc -cdiocddasrc -GstCdioCddaSrc - -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 -
-
element-deinterleave deinterleave diff --git a/docs/plugins/inspect/plugin-cdio.xml b/docs/plugins/inspect/plugin-cdio.xml deleted file mode 100644 index 18b8cc9c..00000000 --- a/docs/plugins/inspect/plugin-cdio.xml +++ /dev/null @@ -1,28 +0,0 @@ - - cdio - Read audio from audio CDs - ../../ext/cdio/.libs/libgstcdio.so - libgstcdio.so - 0.10.9 - GPL - gst-plugins-good - GStreamer Good Plug-ins source release - Unknown package origin - - - cdiocddasrc - CD audio source (CDDA) - Source/File - Read audio from CD using libcdio - Tim-Philipp Müller <tim centricular net> - - - src - source - always -
audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)44100, channels=(int)2
- - - - - \ No newline at end of file diff --git a/ext/Makefile.am b/ext/Makefile.am index 36b37716..206d5237 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -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 \ diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am deleted file mode 100644 index 01092c71..00000000 --- a/ext/cdio/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c deleted file mode 100644 index a18d350f..00000000 --- a/ext/cdio/gstcdio.c +++ /dev/null @@ -1,124 +0,0 @@ -/* GStreamer - * Copyright (C) 1999 Erik Walthinsen - * Copyright (C) 2006 Tim-Philipp Müller - * - * 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 - -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) diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h deleted file mode 100644 index ef31ed0f..00000000 --- a/ext/cdio/gstcdio.h +++ /dev/null @@ -1,46 +0,0 @@ -/* GStreamer - * Copyright (C) 1999 Erik Walthinsen - * Copyright (C) 2006 Tim-Philipp Müller - * - * 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 -#include -#include - -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__ */ - diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c deleted file mode 100644 index d4a6a54d..00000000 --- a/ext/cdio/gstcdiocddasrc.c +++ /dev/null @@ -1,386 +0,0 @@ -/* GStreamer - * Copyright (C) 2006 Tim-Philipp Müller - * - * 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. - */ - -/** - * SECTION:element-cdiocddasrc - * @short_description: Reads raw audio from an Audio CD - * @see_also: GstCdParanoiaSrc, GstCddaBaseSrc - * - * - * - * cdiocddasrc reads and extracts raw audio from Audio CDs. It can operate - * in one of two modes: - * - * - * treat each track as a separate stream, counting time from the start - * of the track to the end of the track and posting EOS at the end of - * a track, or - * - * - * treat the entire disc as one stream, counting time from the start of - * the first track to the end of the last track, posting EOS only at - * the end of the last track. - * - * - * - * - * With a recent-enough version of libcdio, the element will extract - * CD-TEXT if this is supported by the CD-drive and CD-TEXT information - * is available on the CD. The information will be posted on the bus in - * form of a tag message. - * - * - * When opened, the element will also calculate a CDDB disc ID and a - * MusicBrainz disc ID, which applications can use to query online - * databases for artist/title information. These disc IDs will also be - * posted on the bus as part of the tag messages. - * - * - * cdiocddasrc supports the GstUriHandler interface, so applications can use - * playbin with cdda://<track-number> URIs for playback (they will have - * to connect to playbin's notify::source signal and set the device on the - * cd source in the notify callback if they want to set the device property). - * Applications should use seeks in "track" format to switch between different - * tracks of the same CD (passing a new cdda:// URI to playbin involves opening - * and closing the CD device, which is much slower). - * - * Example launch line - * - * - * gst-launch cdiocddasrc track=5 device=/dev/cdrom ! audioconvert ! vorbisenc ! oggmux ! filesink location=track5.ogg - * - * This pipeline extracts track 5 of the audio CD and encodes it into an - * Ogg/Vorbis file. - * - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstcdio.h" -#include "gstcdiocddasrc.h" - -#include -#include "gst/gst-i18n-plugin.h" - -#include -#include -#include -#include - -#define DEFAULT_READ_SPEED -1 - -enum -{ - PROP_0 = 0, - PROP_READ_SPEED -}; - -static const GstElementDetails gst_cdio_cdda_src_details = -GST_ELEMENT_DETAILS ("CD audio source (CDDA)", - "Source/File", - "Read audio from CD using libcdio", - "Tim-Philipp Müller "); - -GST_BOILERPLATE (GstCdioCddaSrc, gst_cdio_cdda_src, GstCddaBaseSrc, - GST_TYPE_CDDA_BASE_SRC); - -static void gst_cdio_cdda_src_finalize (GObject * obj); -static void gst_cdio_cdda_src_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_cdio_cdda_src_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - -static gchar *gst_cdio_cdda_src_get_default_device (GstCddaBaseSrc * src); -static GstBuffer *gst_cdio_cdda_src_read_sector (GstCddaBaseSrc * src, - gint sector); -static gboolean gst_cdio_cdda_src_open (GstCddaBaseSrc * src, - const gchar * device); -static void gst_cdio_cdda_src_close (GstCddaBaseSrc * src); - -static void -gst_cdio_cdda_src_base_init (gpointer g_class) -{ - GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - - gst_element_class_set_details (element_class, &gst_cdio_cdda_src_details); -} - -static gchar * -gst_cdio_cdda_src_get_default_device (GstCddaBaseSrc * cddabasesrc) -{ - GstCdioCddaSrc *src; - gchar *default_device, *ret; - - src = GST_CDIO_CDDA_SRC (cddabasesrc); - - /* src->cdio may be NULL here */ - default_device = cdio_get_default_device (src->cdio); - - ret = g_strdup (default_device); - free (default_device); - - GST_LOG_OBJECT (src, "returning default device: %s", GST_STR_NULL (ret)); - - return ret; -} - -static gchar ** -gst_cdio_cdda_src_probe_devices (GstCddaBaseSrc * cddabasesrc) -{ - char **devices, **ret, **d; - - /* FIXME: might return the same hardware device twice, e.g. - * as /dev/cdrom and /dev/dvd - gotta do something more sophisticated */ - devices = cdio_get_devices (DRIVER_DEVICE); - - if (devices == NULL) - goto no_devices; - - if (*devices == NULL) - goto empty_devices; - - ret = g_strdupv (devices); - for (d = devices; *d != NULL; ++d) { - GST_DEBUG_OBJECT (cddabasesrc, "device: %s", GST_STR_NULL (*d)); - free (*d); - } - free (devices); - - return ret; - - /* ERRORS */ -no_devices: - { - GST_DEBUG_OBJECT (cddabasesrc, "no devices found"); - return NULL; - } -empty_devices: - { - GST_DEBUG_OBJECT (cddabasesrc, "empty device list found"); - free (devices); - return NULL; - } -} - -static GstBuffer * -gst_cdio_cdda_src_read_sector (GstCddaBaseSrc * cddabasesrc, gint sector) -{ - GstCdioCddaSrc *src; - GstBuffer *buf; - - src = GST_CDIO_CDDA_SRC (cddabasesrc); - - /* can't use pad_alloc because we can't return the GstFlowReturn */ - buf = gst_buffer_new_and_alloc (CDIO_CD_FRAMESIZE_RAW); - - if (cdio_read_audio_sector (src->cdio, GST_BUFFER_DATA (buf), sector) != 0) - goto read_failed; - - return buf; - - /* ERRORS */ -read_failed: - { - GST_WARNING_OBJECT (src, "read at sector %d failed!", sector); - GST_ELEMENT_ERROR (src, RESOURCE, READ, - (_("Could not read from CD.")), - ("cdio_read_audio_sector at %d failed: %s", sector, - g_strerror (errno))); - gst_buffer_unref (buf); - return NULL; - } -} - -static gboolean -notcdio_track_is_audio_track (const CdIo * p_cdio, track_t i_track) -{ - return (cdio_get_track_format (p_cdio, i_track) == TRACK_FORMAT_AUDIO); -} - -static gboolean -gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device) -{ - GstCdioCddaSrc *src; - discmode_t discmode; - gint first_track, num_tracks, i; - - src = GST_CDIO_CDDA_SRC (cddabasesrc); - - g_assert (device != NULL); - g_assert (src->cdio == NULL); - - GST_LOG_OBJECT (src, "trying to open device %s", device); - - if (!(src->cdio = cdio_open (device, DRIVER_UNKNOWN))) - goto open_failed; - - discmode = cdio_get_discmode (src->cdio); - GST_LOG_OBJECT (src, "discmode: %d", (gint) discmode); - - if (discmode != CDIO_DISC_MODE_CD_DA && discmode != CDIO_DISC_MODE_CD_MIXED) - goto not_audio; - - first_track = cdio_get_first_track_num (src->cdio); - num_tracks = cdio_get_num_tracks (src->cdio); - - if (num_tracks <= 0 || first_track < 0) - return TRUE; /* base class will generate 'has no tracks' error */ - - if (src->read_speed != -1) - cdio_set_speed (src->cdio, src->read_speed); - - gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, - cddabasesrc->tags); - - GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); - - for (i = 0; i < num_tracks; ++i) { - GstCddaBaseSrcTrack track = { 0, }; - gint len_sectors; - - len_sectors = cdio_get_track_sec_count (src->cdio, i + first_track); - - track.num = i + first_track; - track.is_audio = notcdio_track_is_audio_track (src->cdio, i + first_track); - - /* Note: LSN/LBA confusion all around us; in any case, this does - * the right thing here (for cddb id calculations etc. as well) */ - track.start = cdio_get_track_lsn (src->cdio, i + first_track); - track.end = track.start + len_sectors - 1; /* -1? */ - track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, - i + first_track); - - gst_cdda_base_src_add_track (GST_CDDA_BASE_SRC (src), &track); - } - return TRUE; - - /* ERRORS */ -open_failed: - { - GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, - (_("Could not open CD device for reading.")), - ("cdio_open() failed: %s", g_strerror (errno))); - return FALSE; - } -not_audio: - { - GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, - (_("Disc is not an Audio CD.")), ("discmode: %d", (gint) discmode)); - - cdio_destroy (src->cdio); - src->cdio = NULL; - return FALSE; - } -} - -static void -gst_cdio_cdda_src_close (GstCddaBaseSrc * cddabasesrc) -{ - GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (cddabasesrc); - - if (src->cdio) { - cdio_destroy (src->cdio); - src->cdio = NULL; - } -} - -static void -gst_cdio_cdda_src_init (GstCdioCddaSrc * src, GstCdioCddaSrcClass * klass) -{ - src->read_speed = DEFAULT_READ_SPEED; /* don't need atomic access here */ - src->cdio = NULL; -} - -static void -gst_cdio_cdda_src_finalize (GObject * obj) -{ - GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (obj); - - if (src->cdio) { - cdio_destroy (src->cdio); - src->cdio = NULL; - } - - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - -static void -gst_cdio_cdda_src_class_init (GstCdioCddaSrcClass * klass) -{ - GstCddaBaseSrcClass *cddabasesrc_class = GST_CDDA_BASE_SRC_CLASS (klass); - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->set_property = gst_cdio_cdda_src_set_property; - gobject_class->get_property = gst_cdio_cdda_src_get_property; - gobject_class->finalize = gst_cdio_cdda_src_finalize; - - cddabasesrc_class->open = gst_cdio_cdda_src_open; - cddabasesrc_class->close = gst_cdio_cdda_src_close; - cddabasesrc_class->read_sector = gst_cdio_cdda_src_read_sector; - cddabasesrc_class->probe_devices = gst_cdio_cdda_src_probe_devices; - cddabasesrc_class->get_default_device = gst_cdio_cdda_src_get_default_device; - - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_READ_SPEED, - g_param_spec_int ("read-speed", "Read speed", - "Read from device at the specified speed (-1 = default)", -1, 100, - DEFAULT_READ_SPEED, G_PARAM_READWRITE)); -} - -static void -gst_cdio_cdda_src_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (object); - - switch (prop_id) { - case PROP_READ_SPEED:{ - gint speed; - - speed = g_value_get_int (value); - g_atomic_int_set (&src->read_speed, speed); - break; - } - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_cdio_cdda_src_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) -{ - GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (object); - - switch (prop_id) { - case PROP_READ_SPEED:{ - gint speed; - - speed = g_atomic_int_get (&src->read_speed); - g_value_set_int (value, speed); - break; - } - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} diff --git a/ext/cdio/gstcdiocddasrc.h b/ext/cdio/gstcdiocddasrc.h deleted file mode 100644 index 4aa9f97b..00000000 --- a/ext/cdio/gstcdiocddasrc.h +++ /dev/null @@ -1,52 +0,0 @@ -/* GStreamer - * Copyright (C) 2006 Tim-Philipp Müller - * - * 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 -#include - -#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__ */ - diff --git a/po/LINGUAS b/po/LINGUAS index 2d17c035..26d2d9e5 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 2fe2c95d..95422342 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,3 @@ -ext/cdio/gstcdiocddasrc.c ext/esd/esdsink.c ext/flac/gstflacdec.c ext/jpeg/gstjpegdec.c diff --git a/po/id.po b/po/id.po new file mode 100644 index 00000000..70253a81 --- /dev/null +++ b/po/id.po @@ -0,0 +1,399 @@ +# Indonesian translations for gst-plugins-good package. +# This file is put in the public domain. +# Andhika Padmawan , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gst-plugins-good 0.10.8.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-08-11 23:36+0100\n" +"PO-Revision-Date: 2008-08-02 23:58+0700\n" +"Last-Translator: Andhika Padmawan \n" +"Language-Team: Indonesian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ext/esd/esdsink.c:262 ext/esd/esdsink.c:367 +msgid "Could not establish connection to sound server" +msgstr "Tak dapat membangun koneksi ke server suara" + +#: ext/esd/esdsink.c:269 +msgid "Failed to query sound server capabilities" +msgstr "Gagal untuk kueri kemampuan server suara" + +#: ext/flac/gstflacdec.c:1254 ext/libpng/gstpngdec.c:329 +#: ext/libpng/gstpngdec.c:517 ext/wavpack/gstwavpackparse.c:1167 +#: gst/avi/gstavidemux.c:4114 gst/avi/gstavidemux.c:4122 +msgid "Internal data stream error." +msgstr "Galat arus data internal." + +#: ext/jpeg/gstjpegdec.c:1041 +msgid "Failed to decode JPEG image" +msgstr "Gagal untuk mengawasandi citra JPEG" + +#: ext/shout2/gstshout2.c:558 +msgid "Could not connect to server" +msgstr "Tak dapat menghubungi server" + +#: gst/avi/gstavimux.c:1605 +msgid "No or invalid input audio, AVI stream will be corrupt." +msgstr "Masukan audio tidak ada atau tidak sah, arus AVI akan rusak." + +#: gst/qtdemux/qtdemux.c:1113 +msgid "This file is incomplete and cannot be played." +msgstr "Berkas ini tidak lengkap dan tak dapat diputar." + +#: gst/qtdemux/qtdemux.c:1935 +msgid "This file contains no playable streams." +msgstr "Berkas ini tidak berisi arus yang dapat diputar." + +#: gst/qtdemux/qtdemux.c:2780 +msgid "The video in this file might not play correctly." +msgstr "Video di berkas ini mungkin tak dapat diputar dengan benar." + +#: gst/qtdemux/qtdemux.c:2855 +#, c-format +msgid "This file contains too many streams. Only playing first %d" +msgstr "Berkas ini berisi terlalu banyak arus. Hanya memutar %d pertama" + +#: gst/qtdemux/qtdemux.c:3117 gst/qtdemux/qtdemux.c:3714 +msgid "This file is corrupt and cannot be played." +msgstr "Berkas ini rusak dan tak dapat diputar." + +#: gst/wavparse/gstwavparse.c:1777 +msgid "Internal data flow error." +msgstr "Galat aliran data internal." + +#: sys/oss/gstossmixertrack.c:98 sys/sunaudio/gstsunaudiomixertrack.c:65 +msgid "Volume" +msgstr "Volume" + +#: sys/oss/gstossmixertrack.c:99 +msgid "Bass" +msgstr "Bas" + +#: sys/oss/gstossmixertrack.c:100 +msgid "Treble" +msgstr "Treble" + +#: sys/oss/gstossmixertrack.c:101 +msgid "Synth" +msgstr "Synth" + +#: sys/oss/gstossmixertrack.c:102 +msgid "PCM" +msgstr "PCM" + +#: sys/oss/gstossmixertrack.c:103 +msgid "Speaker" +msgstr "Pengeras Suara" + +#: sys/oss/gstossmixertrack.c:104 +msgid "Line-in" +msgstr "Jalur masuk" + +#: sys/oss/gstossmixertrack.c:105 +msgid "Microphone" +msgstr "Mikrofon" + +#: sys/oss/gstossmixertrack.c:106 +msgid "CD" +msgstr "CD" + +#: sys/oss/gstossmixertrack.c:107 +msgid "Mixer" +msgstr "Mixer" + +#: sys/oss/gstossmixertrack.c:108 +msgid "PCM-2" +msgstr "PCM-2" + +#: sys/oss/gstossmixertrack.c:109 +msgid "Record" +msgstr "Rekam" + +#: sys/oss/gstossmixertrack.c:110 +msgid "In-gain" +msgstr "Masukan-gain" + +#: sys/oss/gstossmixertrack.c:111 +msgid "Out-gain" +msgstr "Keluaran-gain" + +#: sys/oss/gstossmixertrack.c:112 +msgid "Line-1" +msgstr "Jalur-1" + +#: sys/oss/gstossmixertrack.c:113 +msgid "Line-2" +msgstr "Jalur-2" + +#: sys/oss/gstossmixertrack.c:114 +msgid "Line-3" +msgstr "Jalur-3" + +#: sys/oss/gstossmixertrack.c:115 +msgid "Digital-1" +msgstr "Digital-1" + +#: sys/oss/gstossmixertrack.c:116 +msgid "Digital-2" +msgstr "Digital-2" + +#: sys/oss/gstossmixertrack.c:117 +msgid "Digital-3" +msgstr "Digital-3" + +#: sys/oss/gstossmixertrack.c:118 +msgid "Phone-in" +msgstr "Telepon-masuk" + +#: sys/oss/gstossmixertrack.c:119 +msgid "Phone-out" +msgstr "Telepon-keluar" + +#: sys/oss/gstossmixertrack.c:120 +msgid "Video" +msgstr "Video" + +#: sys/oss/gstossmixertrack.c:121 +msgid "Radio" +msgstr "Radio" + +#: sys/oss/gstossmixertrack.c:122 sys/sunaudio/gstsunaudiomixertrack.c:65 +msgid "Monitor" +msgstr "Monitor" + +#: sys/sunaudio/gstsunaudiomixertrack.c:65 +msgid "Gain" +msgstr "Gain" + +#: sys/v4l2/gstv4l2src.c:1226 sys/v4l2/gstv4l2src.c:1275 +#, c-format +msgid "Error read()ing %d bytes on device '%s'." +msgstr "Galat membaca %d bita di divais '%s'." + +#: sys/v4l2/gstv4l2src.c:1257 +#, c-format +msgid "Got unexpected frame size of %u instead of %u." +msgstr "Mendapatkan ukuran bingkai %u ketimbang %u yang tak diharapkan." + +#: sys/v4l2/v4l2_calls.c:93 +#, c-format +msgid "" +"Error getting capabilities for device '%s': It isn't a v4l2 driver. Check if " +"it is a v4l1 driver." +msgstr "" +"Galat mendapatkan kemampuan untuk divais '%s': Itu bukan diver v4l2. Cek " +"apakah itu merupakan driver v4l1." + +#: sys/v4l2/v4l2_calls.c:132 +#, c-format +msgid "Failed to query attributes of input %d in device %s" +msgstr "Gagal kueri atribut masukan %d di divais %s" + +#: sys/v4l2/v4l2_calls.c:162 +#, c-format +msgid "Failed to get setting of tuner %d on device '%s'." +msgstr "Gagal mendapatkan pengaturan tuner %d di divais '%s'." + +#: sys/v4l2/v4l2_calls.c:205 +#, c-format +msgid "Failed to query norm on device '%s'." +msgstr "Gagal kueri standar di divais '%s'." + +#: sys/v4l2/v4l2_calls.c:254 +#, c-format +msgid "Failed getting controls attributes on device '%s.'" +msgstr "Gagal mendapatkan kendali atribut di divais '%s.'" + +#: sys/v4l2/v4l2_calls.c:331 +#, c-format +msgid "Failed getting controls attributes on device '%s'." +msgstr "Gagal mendapatkan kendali atribut di divais '%s'." + +#: sys/v4l2/v4l2_calls.c:449 +#, c-format +msgid "Cannot identify device '%s'." +msgstr "Tak dapat mengidentifikasi divais '%s'." + +#: sys/v4l2/v4l2_calls.c:456 +#, c-format +msgid "This isn't a device '%s'." +msgstr "Ini bukan divais '%s'." + +#: sys/v4l2/v4l2_calls.c:463 +#, c-format +msgid "Could not open device '%s' for reading and writing." +msgstr "Tak dapat membuka divais '%s' untuk dibaca dan ditulis." + +#: sys/v4l2/v4l2_calls.c:470 +#, c-format +msgid "Device '%s' is not a capture device." +msgstr "Divais '%s' bukan divais penangkap." + +#: sys/v4l2/v4l2_calls.c:565 +#, c-format +msgid "Failed to set norm for device '%s'." +msgstr "Gagal mengatur standar untuk divais '%s'." + +#: sys/v4l2/v4l2_calls.c:603 +#, c-format +msgid "Failed to get current tuner frequency for device '%s'." +msgstr "Gagal untuk mendapatkan frekuensi tuner terkini untuk divais '%s'." + +#: sys/v4l2/v4l2_calls.c:645 +#, c-format +msgid "Failed to set current tuner frequency for device '%s' to %lu Hz." +msgstr "Gagal mengatur frekuensi tuner terkini untuk divais '%s' ke %lu Hz." + +#: sys/v4l2/v4l2_calls.c:679 +#, c-format +msgid "Failed to get signal strength for device '%s'." +msgstr "Gagal mendapatkan kekuatan sinyal untuk divais '%s'." + +#: sys/v4l2/v4l2_calls.c:715 +#, c-format +msgid "Failed to get value for control %d on device '%s'." +msgstr "Gagal mendapatkan nilai untuk kendali %d di divais '%s'." + +#: sys/v4l2/v4l2_calls.c:750 +#, c-format +msgid "Failed to set value %d for control %d on device '%s'." +msgstr "Gagal mengatur nilai %d untuk kendali %d di divais '%s'." + +#: sys/v4l2/v4l2_calls.c:779 +#, c-format +msgid "Failed to get current input on device '%s'. May be it is a radio device" +msgstr "" +"Gagal mendapatkan masukan terkini di divais '%s'. Mungkin itu divais radio" + +#: sys/v4l2/v4l2_calls.c:801 +#, c-format +msgid "Failed to set input %d on device %s." +msgstr "Gagal mengatur masukan %d di divais %s." + +#: sys/v4l2/v4l2src_calls.c:364 +#, c-format +msgid "Could not enqueue buffers in device '%s'." +msgstr "Tak dapat mengantrekan penyangga di divais '%s'." + +#: sys/v4l2/v4l2src_calls.c:543 +#, c-format +msgid "Failed to enumerate possible video formats device '%s' can work with" +msgstr "" +"Gagal menyebutkan kemungkinan format video yang dapat bekerja dengan divais " +"'%s'." + +#: sys/v4l2/v4l2src_calls.c:1089 sys/v4l2/v4l2src_calls.c:1106 +#: sys/v4l2/v4l2src_calls.c:1115 +#, c-format +msgid "Failed trying to get video frames from device '%s'." +msgstr "Gagal mencoba untuk mendapatkan bingkai video dari divais '%s'." + +#: sys/v4l2/v4l2src_calls.c:1091 +#, c-format +msgid "" +"The buffer type is not supported, or the index is out of bounds, or no " +"buffers have been allocated yet, or the userptr or length are invalid. " +"device %s" +msgstr "" +"Tipe penyangga tidak didukung, atau indeks di luar batas, atau tak ada " +"penyangga yang telah dialokasikan, atau userptr atau panjang tidak sah. " +"divais %s" + +#: sys/v4l2/v4l2src_calls.c:1100 +#, c-format +msgid "Failed trying to get video frames from device '%s'. Not enough memory." +msgstr "" +"Gagal mencoba untuk mendapatkan bingkai video dari divais '%s'. Tak cukup " +"memori." + +#: sys/v4l2/v4l2src_calls.c:1100 +#, c-format +msgid "insufficient memory to enqueue a user pointer buffer. device %s." +msgstr "" +"kekurangan memori untuk mengantrekan penyangga penunjuk pengguna. divais %s." + +#: sys/v4l2/v4l2src_calls.c:1108 +#, c-format +msgid "Failed after %d tries. device %s. system error: %s" +msgstr "Gagal setelah %d percobaan. divais %s. galat sistem: %s" + +#: sys/v4l2/v4l2src_calls.c:1117 +#, c-format +msgid "No free buffers found in the pool at index %d." +msgstr "Tak ada penyangga bebas ditemukan di lubuk pada indeks %d." + +#: sys/v4l2/v4l2src_calls.c:1208 +#, c-format +msgid "Could not get parameters on device '%s'" +msgstr "Tak bisa mendapatkan parameter di divais '%s'" + +#: sys/v4l2/v4l2src_calls.c:1236 +msgid "Video input device did not accept new frame rate setting." +msgstr "Divais masukan video tak menerima pengaturan rasio bingkai baru." + +#: sys/v4l2/v4l2src_calls.c:1253 +#, c-format +msgid "Device '%s' does not support video capture" +msgstr "Divais '%s' tak mendukung penangkap video" + +#: sys/v4l2/v4l2src_calls.c:1261 sys/v4l2/v4l2src_calls.c:1270 +#, c-format +msgid "Device '%s' cannot capture at %dx%d" +msgstr "Divais '%s' tak dapat menangkap di %dx%d" + +#: sys/v4l2/v4l2src_calls.c:1279 +#, c-format +msgid "Device '%s' cannot capture in the specified format" +msgstr "Divais '%s' tak dapat menangkap dalam format yang ditentukan" + +#: sys/v4l2/v4l2src_calls.c:1357 +#, c-format +msgid "Could not get buffers from device '%s'." +msgstr "Tak bisa mendapatkan penyangga dari divais '%s'." + +#: sys/v4l2/v4l2src_calls.c:1366 +#, c-format +msgid "Could not get enough buffers from device '%s'." +msgstr "Tak bisa mendapatkan penyangga yang cukup dari divais '%s'." + +#: sys/v4l2/v4l2src_calls.c:1375 +#, c-format +msgid "Could not map buffers from device '%s'" +msgstr "Tak dapat memetakan penyangga dari divais '%s'" + +#: sys/v4l2/v4l2src_calls.c:1383 +#, c-format +msgid "The driver of device '%s' does not support any known capture method." +msgstr "" +"Driver dari divais '%s' tak mendukung metode penangkap apapun yang dikenal." + +#: sys/v4l2/v4l2src_calls.c:1428 +#, c-format +msgid "Error starting streaming capture from device '%s'." +msgstr "Galat memulai penangkapan arus dari divais '%s'." + +#: sys/v4l2/v4l2src_calls.c:1472 +#, c-format +msgid "Error stopping streaming capture from device '%s'." +msgstr "Galat menghentikan penangkapan arus dari divais '%s'." + +#: sys/ximage/gstximagesrc.c:711 +msgid "Changing resolution at runtime is not yet supported." +msgstr "Mengubah resolusi saat waktu berjalan belum didukung." + +#: sys/ximage/gstximagesrc.c:725 +msgid "Cannot operate without a clock" +msgstr "Tak dapat beroperasi tanpa jam" + +#~ msgid "Could not read from CD." +#~ msgstr "Tak dapat membaca dari CD." + +#~ msgid "Could not open CD device for reading." +#~ msgstr "Tak dapat membuka divais CD untuk dibaca." + +#~ msgid "Disc is not an Audio CD." +#~ msgstr "Cakram bukan CD Audio." -- cgit