X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fjp%2Fosdn%2Fgokigen%2Fgokigenassets%2Fcamera%2Fvendor%2Fsony%2FSonyCameraControl.kt;fp=app%2Fsrc%2Fmain%2Fjava%2Fjp%2Fosdn%2Fgokigen%2Fgokigenassets%2Fcamera%2Fvendor%2Fsony%2FSonyCameraControl.kt;h=84a1ae5d85d038d6a6400de3eba964fd9fb02137;hb=a9497f567ed35b924c80df49eb05498616a41c70;hp=dec536dc29c3db0891e66e7da965cf225a057d6d;hpb=665157034354a49b022b22cbd84e95f8fcf3acfa;p=gokigen%2Fmangle.git

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt
index dec536d..84a1ae5 100644
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt
@@ -57,7 +57,7 @@ class SonyCameraControl(private val context: AppCompatActivity, private val vibr
     companion object
     {
         private val TAG = SonyCameraControl::class.java.simpleName
-        private const val CONNECT_DELAY_MS : Long = 350
+        private const val CONNECT_DELAY_MS : Long = 150
     }
 
     override fun prepare()
@@ -179,7 +179,7 @@ class SonyCameraControl(private val context: AppCompatActivity, private val vibr
         Log.v(TAG, " connectToCamera() : SONY ")
         try
         {
-            while (cameraCoordinator.isOtherCameraConnecting(number))
+            while (!cameraCoordinator.startConnectToCamera(number))
             {
                 try
                 {
@@ -190,7 +190,6 @@ class SonyCameraControl(private val context: AppCompatActivity, private val vibr
                     e.printStackTrace()
                 }
             }
-            cameraCoordinator.startConnectToCamera(number)
             cameraConnection.connect()
         }
         catch (e : Exception)