gnome-scan r718 - in trunk: . lib modules/gsane modules/gsfile src

[bersace svn gnome org]

Author: bersace
Date: Sat Dec 20 16:58:10 2008
New Revision: 718
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=718&view=rev

Log:
Renamed frame to image.

Modified:
   trunk/ChangeLog
   trunk/lib/gnome-scan-job.vala
   trunk/lib/gnome-scan-node.vala
   trunk/modules/gsane/gsane-scanner.c
   trunk/modules/gsfile/gsfile-scanner.c
   trunk/src/flegita-sink.vala

Modified: trunk/lib/gnome-scan-job.vala
==============================================================================
--- trunk/lib/gnome-scan-job.vala	(original)
+++ trunk/lib/gnome-scan-job.vala	Sat Dec 20 16:58:10 2008
@@ -93,7 +93,7 @@
 			while(run_once())
 				count++;
 
-			debug("%d frames acquired", count);
+			debug("%d images acquired", count);
 			this.status = Status.DONE;
 		}
 
@@ -117,7 +117,7 @@
 		public bool run_once()
 		{
 			foreach(weak Gnome.Scan.Node node in this.nodes) {
-				if (!node.start_frame() && node is Gnome.Scan.Scanner) {
+				if (!node.start_image() && node is Gnome.Scan.Scanner) {
 					return false;
 				}
 			}
@@ -142,7 +142,7 @@
 			}
 
 			foreach(weak Gnome.Scan.Node node in this.nodes)
-				node.end_frame();
+				node.end_image();
 
 			return true;
 		}

Modified: trunk/lib/gnome-scan-node.vala
==============================================================================
--- trunk/lib/gnome-scan-node.vala	(original)
+++ trunk/lib/gnome-scan-node.vala	Sat Dec 20 16:58:10 2008
@@ -52,15 +52,15 @@
 		{
 		}
 
-		// scanner returns true whend new frame is to acquire. Allows
-		// nodes to prepare next frame (e.g. next filename, next page
-		// in pdf, etc.) for multi-frame acquisition
-		public virtual bool start_frame()
+		// scanner returns true whend new image is to acquire. Allows
+		// nodes to prepare next image (e.g. next filename, next page
+		// in pdf, etc.) for multi-image acquisition
+		public virtual bool start_image()
 		{
 			return false;
 		}
 
-		public virtual void end_frame()
+		public virtual void end_image()
 		{
 		}
 

Modified: trunk/modules/gsane/gsane-scanner.c
==============================================================================
--- trunk/modules/gsane/gsane-scanner.c	(original)
+++ trunk/modules/gsane/gsane-scanner.c	Sat Dec 20 16:58:10 2008
@@ -46,7 +46,7 @@
 	/* whether the adf is selected and thus we should scan until "NO_DOCS" */
 	gboolean is_adf_selected;
 	/* the number of pages scanned from the source (should not be > 1 for non ADF source) */
-	guint page_count;
+	guint image_count;
 	/* SANE frame paramters */
 	SANE_Parameters params;
 	/* total number of frame to acquire to get the entire image */
@@ -233,16 +233,16 @@
 gsane_scanner_start_scan(GnomeScanNode *node)
 {
 	GSaneScanner *self = GSANE_SCANNER(node);
-	self->priv->page_count = 0;
+	self->priv->image_count = 0;
 }
 
 static gboolean
-gsane_scanner_start_frame(GnomeScanNode *node)
+gsane_scanner_start_image(GnomeScanNode *node)
 {
 	GSaneScanner *self = GSANE_SCANNER(node);
 	GeglBuffer *buffer;
 
-	if (self->priv->page_count > 0 && !self->priv->is_adf_selected)
+	if (self->priv->image_count > 0 && !self->priv->is_adf_selected)
 		return FALSE;
 
 	SANE_Status status = sane_start(self->priv->handle);
@@ -290,11 +290,11 @@
 }
 
 static void
-gsane_scanner_end_frame(GnomeScanNode*scanner)
+gsane_scanner_end_image(GnomeScanNode*scanner)
 {
 	GSaneScanner *self = GSANE_SCANNER(scanner);
 	sane_cancel(self->priv->handle);
-	self->priv->page_count++;
+	self->priv->image_count++;
 }
 
 static GObject*
@@ -380,8 +380,8 @@
 
 	GnomeScanNodeClass *n_class = GNOME_SCAN_NODE_CLASS(klass);
 	n_class->start_scan	= gsane_scanner_start_scan;
-	n_class->start_frame	= gsane_scanner_start_frame;
-	n_class->end_frame	= gsane_scanner_end_frame;
+	n_class->start_image	= gsane_scanner_start_image;
+	n_class->end_image	= gsane_scanner_end_image;
 
 	GnomeScanScannerClass *s_class = GNOME_SCAN_SCANNER_CLASS(klass);
 	s_class->work = gsane_scanner_work;

Modified: trunk/modules/gsfile/gsfile-scanner.c
==============================================================================
--- trunk/modules/gsfile/gsfile-scanner.c	(original)
+++ trunk/modules/gsfile/gsfile-scanner.c	Sat Dec 20 16:58:10 2008
@@ -62,7 +62,7 @@
 }
 
 static gboolean
-gsfile_scanner_start_frame(GnomeScanNode *node)
+gsfile_scanner_start_image(GnomeScanNode *node)
 {
 	GSFileScanner *self = GSFILE_SCANNER(node);
 	if (!self->priv->current)
@@ -76,7 +76,7 @@
 }
 
 static void
-gsfile_scanner_end_frame(GnomeScanNode *node)
+gsfile_scanner_end_image(GnomeScanNode *node)
 {
 	GSFileScanner *self = GSFILE_SCANNER(node);
 	self->priv->current = g_slist_next(self->priv->current);
@@ -161,8 +161,8 @@
 	object_class->constructor	= gsfile_scanner_constructor;
 
 	node_class->start_scan	= gsfile_scanner_start_scan;
-	node_class->start_frame	= gsfile_scanner_start_frame;
-	node_class->end_frame	= gsfile_scanner_end_frame;
+	node_class->start_image	= gsfile_scanner_start_image;
+	node_class->end_image	= gsfile_scanner_end_image;
 }
 
 static void

Modified: trunk/src/flegita-sink.vala
==============================================================================
--- trunk/src/flegita-sink.vala	(original)
+++ trunk/src/flegita-sink.vala	Sat Dec 20 16:58:10 2008
@@ -61,7 +61,7 @@
 			this.update_status(Gnome.Scan.Status.READY, null);
 		}
 
-		public override bool start_frame()
+		public override bool start_image()
 		{
 			string filename;
 			string number;