[gphoto-cvs] SF.net SVN: gphoto: [11149] trunk/libgphoto2/camlibs/topfield

[<mar...@us...>]

Revision: 11149
          http://gphoto.svn.sourceforge.net/gphoto/?rev=11149&view=rev
Author:   marcusmeissner
Date:     2008-05-18 13:12:50 -0700 (Sun, 18 May 2008)

Log Message:
-----------
enable TURBO mode during download (2x times speed)
escape "/" by "-".

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/topfield/ChangeLog
    trunk/libgphoto2/camlibs/topfield/puppy.c

Modified: trunk/libgphoto2/camlibs/topfield/ChangeLog
===================================================================
--- trunk/libgphoto2/camlibs/topfield/ChangeLog	2008-05-18 18:02:48 UTC (rev 11148)
+++ trunk/libgphoto2/camlibs/topfield/ChangeLog	2008-05-18 20:12:50 UTC (rev 11149)
@@ -2,6 +2,9 @@
 
 	* puppy.c: Implemented get_info_func.
 
+	* puppy.c: Use TURBO mode during download.
+		   Escape "/" in filenames by "-".
+
 2008-03-12  Marcus Meissner  <ma...@je...>
 
 	* puppy.c: Convert from ISO-8859-1 to current locale

Modified: trunk/libgphoto2/camlibs/topfield/puppy.c
===================================================================
--- trunk/libgphoto2/camlibs/topfield/puppy.c	2008-05-18 18:02:48 UTC (rev 11148)
+++ trunk/libgphoto2/camlibs/topfield/puppy.c	2008-05-18 20:12:50 UTC (rev 11149)
@@ -1,6 +1,7 @@
 /*
 
   Copyright (C) 2004 Peter Urbanec <toppy at urbanec.net>
+  Copyright (C) 2008 Marcus Meissner
 
   This file is part of puppy.
 
@@ -140,6 +141,13 @@
 		}
 		break;
 	}
+	src= dest;
+	while (1) {
+		src = strchr (src, '/');
+		if (!src) break;
+		*src='-';	/* FIXME: find better replacement char */
+		src++;
+	}
 	return dest;
 }
 
@@ -574,6 +582,8 @@
 	if (type != GP_FILE_TYPE_NORMAL)
 		return GP_ERROR_NOT_SUPPORTED;
 
+	do_cmd_turbo (camera, "ON", context);
+
 	path = get_path(camera, folder, filename);
 	r = send_cmd_hdd_file_send(camera, GET, path, context);
 	free (path);
@@ -660,6 +670,7 @@
 	}
 	if (pid) gp_context_progress_stop (context, pid);
 out:
+	do_cmd_turbo (camera, "OFF", context);
 	return result;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.