updates to make this closer to compile

Original commit message from CVS:
updates to make this closer to compile

5 files changed, 43 insertions, 6 deletions

diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am
index 0f1d17ed..033035b7 100644
--- a/sys/oss/Makefile.am
+++ b/sys/oss/Makefile.am
@@ -13,7 +13,8 @@ libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 noinst_HEADERS = gstosssink.h	\
 		gstosssrc.h	\
 		gstosselement.h\
-		gstossmixer.h
+		gstossmixer.h \
+		gst-i18n-plugin.h
 
 noinst_PROGRAMS = oss_probe
 
diff --git a/sys/oss/gst-i18n-plugin.h b/sys/oss/gst-i18n-plugin.h
new file mode 100644
index 00000000..2c37a615
--- /dev/null
+++ b/sys/oss/gst-i18n-plugin.h
@@ -0,0 +1,37 @@
+/* GStreamer
+ * Copyright (C) 2004 Thomas Vander Stichele <thomas@apestaart.org>
+ *
+ * gst-i18n-plugins.h: internationalization macros for the GStreamer plugins
+ *
+ * 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_I18N_PLUGIN_H__
+#define __GST_I18N_PLUGIN_H__
+
+#include <locale.h>  /* some people need it and some people don't */
+#include "gettext.h" /* included with gettext distribution and copied */
+
+#ifndef GETTEXT_PACKAGE
+#error You must define GETTEXT_PACKAGE before including this header.
+#endif
+
+/* we want to use shorthand _() for translating and N_() for marking */
+#define _(String) dgettext (GETTEXT_PACKAGE, String)
+#define N_(String) gettext_noop (String)
+/* FIXME: if we need it, we can add Q_ as well, like in glib */
+
+#endif /* __GST_I18N_PLUGIN_H__ */
diff --git a/sys/oss/gstossaudio.c b/sys/oss/gstossaudio.c
index f34e78bc..e5f8ee49 100644
--- a/sys/oss/gstossaudio.c
+++ b/sys/oss/gstossaudio.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include "gst-i18n-plugin.h"
 
 #include "gstosselement.h"
 #include "gstosssink.h"
diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index e8fc3453..ae1cf3a8 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include "gst-i18n-plugin.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/sys/oss/gstossmixer.c b/sys/oss/gstossmixer.c
index b54268fb..dc75294b 100644
--- a/sys/oss/gstossmixer.c
+++ b/sys/oss/gstossmixer.c
@@ -45,7 +45,7 @@
 
 #endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
-#include <gst/gst-i18n-plugin.h>
+#include <gst-i18n-plugin.h>
 
 #include "gstossmixer.h"
 
@@ -88,8 +88,7 @@ fill_labels (void)
   {
     gchar *given, *wanted;
   }
-  cases[] =
-  {
+  cases[] = {
     /* Note: this list is simply ripped from soundcard.h. For
      * some people, some values might be missing (3D surround,
      * etc.) - feel free to add them. That's the reason why