Display and control your Android device
Reorganize server imports
Romain Vimontf69ac405340e
diff --git a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.javaindex 8230e054..672403b8 100644--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java@@ -1,14 +1,14 @@package com.genymobile.scrcpy.audio;import com.genymobile.scrcpy.AsyncProcessor;+import com.genymobile.scrcpy.device.ConfigurationException;+import com.genymobile.scrcpy.device.Streamer;import com.genymobile.scrcpy.util.Codec;import com.genymobile.scrcpy.util.CodecOption;import com.genymobile.scrcpy.util.CodecUtils;-import com.genymobile.scrcpy.device.ConfigurationException;import com.genymobile.scrcpy.util.IO;import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.util.LogUtils;-import com.genymobile.scrcpy.device.Streamer;import android.annotation.TargetApi;import android.media.MediaCodec;diff --git a/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.javaindex 323caae4..3924c205 100644--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java@@ -1,9 +1,9 @@package com.genymobile.scrcpy.audio;import com.genymobile.scrcpy.AsyncProcessor;+import com.genymobile.scrcpy.device.Streamer;import com.genymobile.scrcpy.util.IO;import com.genymobile.scrcpy.util.Ln;-import com.genymobile.scrcpy.device.Streamer;import android.media.MediaCodec;import android.os.Build;diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.javaindex 45116935..17e121c2 100644--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java@@ -1,7 +1,7 @@package com.genymobile.scrcpy.control;-import com.genymobile.scrcpy.util.Binary;import com.genymobile.scrcpy.device.Position;+import com.genymobile.scrcpy.util.Binary;import java.io.BufferedInputStream;import java.io.DataInputStream;diff --git a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java b/server/src/main/java/com/genymobile/scrcpy/control/Controller.javaindex 38251655..b445427d 100644--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java@@ -3,9 +3,9 @@ package com.genymobile.scrcpy.control;import com.genymobile.scrcpy.AsyncProcessor;import com.genymobile.scrcpy.CleanUp;import com.genymobile.scrcpy.device.Device;-import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.device.Point;import com.genymobile.scrcpy.device.Position;+import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.wrappers.InputManager;import com.genymobile.scrcpy.wrappers.ServiceManager;diff --git a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.javaindex 7d2e2055..3b8fc59b 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java@@ -1,8 +1,8 @@package com.genymobile.scrcpy.video;+import com.genymobile.scrcpy.device.Size;import com.genymobile.scrcpy.util.HandlerExecutor;import com.genymobile.scrcpy.util.Ln;-import com.genymobile.scrcpy.device.Size;import com.genymobile.scrcpy.wrappers.ServiceManager;import android.annotation.SuppressLint;diff --git a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.javaindex fbeca2af..62afb263 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java@@ -1,8 +1,8 @@package com.genymobile.scrcpy.video;import com.genymobile.scrcpy.device.Device;-import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.device.Size;+import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.wrappers.ServiceManager;import com.genymobile.scrcpy.wrappers.SurfaceControl;diff --git a/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.javaindex ba537b17..bd0a3b62 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java@@ -2,8 +2,8 @@ package com.genymobile.scrcpy.video;import com.genymobile.scrcpy.BuildConfig;import com.genymobile.scrcpy.device.Device;-import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.device.Size;+import com.genymobile.scrcpy.util.Ln;import android.graphics.Rect;diff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.javaindex a5f2d1e9..7800e4bb 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java@@ -1,15 +1,15 @@package com.genymobile.scrcpy.video;import com.genymobile.scrcpy.AsyncProcessor;+import com.genymobile.scrcpy.device.ConfigurationException;+import com.genymobile.scrcpy.device.Size;+import com.genymobile.scrcpy.device.Streamer;import com.genymobile.scrcpy.util.Codec;import com.genymobile.scrcpy.util.CodecOption;import com.genymobile.scrcpy.util.CodecUtils;-import com.genymobile.scrcpy.device.ConfigurationException;import com.genymobile.scrcpy.util.IO;import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.util.LogUtils;-import com.genymobile.scrcpy.device.Size;-import com.genymobile.scrcpy.device.Streamer;import android.media.MediaCodec;import android.media.MediaCodecInfo;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.javaindex dd92330c..00a39274 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java@@ -1,9 +1,9 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.util.Command;import com.genymobile.scrcpy.device.DisplayInfo;-import com.genymobile.scrcpy.util.Ln;import com.genymobile.scrcpy.device.Size;+import com.genymobile.scrcpy.util.Command;+import com.genymobile.scrcpy.util.Ln;import android.annotation.SuppressLint;import android.hardware.display.VirtualDisplay;