[gst-cvs] CVS: gstreamer/plugins/mikmod Makefile.am,1.1,1.1.4.1 drv_gst.c,1.1,1.1.4.1 gstmikmod.c,1.2,1.2.4.1 gstmikmod.h,1.1,1.1.4.1 mikmod_reader.c,1.1,1.1.4.1 drv_gst.h,1.1,NONE mikmod_reader.h,1.1,NONE mikmodtypes.c,1.1,NONE

[Erik Walthinsen]

Update of /cvsroot/gstreamer/gstreamer/plugins/mikmod
In directory usw-pr-cvs1:/tmp/cvs-serv20849/plugins/mikmod

Modified Files:
      Tag: BRANCH-EVENTS1
	Makefile.am drv_gst.c gstmikmod.c gstmikmod.h mikmod_reader.c 
Removed Files:
      Tag: BRANCH-EVENTS1
	drv_gst.h mikmod_reader.h mikmodtypes.c 
Log Message:
merge from HEAD on 20011016

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mikmod/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- Makefile.am	2001/08/30 23:04:52	1.1
+++ Makefile.am	2001/10/17 08:51:01	1.1.4.1
@@ -6,6 +6,6 @@
 
 libgstmikmod_la_LIBADD = -lmikmod
 
-noinst_HEADERS = gstmikmod.h drv_gst.h mikmod_reader.h
+noinst_HEADERS = gstmikmod.h
 
 EXTRA_DIST = README

Index: drv_gst.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mikmod/drv_gst.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- drv_gst.c	2001/08/30 23:04:52	1.1
+++ drv_gst.c	2001/10/17 08:51:01	1.1.4.1
@@ -1,7 +1,6 @@
 #include <stdlib.h>
-#include <gst/gst.h>
 
-#include "drv_gst.h"
+#include "gstmikmod.h"
 
 static int buffer_size;
 static SBYTE *audiobuffer = NULL;

Index: gstmikmod.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mikmod/gstmikmod.c,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- gstmikmod.c	2001/09/02 21:41:32	1.2
+++ gstmikmod.c	2001/10/17 08:51:01	1.2.4.1
@@ -17,14 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gst/gst.h>
-#include <../../include/gstaudio.h>
-#include <stdlib.h>
-#include "mikmod.h"
-
 #include "gstmikmod.h"
-#include "mikmod_reader.h"
-#include "drv_gst.h"
+
+#include <libs/audio/gstaudio.h>
+#include <stdlib.h>
 
 GstElementDetails mikmod_details = {
   "MikMod",
@@ -181,7 +177,7 @@
 }		
 
 
-GtkType
+GType
 gst_mikmod_get_type(void) {
   static GType mikmod_type = 0;
 
@@ -486,7 +482,7 @@
       filter->stereo = g_value_get_boolean (value);
       break;
     default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+//      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
 }
@@ -544,7 +540,7 @@
       g_value_set_boolean (value, filter->stereo);
       break;
     default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+//      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
 }

Index: gstmikmod.h
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mikmod/gstmikmod.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- gstmikmod.h	2001/08/30 23:04:52	1.1
+++ gstmikmod.h	2001/10/17 08:51:01	1.1.4.1
@@ -21,10 +21,9 @@
 #ifndef __GST_MIKMOD_H__
 #define __GST_MIKMOD_H__
 
-
 #include <config.h>
+#include <mikmod.h>
 #include <gst/gst.h>
-#include "mikmod.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,14 +34,14 @@
   (gst_mikmod_get_type())
   
 #define GST_MIKMOD(obj) \
-  (GTK_CHECK_CAST((obj),GST_TYPE_MIKMOD,GstMikMod))
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIKMOD,GstMikMod))
 #define GST_MIKMOD_CLASS(klass) \
-  (GTK_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstMikMod))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstMikMod))
 #define GST_IS_MIKMOD(obj) \
-  (GTK_CHECK_TYPE((obj),GST_TYPE_MIKMOD))
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIKMOD))
 #define GST_IS_MIKMOD_CLASS(obj) \
-  (GTK_CHECK_CLASS_TYPE((klass),GST_TYPE_MIKMOD))
-
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIKMOD))
+  
 struct _GstMikMod {
   GstElement element;
   GstPad *sinkpad, *srcpad;
@@ -79,7 +78,25 @@
 GstPad *srcpad;
 int need_sync;
 
-GtkType gst_mikmod_get_type(void);
+GType gst_mikmod_get_type(void);
+
+// symbols for mikmod_reader.h
+struct _GST_READER
+{
+  MREADER core;
+  GstMikMod *mik;
+  guint64 offset;
+  gshort  eof;
+};
+
+
+typedef struct _GST_READER GST_READER;
+
+
+MREADER *GST_READER_new( GstMikMod *mik );
+
+// symbols for drv_gst.c
+extern MDRIVER drv_gst;
 
 #ifdef __cplusplus
 }

Index: mikmod_reader.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/mikmod/mikmod_reader.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- mikmod_reader.c	2001/08/30 23:04:52	1.1
+++ mikmod_reader.c	2001/10/17 08:51:01	1.1.4.1
@@ -1,8 +1,7 @@
 #include <unistd.h>
 #include <string.h>
-#include <gst/gst.h>
 
-#include "mikmod_reader.h"
+#include "gstmikmod.h"
 
 extern int need_sync;
 

--- drv_gst.h DELETED ---

--- mikmod_reader.h DELETED ---

--- mikmodtypes.c DELETED ---