[gst-cvs] CVS: gstreamer/gst/elements gstfilesrc.c,1.8,1.9

[Wim Taymans]

Update of /cvsroot/gstreamer/gstreamer/gst/elements
In directory usw-pr-cvs1:/tmp/cvs-serv10754/elements

Modified Files:
	gstfilesrc.c 
Log Message:
Added 64 bit support to filesrc and a gtk+ shim (mapped to ulong
unfortunatly) as per vishnus patch.


Index: gstfilesrc.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/gstfilesrc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstfilesrc.c	2001/10/22 13:37:50	1.8
+++ gstfilesrc.c	2001/10/22 19:13:24	1.9
@@ -198,8 +198,8 @@
     g_param_spec_string("location","File Location","Location of the file to read",
                         NULL,G_PARAM_READWRITE));
   g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FILESIZE,
-    g_param_spec_ulong("filesize","File Size","Size of the file being read",
-                       0,G_MAXULONG,0,G_PARAM_READABLE));
+    g_param_spec_int64("filesize","File Size","Size of the file being read",
+                       0,G_MAXINT64,0,G_PARAM_READABLE));
   g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FD,
     g_param_spec_int("fd","File-descriptor","File-descriptor for the file being read",
                      0,G_MAXINT,0,G_PARAM_READABLE));
@@ -207,8 +207,8 @@
     g_param_spec_ulong("blocksize","Block Size","Block size to read per buffer",
                        0,G_MAXULONG,4096,G_PARAM_READWRITE));
   g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_OFFSET,
-    g_param_spec_ulong("offset","File Offset","Byte offset of current read pointer",
-                       0,G_MAXULONG,0,G_PARAM_READWRITE));
+    g_param_spec_int64("offset","File Offset","Byte offset of current read pointer",
+                       0,G_MAXINT64,0,G_PARAM_READWRITE));
   g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MAPSIZE,
     g_param_spec_ulong("mmapsize","mmap() Block Size","Size in bytes of mmap()d regions",
                        0,G_MAXULONG,4*1048576,G_PARAM_READWRITE));
@@ -292,7 +292,7 @@
       src->block_size = g_value_get_ulong (value);
       break;
     case ARG_OFFSET:
-      src->curoffset = g_value_get_ulong (value);
+      src->curoffset = g_value_get_int64 (value);
       break;
     case ARG_MAPSIZE:
       if ((src->mapsize % src->pagesize) == 0)
@@ -323,7 +323,7 @@
       g_value_set_string (value, src->filename);
       break;
     case ARG_FILESIZE:
-      g_value_set_ulong (value, src->filelen);
+      g_value_set_int64 (value, src->filelen);
       break;
     case ARG_FD:
       g_value_set_int (value, src->fd);
@@ -332,7 +332,7 @@
       g_value_set_ulong (value, src->block_size);
       break;
     case ARG_OFFSET:
-      g_value_set_ulong (value, src->curoffset);
+      g_value_set_int64 (value, src->curoffset);
       break;
     case ARG_MAPSIZE:
       g_value_set_ulong (value, src->mapsize);