From 942127400623037116fce441916c1678f4291e14 Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@songbirdnest.com>
Date: Thu, 29 Oct 2009 16:34:23 -0700
Subject: osxvideosrc: change a .m file containing only C code to a .c file.
 Makes building this easier.

---
 sys/osxvideo/Makefile.am      |  4 +---
 sys/osxvideo/osxvideoplugin.c | 50 +++++++++++++++++++++++++++++++++++++++++++
 sys/osxvideo/osxvideoplugin.m | 50 -------------------------------------------
 3 files changed, 51 insertions(+), 53 deletions(-)
 create mode 100644 sys/osxvideo/osxvideoplugin.c
 delete mode 100644 sys/osxvideo/osxvideoplugin.m

diff --git a/sys/osxvideo/Makefile.am b/sys/osxvideo/Makefile.am
index dd46e99c1..53391f7ed 100644
--- a/sys/osxvideo/Makefile.am
+++ b/sys/osxvideo/Makefile.am
@@ -1,7 +1,7 @@
 
 plugin_LTLIBRARIES = libgstosxvideosrc.la
 
-libgstosxvideosrc_la_SOURCES = osxvideoplugin.m osxvideosrc.c
+libgstosxvideosrc_la_SOURCES = osxvideoplugin.c osxvideosrc.c
 libgstosxvideosrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) -Wno-deprecated-declarations
 libgstosxvideosrc_la_LIBADD =  \
@@ -13,6 +13,4 @@ libgstosxvideosrc_la_LIBTOOLFLAGS = --tag=disable-static
 libgstosxvideosrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
 	-Wl,-framework -Wl,Cocoa -Wl,-framework -Wl,QuickTime
 
-AM_OBJCFLAGS=$(CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
-
 noinst_HEADERS = osxvideosrc.h
diff --git a/sys/osxvideo/osxvideoplugin.c b/sys/osxvideo/osxvideoplugin.c
new file mode 100644
index 000000000..89530cd5c
--- /dev/null
+++ b/sys/osxvideo/osxvideoplugin.c
@@ -0,0 +1,50 @@
+/* GStreamer
+ * OSX video src
+ * Copyright (C) 2004-6 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
+ *
+ * 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.
+ *
+ * The development of this code was made possible due to the involvement of
+ * Pioneers of the Inevitable, the creators of the Songbird Music player.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* Object header */
+#include "osxvideosrc.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  if (!gst_element_register (plugin, "osxvideosrc",
+          GST_RANK_PRIMARY, GST_TYPE_OSX_VIDEO_SRC))
+    return FALSE;
+
+  GST_DEBUG_CATEGORY_INIT (gst_debug_osx_video_src, "osxvideosrc", 0,
+      "osxvideosrc element");
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "osxvideosrc",
+    "OSX native video input plugin",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/sys/osxvideo/osxvideoplugin.m b/sys/osxvideo/osxvideoplugin.m
deleted file mode 100644
index 0199dc92b..000000000
--- a/sys/osxvideo/osxvideoplugin.m
+++ /dev/null
@@ -1,50 +0,0 @@
-/* GStreamer
- * OSX video src
- * Copyright (C) 2004-6 Zaheer Abbas Merali <zaheerabbas at merali dot org>
- * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
- *
- * 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.
- *
- * The development of this code was made possible due to the involvement of
- * Pioneers of the Inevitable, the creators of the Songbird Music player.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* Object header */
-#include "osxvideosrc.h"
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "osxvideosrc",
-          GST_RANK_PRIMARY, GST_TYPE_OSX_VIDEO_SRC))
-    return FALSE;
-
-  GST_DEBUG_CATEGORY_INIT (gst_debug_osx_video_src, "osxvideosrc", 0,
-                           "osxvideosrc element");
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "osxvideosrc",
-    "OSX native video input plugin",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
-- 
cgit v1.2.3