summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2012-07-10 07:04:44 +0000
committerMarcus Meissner <marcus@jet.franken.de>2012-07-10 07:04:44 +0000
commit6b5768bbd91858e18e6ec2e5476fe87f391bde7e (patch)
tree9fd2c8dc917a9c2488efd773d96233c90eddf1e3
parentbe5d3be8af9b7004a51d98b62c0a0fe643126432 (diff)
downloadlibgphoto2-6b5768bbd91858e18e6ec2e5476fe87f391bde7e.tar.gz
adjustments for 2.5
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14049 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/ptp2/test-canon-powershot-sx100is.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/camlibs/ptp2/test-canon-powershot-sx100is.sh b/camlibs/ptp2/test-canon-powershot-sx100is.sh
index ee397490c..8c95d8239 100644
--- a/camlibs/ptp2/test-canon-powershot-sx100is.sh
+++ b/camlibs/ptp2/test-canon-powershot-sx100is.sh
@@ -34,18 +34,18 @@ gphoto2 --set-config capturetarget=1
time gphoto2 --capture-image-and-download
echo "*** testing preview"
-rm canon_preview.jpg || true
+rm capture_preview.jpg || true
gphoto2 --capture-preview
-gwenview canon_preview.jpg
-rm canon_preview.jpg || true
+gwenview capture_preview.jpg
+rm capture_preview.jpg || true
gphoto2 --set-config capturetarget=0
gphoto2 --capture-preview --capture-image-and-download --capture-preview --capture-image-and-download
-rm capt*.*
-gwenview canon_preview.jpg
+rm capt0*.*
+gwenview capture_preview.jpg
gphoto2 --set-config capturetarget=1
gphoto2 --capture-preview --capture-image-and-download --capture-preview --capture-image-and-download
-gwenview canon_preview.jpg
-rm canon_preview.jpg
+gwenview capture_preview.jpg
+rm capture_preview.jpg
rm movie.mjpg || true
gphoto2 --capture-movie=10s