| Révision | 8d2417f9da4a156b525a4d4e82bf58b98ab9fff5 (tree) |
|---|---|
| l'heure | 2021-01-11 23:14:33 |
| Auteur | MRSa <mrsa@myad...> |
| Commiter | MRSa |
THETA S/SCでは、Video撮影モード時にライブビューができないのに対応。
wear/src/main/java/jp/sfjp/gokigen/a01c/thetacamerawrapper/ThetaCameraController.kt (diff) wear/src/main/java/jp/sfjp/gokigen/a01c/thetacamerawrapper/operation/ThetaMovieRecordingControl.kt (diff)| @@ -26,7 +26,6 @@ import jp.sfjp.gokigen.a01c.thetacamerawrapper.operation.ThetaDummyOperation | ||
| 26 | 26 | import jp.sfjp.gokigen.a01c.thetacamerawrapper.operation.ThetaMovieRecordingControl |
| 27 | 27 | import jp.sfjp.gokigen.a01c.thetacamerawrapper.operation.ThetaOptionUpdateControl |
| 28 | 28 | import jp.sfjp.gokigen.a01c.thetacamerawrapper.operation.ThetaSingleShotControl |
| 29 | -import java.util.* | |
| 30 | 29 | |
| 31 | 30 | class ThetaCameraController(val context: AppCompatActivity, private val focusFrameDisplay: IAutoFocusFrameDisplay, private val showInformation: IShowInformation, private val receiver: ICameraStatusReceiver, private val preferences: PreferenceAccessWrapper) : ICameraController, IIndicatorControl |
| 32 | 31 | { |
| @@ -105,6 +104,8 @@ class ThetaCameraController(val context: AppCompatActivity, private val focusFra | ||
| 105 | 104 | try |
| 106 | 105 | { |
| 107 | 106 | optionSet.setOptions("\"captureMode\" : \"image\"", apiV21) |
| 107 | + waitMs(200); | |
| 108 | + startLiveView() | |
| 108 | 109 | } |
| 109 | 110 | catch (e : Exception) |
| 110 | 111 | { |
| @@ -123,6 +124,10 @@ class ThetaCameraController(val context: AppCompatActivity, private val focusFra | ||
| 123 | 124 | else |
| 124 | 125 | { |
| 125 | 126 | optionSet.setOptions("\"captureMode\" : \"_video\"", apiV21) |
| 127 | + | |
| 128 | + // API Level 1 の対応機種では、Videoモードでライブビューが動かないので止める | |
| 129 | + waitMs(200); | |
| 130 | + stopLiveView() | |
| 126 | 131 | } |
| 127 | 132 | } |
| 128 | 133 | catch (e : Exception) |
| @@ -57,15 +57,6 @@ class ThetaMovieRecordingControl(val context: Context, private val sessionIdProv | ||
| 57 | 57 | { |
| 58 | 58 | Log.v(TAG, " startCapture() : $result") |
| 59 | 59 | indicator.onShootingStatusUpdate(IIndicatorControl.shootingStatus.Starting) |
| 60 | - | |
| 61 | - // 画像処理が終わるまで待つ | |
| 62 | - //waitChangeStatus() | |
| 63 | - | |
| 64 | - // ライブビューのの再実行を指示する | |
| 65 | - //indicator.onShootingStatusUpdate(IIndicatorControl.shootingStatus.Stopping) | |
| 66 | - //liveViewControl.stopLiveView() | |
| 67 | - //waitMs(300) // ちょっと待つ... | |
| 68 | - //liveViewControl.startLiveView() | |
| 69 | 60 | } |
| 70 | 61 | else |
| 71 | 62 | { |
| @@ -109,9 +100,13 @@ class ThetaMovieRecordingControl(val context: Context, private val sessionIdProv | ||
| 109 | 100 | |
| 110 | 101 | // ライブビューのの再実行を指示する |
| 111 | 102 | indicator.onShootingStatusUpdate(IIndicatorControl.shootingStatus.Stopping) |
| 112 | - liveViewControl.stopLiveView() | |
| 113 | - waitMs(300) // ちょっと待つ... | |
| 114 | - liveViewControl.startLiveView() | |
| 103 | + if (useOSCv2) | |
| 104 | + { | |
| 105 | + // THETA V / THETA Z1 は、videoモードでライブビューができるので... | |
| 106 | + liveViewControl.stopLiveView() | |
| 107 | + waitMs(300) // ちょっと待つ... | |
| 108 | + liveViewControl.startLiveView() | |
| 109 | + } | |
| 115 | 110 | } |
| 116 | 111 | else |
| 117 | 112 | { |
Fork