PowerShotZoomでスモール画像が取得できないので、標準画像を取得するような設定を用意。(スモール画像取得シーケンス TYPE2対応)

[gokigen/PKRemote.git] / app / src / main / java / net / osdn / gokigen / pkremote / camera / vendor / ptpip / wrapper / playback / CanonPlaybackControl.java

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/playback/CanonPlaybackControl.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/playback/CanonPlaybackControl.java
index a6fce5e..08b97a0 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/playback/CanonPlaybackControl.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/playback/CanonPlaybackControl.java
@@ -32,7 +32,7 @@ public class CanonPlaybackControl implements IPlaybackControl
     private final Activity activity;
     private final PtpIpInterfaceProvider provider;
     private final CanonFullImageReceiver fullImageReceiver;
-    private final ICanonSmallImageReceiver smallImageReciever;
+    private final ICanonImageReceiver smallImageReciever;
     private String raw_suffix = "CR2";
     private boolean useScreennailImage = false;
     private final CanonImageObjectReceiver canonImageObjectReceiver;
@@ -76,11 +76,15 @@ public class CanonPlaybackControl implements IPlaybackControl
         this.fullImageReceiver = new CanonFullImageReceiver(activity, provider.getCommandPublisher());
         if (smallImageSequence == 2)
         {
-            this.smallImageReciever = new CanonReducedImageReceiver(activity, provider.getCommandPublisher(), smallImageSequence);
+            this.smallImageReciever = new CanonFullImageReceiver(activity, provider.getCommandPublisher());
+        }
+        else if (smallImageSequence == 3)
+        {
+            this.smallImageReciever = new CanonImageReceiver(activity, provider.getCommandPublisher(), smallImageSequence);
         }
         else
         {
-            this.smallImageReciever = new CanonSmallImageReceiver(activity, provider.getCommandPublisher(), smallImageSequence);
+            this.smallImageReciever = new CanonImageReceiver(activity, provider.getCommandPublisher(), smallImageSequence);
         }
         canonImageObjectReceiver = new CanonImageObjectReceiver(provider, delayMs);
     }
@@ -206,7 +210,7 @@ public class CanonPlaybackControl implements IPlaybackControl
                 if (isSmallSize)
                 {
                     // スモールサイズの画像取得コマンド（シーケンス）を発行する
-                    smallImageReciever.issueCommand(content.getId(), callback);
+                    smallImageReciever.issueCommand(content.getId(), content.getOriginalSize(), callback);
                 }
                 else
                 {