diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-06-25 11:02:21 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-06-25 11:02:21 +0000 |
| commit | 5827f80d621828cc9f3be10fce0f1d4d487bfcd2 (patch) | |
| tree | dedc8b71890835c633c5f093fbf1c5032002afd7 /sys | |
| parent | 825b31e29565cd71614b6a64df11a5ce746299e4 (diff) | |
| download | gst-plugins-bad-5827f80d621828cc9f3be10fce0f1d4d487bfcd2.tar.gz gst-plugins-bad-5827f80d621828cc9f3be10fce0f1d4d487bfcd2.tar.bz2 gst-plugins-bad-5827f80d621828cc9f3be10fce0f1d4d487bfcd2.zip | |
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).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dvb/gstdvbsrc.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c index 7a65c40c..2ad55ffe 100644 --- a/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c @@ -1,6 +1,4 @@ -/* - * - * 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); } |