From ce111571b6850cd2e6220e2692dd4024bfdf8ad3 Mon Sep 17 00:00:00 2001
From: Brage <bskjon@outlook.com>
Date: Mon, 17 Jul 2023 00:13:26 +0200
Subject: [PATCH] Fixed naming

---
 .../reader/analyzer/EncodeArgumentSelector.kt  | 18 +++++++++---------
 .../java/no/iktdev/streamit/content/Main.java  |  7 -------
 2 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 UI/src/main/java/no/iktdev/streamit/content/Main.java

diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt
index 94f2ca12..64d1f1cd 100644
--- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt
+++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt
@@ -11,19 +11,19 @@ import no.iktdev.streamit.content.reader.analyzer.encoding.VideoEncodeArguments
 import no.iktdev.streamit.content.reader.preference
 
 class EncodeArgumentSelector(val inputFile: String, val streams: MediaStreams, val outFileName: String) {
-    var defaultSelectedVideo: VideoStream? = getDefaultSelectedVideo()
-    var defaultSelectedAudio: AudioStream? = getDefaultSelectedAudio()
+    var defaultSelectedVideo: VideoStream? = defaultSelectedVideo()
+    var defaultSelectedAudio: AudioStream? = defaultSelectedAudio()
 
-    private fun getAudioStreams() = streams.streams.filterIsInstance<AudioStream>()
-    private fun getVideoStreams() = streams.streams.filterIsInstance<VideoStream>()
+    private fun obtainAudioStreams() = streams.streams.filterIsInstance<AudioStream>()
+    private fun obtainVideoStreams() = streams.streams.filterIsInstance<VideoStream>()
 
 
-    private fun getDefaultSelectedVideo(): VideoStream? {
-        return getVideoStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: getVideoStreams().minByOrNull { it.index }
+    private fun defaultSelectedVideo(): VideoStream? {
+        return obtainVideoStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: obtainVideoStreams().minByOrNull { it.index }
     }
 
-    private fun getDefaultSelectedAudio(): AudioStream? {
-        return getAudioStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: getAudioStreams().minByOrNull { it.index }
+    private fun defaultSelectedAudio(): AudioStream? {
+        return obtainAudioStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: obtainAudioStreams().minByOrNull { it.index }
     }
 
     /**
@@ -37,7 +37,7 @@ class EncodeArgumentSelector(val inputFile: String, val streams: MediaStreams, v
      * @return AudioStrem based on preference or defaultSelectedAudio
      */
     private fun getSelectedAudioBasedOnPreference(): AudioStream? {
-        val languageFiltered = getAudioStreams().filter { it.tags.language == preference.audio.language }
+        val languageFiltered = obtainAudioStreams().filter { it.tags.language == preference.audio.language }
         val channeledAndCodec = languageFiltered.find { it.channels >= (preference.audio.channels ?: 2) && it.codec_name == preference.audio.codec.lowercase() }
         return channeledAndCodec ?: return languageFiltered.minByOrNull { it.index } ?: defaultSelectedAudio
     }
diff --git a/UI/src/main/java/no/iktdev/streamit/content/Main.java b/UI/src/main/java/no/iktdev/streamit/content/Main.java
deleted file mode 100644
index e38173bf..00000000
--- a/UI/src/main/java/no/iktdev/streamit/content/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package no.iktdev.streamit.content;
-
-public class Main {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
-}
\ No newline at end of file