use lower case letters for package name

Consti10 · Apr 16, 2020 · 84628b3 · 84628b3
1 parent 2cf658c
commit 84628b3
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 16 deletions.
diff --git a/VideoCore/src/main/cpp/VideoPlayer/VideoPlayer.cpp b/VideoCore/src/main/cpp/VideoPlayer/VideoPlayer.cpp
@@ -184,7 +184,7 @@ std::string VideoPlayer::getInfoString(){
 //----------------------------------------------------JAVA bindings---------------------------------------------------------------
 #define JNI_METHOD(return_type, method_name) \
   JNIEXPORT return_type JNICALL              \
-      Java_constantin_video_core_VideoPlayer_VideoPlayer_##method_name
+      Java_constantin_video_core_video_1player_VideoPlayer_##method_name
 
 inline jlong jptr(VideoPlayer *videoPlayerN) {
     return reinterpret_cast<intptr_t>(videoPlayerN);

diff --git a/VideoCore/src/main/java/constantin/video/core/TestReceiverVideo.java b/VideoCore/src/main/java/constantin/video/core/TestReceiverVideo.java
@@ -11,7 +11,7 @@
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.OnLifecycleEvent;
 
-import constantin.video.core.VideoPlayer.VideoPlayer;
+import constantin.video.core.video_player.VideoPlayer;
 
 //creates a new thread that -in between onResume() / onPause()
 //constantly reads from videoPlayer and updates the appropriate ui elements

diff --git a/VideoCore/src/main/java/constantin/video/core/VideoPlayerSurfaceHolder.java b/VideoCore/src/main/java/constantin/video/core/VideoPlayerSurfaceHolder.java
@@ -5,7 +5,7 @@
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-import constantin.video.core.VideoPlayer.VideoPlayer;
+import constantin.video.core.video_player.VideoPlayer;
 
 public class VideoPlayerSurfaceHolder implements SurfaceHolder.Callback{
 

diff --git a/...ideo/core/External/AspectFrameLayout.java → ...ideo/core/external/AspectFrameLayout.java b/...ideo/core/External/AspectFrameLayout.java → ...ideo/core/external/AspectFrameLayout.java
@@ -1,4 +1,4 @@
-package constantin.video.core.External;
+package constantin.video.core.external;
 
 import android.content.Context;
 import android.util.AttributeSet;

diff --git a/...ideoPlayer/INativeVideoParamsChanged.java → ...deo_player/INativeVideoParamsChanged.java b/...ideoPlayer/INativeVideoParamsChanged.java → ...deo_player/INativeVideoParamsChanged.java
@@ -1,4 +1,4 @@
-package constantin.video.core.VideoPlayer;
+package constantin.video.core.video_player;
 
 //These methods are called by the native code.
 //See also IVideoParamsChanged

diff --git a/...n/video/core/VideoPlayer/VideoPlayer.java → .../video/core/video_player/VideoPlayer.java b/...n/video/core/VideoPlayer/VideoPlayer.java → .../video/core/video_player/VideoPlayer.java
@@ -1,8 +1,7 @@
-package constantin.video.core.VideoPlayer;
+package constantin.video.core.video_player;
 
 import android.content.Context;
 import android.content.res.AssetManager;
-import android.util.Log;
 import android.view.Surface;
 
 import androidx.annotation.Nullable;

diff --git a/...video/core/VideoPlayer/VideoSettings.java → ...ideo/core/video_player/VideoSettings.java b/...video/core/VideoPlayer/VideoSettings.java → ...ideo/core/video_player/VideoSettings.java
@@ -1,4 +1,4 @@
-package constantin.video.core.VideoPlayer;
+package constantin.video.core.video_player;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

diff --git a/VideoExample/src/androidTest/java/constantin/video/example/PlayAllTestVideosTest.java b/VideoExample/src/androidTest/java/constantin/video/example/PlayAllTestVideosTest.java
@@ -17,7 +17,7 @@
 import javax.annotation.Nullable;
 
 import constantin.video.core.DecodingInfo;
-import constantin.video.core.VideoPlayer.VideoPlayer;
+import constantin.video.core.video_player.VideoPlayer;
 
 
 @LargeTest

diff --git a/VideoExample/src/androidTest/java/constantin/video/example/PlayTestVideosRepeated.java b/VideoExample/src/androidTest/java/constantin/video/example/PlayTestVideosRepeated.java
@@ -17,7 +17,7 @@
 import javax.annotation.Nullable;
 
 import constantin.video.core.DecodingInfo;
-import constantin.video.core.VideoPlayer.VideoPlayer;
+import constantin.video.core.video_player.VideoPlayer;
 
 public class PlayTestVideosRepeated {
     private static final int WAIT_TIME_SHORT = 5*1000; //n seconds

diff --git a/VideoExample/src/main/java/constantin/video/example/MainActivity.kt b/VideoExample/src/main/java/constantin/video/example/MainActivity.kt
@@ -17,7 +17,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import constantin.video.core.AVideoSettings
 import constantin.video.core.IsConnected
-import constantin.video.core.VideoPlayer.VideoSettings
+import constantin.video.core.video_player.VideoSettings
 import java.util.*
 
 class MainActivity : AppCompatActivity(), View.OnClickListener {

diff --git a/VideoExample/src/main/java/constantin/video/example/VideoActivity.kt b/VideoExample/src/main/java/constantin/video/example/VideoActivity.kt
@@ -18,11 +18,10 @@ import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.SetOptions
 
 import constantin.video.core.DecodingInfo
-import constantin.video.core.External.AspectFrameLayout
 import constantin.video.core.IVideoParamsChanged
-import constantin.video.core.VideoPlayer.VideoPlayer
-import constantin.video.core.VideoPlayer.VideoSettings
+import constantin.video.core.video_player.VideoSettings
 import constantin.video.core.VideoPlayerSurfaceHolder
+import constantin.video.core.external.AspectFrameLayout
 
 const val ID_OS_VERSIONS : String ="OSVersions";
 const val ID_BUILD_MODEL : String ="BuildModel";

diff --git a/VideoExample/src/main/res/layout/activity_video.xml b/VideoExample/src/main/res/layout/activity_video.xml
@@ -10,7 +10,7 @@
     android:background="@android:color/black"
     tools:context=".VideoActivity">
 
-    <constantin.video.core.External.AspectFrameLayout
+    <constantin.video.core.external.AspectFrameLayout
         android:id="@+id/afl_video"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -20,7 +20,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"/>
 
-    </constantin.video.core.External.AspectFrameLayout>
+    </constantin.video.core.external.AspectFrameLayout>
 
     <Button
         android:layout_width="50dp"