Skip to content

Commit c0c7caa

Browse files
INACTIVEのスペルミスを修正。
1 parent 699beba commit c0c7caa

6 files changed

Lines changed: 12 additions & 14 deletions

File tree

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostMediaStreamingRecordingProfile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ public boolean onRequest(final Intent request, final Intent response) {
695695
return true;
696696
}
697697

698-
if (recorder.getState() != HostMediaRecorder.RecorderState.INACTTIVE) {
698+
if (recorder.getState() != HostMediaRecorder.RecorderState.INACTIVE) {
699699
MessageUtils.setIllegalDeviceStateError(response,
700700
recorder.getName() + " is already running.");
701701
return true;
@@ -760,7 +760,7 @@ public boolean onRequest(final Intent request, final Intent response) {
760760
return true;
761761
}
762762

763-
if (recorder.getState() == HostMediaRecorder.RecorderState.INACTTIVE) {
763+
if (recorder.getState() == HostMediaRecorder.RecorderState.INACTIVE) {
764764
MessageUtils.setIllegalDeviceStateError(response, "recorder is stopped already.");
765765
return true;
766766
}

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/HostMediaRecorder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ enum RecorderState {
287287
/**
288288
* 動作していない.
289289
*/
290-
INACTTIVE,
290+
INACTIVE,
291291

292292
/**
293293
* 録画が一時停止中の状態.

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/HostMediaRecorderManager.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
import android.content.Intent;
1313
import android.content.IntentFilter;
1414
import android.content.pm.PackageManager;
15-
import android.graphics.Camera;
1615
import android.os.Build;
1716
import android.os.Bundle;
18-
import android.util.Log;
1917
import android.view.WindowManager;
2018

2119
import org.deviceconnect.android.deviceplugin.host.camera.CameraWrapper;
@@ -359,7 +357,7 @@ public void sendEventForRecordingChange(final String serviceId, final HostMediaR
359357
case RECORDING:
360358
MediaStreamRecordingProfile.setStatus(record, MediaStreamRecordingProfileConstants.RecordingState.RECORDING);
361359
break;
362-
case INACTTIVE:
360+
case INACTIVE:
363361
MediaStreamRecordingProfile.setStatus(record, MediaStreamRecordingProfileConstants.RecordingState.STOP);
364362
break;
365363
case ERROR:

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/audio/HostAudioRecorder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public class HostAudioRecorder implements HostMediaRecorder, HostDeviceStreamRec
8888

8989
public HostAudioRecorder(final Context context) {
9090
mContext = context;
91-
mState = RecorderState.INACTTIVE;
91+
mState = RecorderState.INACTIVE;
9292
}
9393

9494
@Override
@@ -290,10 +290,10 @@ public synchronized void startRecording(final RecordingListener listener) {
290290

291291
@Override
292292
public synchronized void stopRecording(final StoppingListener listener) {
293-
if (getState() == RecorderState.INACTTIVE) {
293+
if (getState() == RecorderState.INACTIVE) {
294294
listener.onFailed(this, "MediaRecorder is not running.");
295295
} else {
296-
mState = RecorderState.INACTTIVE;
296+
mState = RecorderState.INACTIVE;
297297
if (listener != null) {
298298
if (mMediaRecorder != null) {
299299
mMediaRecorder.stop();

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/camera/Camera2Recorder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public RecorderState getState() {
256256
if (mCamera2PreviewServerProvider.isShownCameraNotification()) {
257257
return RecorderState.PREVIEW;
258258
}
259-
return RecorderState.INACTTIVE;
259+
return RecorderState.INACTIVE;
260260
}
261261

262262
@Override

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/screen/ScreenCastRecorder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class ScreenCastRecorder implements HostMediaRecorder, HostDevicePhotoRec
8282
private int mPreviewBitRate = 1024 * 1024;
8383
private double mMaxFps = DEFAULT_MAX_FPS;
8484
private int mIFrameInterval = 2;
85-
private RecorderState mState = RecorderState.INACTTIVE;
85+
private RecorderState mState = RecorderState.INACTIVE;
8686

8787
private final MediaSharing mMediaSharing = MediaSharing.getInstance();
8888

@@ -420,7 +420,7 @@ private void takePhotoInternal(final @NonNull OnPhotoEventListener listener) {
420420

421421
Bitmap bitmap = screenshot.get();
422422
if (bitmap == null) {
423-
mState = RecorderState.INACTTIVE;
423+
mState = RecorderState.INACTIVE;
424424
listener.onFailedTakePhoto("Failed to take screenshot.");
425425
return;
426426
}
@@ -433,14 +433,14 @@ private void takePhotoInternal(final @NonNull OnPhotoEventListener listener) {
433433
mFileMgr.saveFile(filename, media, true, new FileManager.SaveFileCallback() {
434434
@Override
435435
public void onSuccess(@NonNull final String uri) {
436-
mState = RecorderState.INACTTIVE;
436+
mState = RecorderState.INACTIVE;
437437
registerPhoto(new File(mFileMgr.getBasePath(), filename));
438438
listener.onTakePhoto(uri, null, MIME_TYPE_JPEG);
439439
}
440440

441441
@Override
442442
public void onFail(@NonNull final Throwable throwable) {
443-
mState = RecorderState.INACTTIVE;
443+
mState = RecorderState.INACTIVE;
444444
listener.onFailedTakePhoto(throwable.getMessage());
445445
}
446446
});

0 commit comments

Comments
 (0)