[aravis] buffer: rename x and y to x_offset and y_offset.

[Emmanuel Pacaud <emmanuel src gnome org>]

commit 8f6d12ddcb5e65be2f9c8944ca53a0a802a1cb34
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Tue May 11 09:20:25 2010 +0200

    buffer: rename x and y to x_offset and y_offset.

 src/arvbuffer.h   |    9 +++++----
 src/arvgvsp.h     |   12 ++++++------
 src/arvgvstream.c |    4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/src/arvbuffer.h b/src/arvbuffer.h
index 6b8128a..4182bef 100644
--- a/src/arvbuffer.h
+++ b/src/arvbuffer.h
@@ -57,13 +57,14 @@ struct _ArvBuffer {
 	ArvBufferStatus status;
 
 	guint32 frame_id;
-	guint32 x;
-	guint32 y;
+	guint64 timestamp_ns;
+
+	guint32 x_offset;
+	guint32 y_offset;
 	guint32 width;
 	guint32 height;
-	ArvPixelFormat pixel_format;
 
-	guint64 timestamp_ns;
+	ArvPixelFormat pixel_format;
 };
 
 struct _ArvBufferClass {
diff --git a/src/arvgvsp.h b/src/arvgvsp.h
index 124dc1e..6c54858 100644
--- a/src/arvgvsp.h
+++ b/src/arvgvsp.h
@@ -46,8 +46,8 @@ typedef struct {
 	guint32 pixel_format;
 	guint32 width;
 	guint32 height;
-	guint32	x;
-	guint32	y;
+	guint32	x_offset;
+	guint32	y_offset;
 } __attribute__((__packed__)) ArvGvspDataLeader;
 
 typedef struct {
@@ -81,21 +81,21 @@ arv_gvsp_packet_get_frame_id (const ArvGvspPacket *packet)
 }
 
 static inline guint32
-arv_gvsp_packet_get_x (const ArvGvspPacket *packet)
+arv_gvsp_packet_get_x_offset (const ArvGvspPacket *packet)
 {
 	ArvGvspDataLeader *leader;
 
 	leader = (ArvGvspDataLeader *) &packet->data;
-	return g_ntohl (leader->x);
+	return g_ntohl (leader->x_offset);
 }
 
 static inline guint32
-arv_gvsp_packet_get_y (const ArvGvspPacket *packet)
+arv_gvsp_packet_get_y_offset (const ArvGvspPacket *packet)
 {
 	ArvGvspDataLeader *leader;
 
 	leader = (ArvGvspDataLeader *) &packet->data;
-	return g_ntohl (leader->y);
+	return g_ntohl (leader->y_offset);
 }
 
 static inline guint32
diff --git a/src/arvgvstream.c b/src/arvgvstream.c
index d41e978..00a735b 100644
--- a/src/arvgvstream.c
+++ b/src/arvgvstream.c
@@ -170,8 +170,8 @@ arv_gv_stream_thread (void *data)
 
 					arv_gv_stream_update_socket (thread_data, buffer);
 
-					buffer->x = arv_gvsp_packet_get_x (packet);
-					buffer->y = arv_gvsp_packet_get_y (packet);
+					buffer->x_offset = arv_gvsp_packet_get_x_offset (packet);
+					buffer->y_offset = arv_gvsp_packet_get_y_offset (packet);
 					buffer->width = arv_gvsp_packet_get_width (packet);
 					buffer->height = arv_gvsp_packet_get_height (packet);
 					buffer->pixel_format = arv_gvsp_packet_get_pixel_format (packet);