Commit 5827f80d authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

gconf/: Remove dysfunctional directory (this stuff is in -good).

Original commit message from CVS:
* gconf/.cvsignore:
* gconf/Makefile.am:
* gconf/gstreamer.schemas.in:
Remove dysfunctional directory (this stuff is in -good).
* ext/sndfile/gstsf.c: (plugin_init):
* sys/dvb/gstdvbsrc.c: (plugin_init):
Add i18n bindtextdomain stuff.
* gst/nuvdemux/gstnuvdemux.c: (gst_nuv_demux_class_init),
(plugin_init):
Post an error message when returning GST_FLOW_ERROR; minor cleanups.
* po/POTFILES.in:
Add more source files with translatable strings (fixes #450605).
parent 825b31e2
2007-06-25 Tim-Philipp Müller <tim at centricular dot net>
* gconf/.cvsignore:
* gconf/Makefile.am:
* gconf/gstreamer.schemas.in:
Remove dysfunctional directory (this stuff is in -good).
* ext/sndfile/gstsf.c: (plugin_init):
* sys/dvb/gstdvbsrc.c: (plugin_init):
Add i18n bindtextdomain stuff.
* gst/nuvdemux/gstnuvdemux.c: (gst_nuv_demux_class_init),
(plugin_init):
Post an error message when returning GST_FLOW_ERROR; minor cleanups.
* po/POTFILES.in:
Add more source files with translatable strings (fixes #450605).
2007-06-23 Thomas Vander Stichele <thomas at apestaart dot org>
Contributed by: Wenzheng Hu <db_lobster@163.com>
......
common @ e6a9941c
Subproject commit 14c5a68981278f642e4ca5fd5ca08554fc78b348
Subproject commit e6a9941c662289c0743e5d8f4150458a664226f2
......@@ -22,6 +22,7 @@
#include "config.h"
#endif
#include <gst/gst-i18n-plugin.h>
#include <string.h>
#include "gstsf.h"
......@@ -104,6 +105,12 @@ gst_sf_minor_types_get_type (void)
static gboolean
plugin_init (GstPlugin * plugin)
{
#ifdef ENABLE_NLS
GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
#endif /* ENABLE_NLS */
if (!gst_element_register (plugin, "sfsink", GST_RANK_NONE,
gst_sf_sink_get_type ()))
return FALSE;
......
gstreamer-*.schemas
gstreamer.schemas
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = gstreamer-@GST_MAJORMINOR@.schemas
gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas
cp gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas
install-data-local:
@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
--makefile-install-rule $(srcdir)/$(schema_DATA) || \
(echo ;\
echo "*****************************************************"; \
echo "Installation of schemas failed, install them manually"; \
echo "*****************************************************";)
@true
CLEANFILES = $(schema_DATA)
EXTRA_DIST = $(schema_DATA)
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</key>
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>@DEFAULT_AUDIOSINK@</default>
<locale name="C">
<short>default GStreamer audiosink</short>
<long>GStreamer can play audio using any number of output elements. Some possible choices are osssink, esdsink and alsasink. The audiosink can be a partial pipeline instead of just one element.</long>
</locale>
</schema>
<schema>
<key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosink</key>
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>@DEFAULT_VIDEOSINK@</default>
<locale name="C">
<short>default GStreamer videosink</short>
<long>GStreamer can play video using any number of output elements. Some possible choices are xvimagesink, ximagesink, sdlvideosink and aasink. The videosink can be a partial pipeline instead of just one element.</long>
</locale>
</schema>
<schema>
<key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</key>
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>@DEFAULT_AUDIOSRC@</default>
<locale name="C">
<short>default GStreamer audio source</short>
<long>GStreamer can record audio using any number of input elements. Some possible choices are osssrc, esdsrc and alsasrc. The audio source can be a partial pipeline instead of just one element.</long>
</locale>
</schema>
<schema>
<key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</key>
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>@DEFAULT_VIDEOSRC@</default>
<locale name="C">
<short>default GStreamer video source</short>
<long>GStreamer can record video from any number of input elements. Some possible choices are v4lsrc and videotestsrc. The video source can be a partial pipeline instead of just one element.</long>
</locale>
</schema>
<schema>
<key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/visualization</key>
<applyto>/system/gstreamer/@GST_MAJORMINOR@/default/visualization</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>@DEFAULT_VISUALIZER@</default>
<locale name="C">
<short>default GStreamer visualization plugin</short>
<long>GStreamer can put visualization plugins in a pipeline to transform audio stream in video frames. Default is goom but more visualization plugins will be ported soon. The visualization plugin can be a partial pipeline instead of just one element.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
/* GStreamer
/* GStreamer NUV demuxer
* Copyright (C) <2006> Renato Araujo Oliveira Filho <renato.filho@indt.org.br>
* Rosfran Borges <rosfran.borges@indt.org.br>
*
......@@ -151,13 +151,10 @@ gst_nuv_demux_class_init (GstNuvDemuxClass * klass)
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
GObjectClass *gobject_class = (GObjectClass *) klass;
GST_DEBUG_CATEGORY_INIT (nuvdemux_debug, "nuvdemux",
0, "Demuxer for NUV streams");
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = gst_nuv_demux_finalize;
gstelement_class->change_state = gst_nuv_demux_change_state;
gstelement_class->change_state =
GST_DEBUG_FUNCPTR (gst_nuv_demux_change_state);
}
static void
......@@ -203,7 +200,7 @@ gst_nuv_demux_finalize (GObject * object)
}
/*****************************************************************************
* Utils fucntions
* Utils functions
*****************************************************************************/
static gboolean
......@@ -642,9 +639,9 @@ gst_nuv_demux_stream_extend_header (GstNuvDemux * nuv)
nuv->state = GST_NUV_DEMUX_EXTEND_HEADER_DATA;
} else {
nuv->state = GST_NUV_DEMUX_INVALID_DATA;
GST_ELEMENT_ERROR (nuv, STREAM, DEMUX, (NULL),
("Unsupported extended header (0x%02x)", buf->data[0]));
g_object_unref (buf);
GST_ELEMENT_WARNING (nuv, STREAM, FAILED,
(_("incomplete NUV support")), ("incomplete NUV support"));
return GST_FLOW_ERROR;
}
return res;
......@@ -921,8 +918,12 @@ done:
static gboolean
plugin_init (GstPlugin * plugin)
{
GST_DEBUG_CATEGORY_INIT (nuvdemux_debug, "nuvdemux",
0, "Demuxer for NUV streams");
#ifdef ENABLE_NLS
setlocale (LC_ALL, "");
GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
#endif /* ENABLE_NLS */
......
# ext/audiofile/gstafsink.c
# ext/audiofile/gstafsrc.c
# ext/sndfile/gstsf.c
# sys/dxr3/dxr3audiosink.c
# sys/dxr3/dxr3audiosink.c
# sys/dxr3/dxr3videosink.c
ext/sndfile/gstsfsink.c
ext/sndfile/gstsfsrc.c
gst/nuvdemux/gstnuvdemux.c
sys/dvb/gstdvbsrc.c
/*
*
* GStreamer
/* GStreamer DVB source
* Copyright (C) 2006 Zaheer Abbas Merali <zaheerabbas at merali
* dot org>
*
......@@ -40,7 +38,7 @@
#include <linux/dvb/frontend.h>
#include <linux/dvb/dmx.h>
#include "../../gst-libs/gst/gst-i18n-plugin.h"
#include <gst/gst-i18n-plugin.h>
GST_DEBUG_CATEGORY_STATIC (gstdvbsrc_debug);
#define GST_CAT_DEFAULT (gstdvbsrc_debug)
......@@ -296,11 +294,7 @@ static GstStaticPadTemplate ts_src_factory = GST_STATIC_PAD_TEMPLATE ("src",
******************************
*/
#define _do_init(bla) \
GST_DEBUG_CATEGORY_INIT (gstdvbsrc_debug, "dvbsrc", 0, "DVB Source Element");
GST_BOILERPLATE_FULL (GstDvbSrc, gst_dvbsrc, GstPushSrc,
GST_TYPE_PUSH_SRC, _do_init);
GST_BOILERPLATE (GstDvbSrc, gst_dvbsrc, GstPushSrc, GST_TYPE_PUSH_SRC);
static void
gst_dvbsrc_base_init (gpointer gclass)
......@@ -764,6 +758,14 @@ gst_dvbsrc_finalize (GObject * _object)
static gboolean
plugin_init (GstPlugin * plugin)
{
GST_DEBUG_CATEGORY_INIT (gstdvbsrc_debug, "dvbsrc", 0, "DVB Source Element");
#ifdef ENABLE_NLS
GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
#endif /* ENABLE_NLS */
return gst_element_register (plugin, "dvbsrc", GST_RANK_NONE,
GST_TYPE_DVBSRC);
}
......
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