diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 52001fd..ae813b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,15 +13,15 @@ jobs:
- name: Checkout the code
uses: actions/checkout@v4
- name: Set up a specific Java version
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: "temurin" # OR adopt OR microsoft OR...
- java-version: "21"
+ java-version: "17"
- name: Run all unit tests
run: ./gradlew test --stacktrace
- name: Upload test reports
if: always() # Run even if the previous steps failed
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: tests-report
path: build/reports/tests/
diff --git a/.idea/runConfigurations/Tests__All_.xml b/.idea/runConfigurations/Tests__All_.xml
index 93f7fcd..c173dd9 100644
--- a/.idea/runConfigurations/Tests__All_.xml
+++ b/.idea/runConfigurations/Tests__All_.xml
@@ -17,8 +17,7 @@
@@ -29,4 +28,4 @@
false
-
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index b5d6fbb..60a414c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ plugins {
val appRawFilesPath = rootDir.toPath() / "raw"
val appResourcesPath = rootDir.toPath() / "asset"
val vlcDirectoryName = "vlc"
-val isVlcFull = System.getenv("fullVlc").toBooleanLenient() ?: false
-val shouldMinifyVlc = System.getenv("minifyVlc").toBooleanLenient() ?: true
+val isVlcFull = System.getenv("fullVlc").toBooleanLenient() == true
+val shouldMinifyVlc = System.getenv("minifyVlc").toBooleanLenient() == true
val releaseDate: LocalDate = LocalDate.of(2024, 7, 6)
group = "ir.mahozad"
@@ -36,7 +36,7 @@ sourceSets {
// Makes the uiTestImplementation configuration extend from testImplementation,
// which means that all the declared dependencies of the test code (and transitively the main as well)
// also become dependencies of this new configuration
-val uiTestImplementation by configurations.getting {
+val uiTestImplementation: Configuration by configurations.getting {
extendsFrom(configurations.testImplementation.get())
}
val uiTest = task("uiTest") {
@@ -160,6 +160,8 @@ tasks.register(
"plugins/access/libfilesystem_plugin.dll",
// Along with audio_output/libmmdevice_plugin.dll normalizes audio loudness
"plugins/audio_filter/libnormvol_plugin.dll",
+ // Needed for MP3 (or audio) files with single (mono) channel
+ "plugins/audio_filter/libtrivial_channel_mixer_plugin.dll",
"plugins/audio_filter/libscaletempo_pitch_plugin.dll",
"plugins/audio_filter/libscaletempo_plugin.dll",
"plugins/audio_output/libdirectsound_plugin.dll",
@@ -209,13 +211,13 @@ tasks.register(
*/
buildConfig {
packageName("${project.group}.${project.name.lowercase()}")
- buildConfigField("String", "APP_NAME", """"${project.name}"""")
- buildConfigField("String", "APP_VERSION", """"${project.version}"""")
- buildConfigField("String", "VLC_DIRECTORY_NAME", """"$vlcDirectoryName"""")
+ buildConfigField(name = "APP_NAME", value = project.name)
+ buildConfigField(name = "APP_VERSION", value = "${project.version}")
+ buildConfigField(name = "VLC_DIRECTORY_NAME", value = vlcDirectoryName)
buildConfigField(
- "java.time.LocalDate",
- "APP_RELEASE_DATE",
- """LocalDate.of(${releaseDate.year}, ${releaseDate.monthValue}, ${releaseDate.dayOfMonth})"""
+ name = "APP_RELEASE_DATE",
+ type = "java.time.LocalDate",
+ expression = """LocalDate.parse("$releaseDate")"""
)
}
@@ -305,12 +307,20 @@ compose.desktop {
* It seems that the Windows OS does not respect the GIF speed and no-loop settings and
* plays the animation at a low frame rate. See https://stackoverflow.com/q/25382400
*/
- jvmArgs += "-splash:app/resources/splash-screen.gif"
+ jvmArgs += "-splash:${'$'}APPDIR/resources/splash-screen.gif"
nativeDistributions {
- // java.naming is to prevent app crash when running the app exe
- // (introduced with ch.qos.logback:logback-classic version 1.4.5)
- // jdk.unsupported is for showing the display image when running the app exe
- modules("java.naming", "jdk.unsupported")
+ modules(
+ // For preventing app crash when running the app exe
+ // (introduced in ch.qos.logback:logback-classic version 1.4.5)
+ "java.naming",
+ // For showing the display image when running the app exe
+ // (introduced in app version 1.5.0 by reimplementing the media player)
+ "jdk.unsupported",
+ // For playing local files when running the app exe (introduced in CMP version 1.6.0)
+ "jdk.accessibility",
+ // For launching the app using "Open with" on a file (required by Apache Tika)
+ "java.sql"
+ )
targetFormats(Dmg, Msi, Exe, Deb)
packageVersion = "${project.version}.0.0"
packageName = project.name
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 937a711..d267178 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,26 +1,26 @@
[versions]
-gradle = "8.6"
-jvm = "21"
+gradle = "8.8"
+jvm = "17"
kotlin = "1.9.22"
proguard = "7.4.2"
-compose-multiplatform = "1.5.12"
-buildConfig = "4.1.2"
-buildDownload = "5.5.0"
+compose-multiplatform = "1.6.0"
+buildConfig = "5.3.5"
+buildDownload = "5.6.0"
kotlin-coroutines = "1.8.0"
-logback = "1.4.11"
-log4jToSlf4j = "2.21.1"
-kotlinLogging = "5.1.0"
-ffmpeg = "5.1.2-1.5.8"
-vlc = "3.0.20"
-vlcj = "4.8.2"
-upx = "4.2.1"
-wavySlider="1.0.0"
+logback = "1.5.5"
+log4jToSlf4j = "2.23.1"
+kotlinLogging = "6.0.9"
+ffmpeg = "6.1.1-1.5.10"
+vlc = "3.0.21"
+vlcj = "4.8.3"
+upx = "4.2.3"
+wavySlider="1.3.0"
persianDateTime = "4.2.1"
-junit5 = "5.10.0"
-assertj = "3.24.2"
-mockk = "1.13.8"
-tika = "2.9.1"
-jna = "5.13.0"
+junit5 = "5.10.2"
+assertj = "3.25.3"
+mockk = "1.13.10"
+tika = "2.9.2"
+jna = "5.14.0"
jaudioTagger = "3.0.1"
image-comparison = "4.4.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd49..e644113 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4981abd..dd82863 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
networkTimeout=60000
validateDistributionUrl=false
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4..b740cf1 100644
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/raw/icons.svg b/raw/icons.svg
index 4402c8a..34be266 100644
--- a/raw/icons.svg
+++ b/raw/icons.svg
@@ -2,19 +2,19 @@
+ x="0"
+ y="0"
+ xlink:href="#path1-96"
+ id="use2"
+ transform="matrix(-1,0,0,1,62,0)" />
diff --git a/src/main/kotlin/ir/mahozad/cutcon/Defaults.kt b/src/main/kotlin/ir/mahozad/cutcon/Defaults.kt
index 0fd84d1..9b7d0c5 100644
--- a/src/main/kotlin/ir/mahozad/cutcon/Defaults.kt
+++ b/src/main/kotlin/ir/mahozad/cutcon/Defaults.kt
@@ -11,11 +11,12 @@ import ir.mahozad.cutcon.component.SystemDateTime
import ir.mahozad.cutcon.localization.Language
import ir.mahozad.cutcon.localization.LanguageEn
import ir.mahozad.cutcon.model.*
-import java.net.URL
+import java.net.URI
import java.nio.file.Path
import kotlin.io.path.Path
import kotlin.io.path.div
import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds
@@ -23,15 +24,14 @@ const val DISPLAY_WIDTH = 600 // 16:9 aspect ratio
const val DISPLAY_HEIGHT = 338 // 16:9 aspect ratio
const val DISPLAY_WIDTH_MINI = 356 // 16:9 aspect ratio
const val DISPLAY_HEIGHT_MINI = 200 // 16:9 aspect ratio
-const val WINDOW_WIDTH_WITH_PANEL = DISPLAY_WIDTH + 384
-const val WINDOW_WIDTH_NO_PANEL = DISPLAY_WIDTH + 16
+const val SIDE_PANEL_WIDTH = 360
+const val WINDOW_WIDTH_WITH_PANEL = DISPLAY_WIDTH + SIDE_PANEL_WIDTH + 3 * /* Paddings */ 8
+const val WINDOW_WIDTH_NO_PANEL = DISPLAY_WIDTH + 2 * /* Paddings */ 8
const val WINDOW_HEIGHT_REGULAR = DISPLAY_HEIGHT + (4 /* Rows of components */ * 48) + 34
const val WINDOW_WIDTH_MINI = 372
const val WINDOW_HEIGHT_MINI = 314
-val defaultAudioImage by lazy {
- decodeImage(path = assetsPath / "cover.svg", mimeType = "image/svg+xml")
-}
+val defaultAudioImage by lazy { decodeImage(assetsPath / "cover.svg") }
/**
* Because VLC has a problem that finishes the media when seeking to 1.0f,
@@ -52,7 +52,7 @@ val defaultQuality = Quality.MEDIUM
val defaultLanguage: Language = LanguageEn
val defaultCalendar = Calendar.GREGORIAN
val defaultTheme = Theme.LIGHT
-val defaultTooltipDelay = 1.seconds
+val defaultTooltipDelay = 600.milliseconds
val defaultDateTimeCheckingPeriod = 3.seconds
val defaultFontSize = 13.sp
val defaultIconSize = 24.dp
@@ -73,7 +73,7 @@ val defaultDurationConverter = DefaultDurationConverter
val defaultTimeStampString get() = defaultDurationConverter.format(defaultTimeStamp, numberOfParts = 1)
val defaultScreenshotSaveDirectory = (System.getProperty("user.home") ?: error("Could not get user home directory"))
.let(::Path) / "Pictures" / "Screenshots" / BuildConfig.APP_NAME
-val defaultAspectRatio = AspectRatio.W16H9
+val defaultAspectRatio = AspectRatio.SOURCE
val defaultCoverOptions = CoverOptions(
path = null,
scale = 1f,
@@ -88,8 +88,7 @@ val defaultIntroOptions = IntroOptions(
val defaultIsResumed = true
val defaultAudioVolume = 1f
val defaultIsAudioMuted = false
-val defaultMediaUrl = URL("file://")
-val defaultSeek = 0f
+val defaultMediaUrl = URI("file://localhost").toURL()
val defaultSpeed = Speed.NORMAL
val defaultFastSpeed = Speed.FAST2_0
val defaultClipToLoop: Clip? = null
diff --git a/src/main/kotlin/ir/mahozad/cutcon/Main.kt b/src/main/kotlin/ir/mahozad/cutcon/Main.kt
index 377cfbc..dc31084 100644
--- a/src/main/kotlin/ir/mahozad/cutcon/Main.kt
+++ b/src/main/kotlin/ir/mahozad/cutcon/Main.kt
@@ -5,6 +5,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.window.*
import io.github.oshai.kotlinlogging.KotlinLogging.logger
import ir.mahozad.cutcon.component.*
+import ir.mahozad.cutcon.component.DefaultMediaPlayer
import ir.mahozad.cutcon.converter.DefaultConverterFactory
import ir.mahozad.cutcon.localization.Messages
import ir.mahozad.cutcon.ui.MainWindow
@@ -43,7 +44,7 @@ val assetsPath = System
val viewModel = MainViewModel(
urlMaker = DefaultUrlMaker,
- settings = Preferences.userRoot(),
+ settings = Preferences.userNodeForPackage({}::class.java),
dispatcher = Dispatchers.IO,
mediaPlayer = DefaultMediaPlayer(),
dateTimeChecker = DefaultDateTimeChecker(Dispatchers.IO),
@@ -52,9 +53,9 @@ val viewModel = MainViewModel(
)
@OptIn(ExperimentalComposeUiApi::class)
-fun main() {
+fun main(vararg args: String) {
logger.info { "Application started" }
- initialize()
+ initialize(args.getOrNull(0))
application(exitProcessOnExit = false /* See exceptionHandler */) {
CompositionLocalProvider(
LocalWindowExceptionHandlerFactory provides exceptionHandler
@@ -66,10 +67,12 @@ fun main() {
logger.info { "Application finished" }
}
-private fun initialize() {
+private fun initialize(commandLinePath: String?) {
viewModel.startUrlMaker()
viewModel.startDateTimeChecker()
viewModel.startMediaProgressListener()
+ // For when launching the app via "Open with" or command line
+ commandLinePath?.let(::Path)?.run(viewModel::setSourceToLocal)
}
// This is also called when force closing/halting/killing the app process
diff --git a/src/main/kotlin/ir/mahozad/cutcon/MainViewModel.kt b/src/main/kotlin/ir/mahozad/cutcon/MainViewModel.kt
index 621d7a2..8af5be3 100644
--- a/src/main/kotlin/ir/mahozad/cutcon/MainViewModel.kt
+++ b/src/main/kotlin/ir/mahozad/cutcon/MainViewModel.kt
@@ -3,13 +3,13 @@ package ir.mahozad.cutcon
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.input.key.*
-import androidx.compose.ui.res.loadImageBitmap
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.WindowPosition
import io.github.oshai.kotlinlogging.KotlinLogging.logger
import ir.mahozad.cutcon.component.*
+import ir.mahozad.cutcon.component.MediaPlayer
import ir.mahozad.cutcon.converter.ConverterFactory
import ir.mahozad.cutcon.localization.Language
import ir.mahozad.cutcon.model.*
@@ -27,7 +27,6 @@ import ir.mahozad.cutcon.ui.widget.COVER_PREVIEW_SIZE
import ir.mahozad.cutcon.ui.widget.INTRO_PREVIEW_SIZE
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.*
-import org.jaudiotagger.audio.AudioFileIO
import java.awt.GraphicsEnvironment
import java.awt.Rectangle
import java.nio.file.Path
@@ -60,14 +59,17 @@ class MainViewModel(
data class Failure(val throwable: Throwable) : ConversionStatus
}
+ data class WindowWidth(val value: Int, val isAnimated: Boolean)
+
private val logger = logger(name = MainViewModel::class.simpleName ?: "")
private val coroutineScope = CoroutineScope(dispatcher)
private var conversionJob: Job? = null
private val _isAppExitConfirmDialogDisplayed = MutableStateFlow(false)
private val _isChangelogDialogDisplayed = MutableStateFlow(
- settings[PREF_LAST_SHOWN_CHANGELOG_VERSION, null].let {
- compareVersionStrings(BuildConfig.APP_VERSION, it) == VersionComparisonResult.NEWER
- }
+ // settings[PREF_LAST_SHOWN_CHANGELOG_VERSION, null].let {
+ // compareVersionStrings(BuildConfig.APP_VERSION, it) == VersionComparisonResult.NEWER
+ // }
+ false
)
private val _language = MutableStateFlow(
settings[PREF_LANGUAGE, null]
@@ -120,6 +122,7 @@ class MainViewModel(
private val _source = MutableStateFlow(defaultSource)
private val _quality = MutableStateFlow(defaultQuality)
private val _clip = MutableStateFlow(defaultClip)
+ private val _windowWidth = MutableStateFlow(WindowWidth(WINDOW_WIDTH_WITH_PANEL, isAnimated = true))
private val _isFullscreen = MutableStateFlow(defaultIsFullscreen)
private val _isMiniScreen = MutableStateFlow(defaultIsMiniScreen)
private val _isSidePanelDisplayed = MutableStateFlow(defaultIsSidePanelDisplayed)
@@ -143,6 +146,7 @@ class MainViewModel(
private val _introOptions = MutableStateFlow(defaultIntroOptions)
private val _coverBitmap = MutableStateFlow(null)
private val _introBitmap = MutableStateFlow(null)
+ private val _isScreenshotInputActive = MutableStateFlow(false)
private var wasSidePanelDisplayedBeforeChangingScreen = _isSidePanelDisplayed.value
private var wasMiniScreen = _isMiniScreen.value
/**
@@ -173,24 +177,19 @@ class MainViewModel(
private var _clipEndMinuteInput = MutableStateFlow(TextFieldValue(text = defaultTimeStampString))
private var _clipEndSecondInput = MutableStateFlow(TextFieldValue(text = defaultTimeStampString))
// NOTE: Do not use .flowOn(dispatcher); It degrades UI performance
- val displayImage = _source
- .transform {
+ val displayImage = mediaPlayer.output.transform {
+ if (it is MediaPlayer.Output.SourceNotStarted) {
emit(null)
// To give the transition animation of Display widget **at least** this much time
delay(500.milliseconds)
- emit(it)
- }
- .combine(mediaPlayer.video) { source, video ->
- if (source == null) {
- null
- } else if (source.mediaType == Source.MediaType.VIDEO) {
- video
- } else if (source.mimeType == "image/gif") {
- video
- } else {
- generateStaticDisplayImage(source)
- }
+ } else if (it is MediaPlayer.Output.Video) {
+ emitAll(it.video)
+ } else if (it is MediaPlayer.Output.Image) {
+ emit(it.image)
+ } else if (_source.value.mediaType == Source.MediaType.AUDIO) {
+ emit(defaultAudioImage)
}
+ }
val language = _language.asStateFlow()
val calendar = _calendar.asStateFlow()
val theme = _theme.asStateFlow()
@@ -231,6 +230,7 @@ class MainViewModel(
started = SharingStarted.Eagerly,
initialValue = _source.value.mediaType == Source.MediaType.VIDEO
)
+ val isScreenshotInputActive = _isScreenshotInputActive.asStateFlow()
val isQualityInputApplicable = _format
.map { it != Format.RAW }
.stateIn(
@@ -293,19 +293,7 @@ class MainViewModel(
started = SharingStarted.Eagerly,
initialValue = windowUserDraggedPosition.value
)
- val windowWidth = combine(_isSidePanelDisplayed, _isMiniScreen) { isSidePanelDisplayed, isMiniScreen ->
- if (isMiniScreen) {
- WINDOW_WIDTH_MINI
- } else if (isSidePanelDisplayed) {
- WINDOW_WIDTH_WITH_PANEL
- } else {
- WINDOW_WIDTH_NO_PANEL
- }
- }.stateIn(
- scope = coroutineScope,
- started = SharingStarted.Eagerly,
- initialValue = WINDOW_WIDTH_WITH_PANEL
- )
+ val windowWidth = _windowWidth.asStateFlow()
val windowHeight = _isMiniScreen
.map { if (it) WINDOW_HEIGHT_MINI else WINDOW_HEIGHT_REGULAR }
.stateIn(
@@ -353,6 +341,10 @@ class MainViewModel(
)
init {
+ mediaPlayer
+ .isResumed
+ .onEach { isResumed -> _mediaInfo.update { it.copy(isResumed = isResumed) } }
+ .launchIn(coroutineScope)
_lastSaveDirectory
.filterNotNull()
.conflate()
@@ -371,14 +363,8 @@ class MainViewModel(
.distinctUntilChanged()
.onEach(mediaPlayer::play)
.onEach { mediaPlayer.resume() }
- .onEach { url -> _mediaInfo.update { it.copy(url = url, isResumed = true) } }
+ .onEach { url -> _mediaInfo.update { it.copy(url = url) } }
.launchIn(coroutineScope)
- // Sets the initial seek to default seek
- coroutineScope.launch {
- // The delay is required to ensure the url has been started playing
- delay(100.milliseconds)
- mediaPlayer.seek(defaultSeek)
- }
}
fun startMediaProgressListener() {
@@ -403,6 +389,16 @@ class MainViewModel(
.launchIn(coroutineScope)
}
+ private fun updateWindowWidth(shouldAnimate: Boolean) {
+ _windowWidth.value = if (_isMiniScreen.value) {
+ WindowWidth(WINDOW_WIDTH_MINI, isAnimated = false)
+ } else if (_isSidePanelDisplayed.value) {
+ WindowWidth(WINDOW_WIDTH_WITH_PANEL, shouldAnimate)
+ } else {
+ WindowWidth(WINDOW_WIDTH_NO_PANEL, shouldAnimate)
+ }
+ }
+
fun setLanguage(language: Language) {
_language.value = language
settings.put(PREF_LANGUAGE, language.tag)
@@ -547,10 +543,8 @@ class MainViewModel(
private fun convertImageToSupportedFormatIfNeeded(path: Path?): Path? {
val mimeType = path?.detectMimeType()
return if (mimeType == "image/svg+xml") {
- // FFmpeg does not support SVG format, so here a temp PNG file with the default size
- // of the SVG (its default width and height) is created
- path.convertSvgToPng()
- } else if (mimeType != null && mimeType.startsWith("image/")) {
+ convertSvgToPng(path)
+ } else if (mimeType?.startsWith("image/") == true) {
path
} else {
null
@@ -561,12 +555,12 @@ class MainViewModel(
path: Path?,
desiredSizeIfVector: Float,
onFailure: () -> Unit
- ) = path
- ?.let { decodeImage(path = it, desiredSizeIfVector = desiredSizeIfVector) }
- ?: run {
- if (path != null) onFailure()
- null
- }
+ ): ImageBitmap? {
+ if (path == null) return null
+ val result = decodeImage(path, desiredSizeIfVector)
+ if (result == null) onFailure()
+ return result
+ }
fun setIntroBackgroundColor(color: Color) {
_introOptions.update { it.copy(backgroundColor = color) }
@@ -619,10 +613,7 @@ class MainViewModel(
intro = _introOptions.value,
cover = _coverOptions.value,
quality = _quality.value,
- flags = ConverterFlags(
- isInterlacingFixEnabled = _isInterlacedFixEnabled.value,
- isVideoAvailableInInput = _source.value.mediaType == Source.MediaType.VIDEO
- ),
+ fixInterlaced = _isInterlacedFixEnabled.value,
output = _saveFile.value!!,
listener = { _conversion.value = ConversionStatus.InProgress(progress = it) }
)
@@ -672,6 +663,7 @@ class MainViewModel(
fun toggleSidePanel() {
if (!_isFullscreen.value && !_isMiniScreen.value) {
_isSidePanelDisplayed.value = !_isSidePanelDisplayed.value
+ updateWindowWidth(shouldAnimate = true)
}
}
@@ -687,9 +679,7 @@ class MainViewModel(
}
fun toggleMiniScreen() {
- if (_isFullscreen.value) {
- return
- }
+ if (_isFullscreen.value) return
if (!_isMiniScreen.value) {
wasSidePanelDisplayedBeforeChangingScreen = _isSidePanelDisplayed.value
_isSidePanelDisplayed.value = false
@@ -698,9 +688,18 @@ class MainViewModel(
if (!_isMiniScreen.value) {
_isSidePanelDisplayed.value = wasSidePanelDisplayedBeforeChangingScreen
}
+ updateWindowWidth(shouldAnimate = false)
}
fun takeScreenshot() {
+ if (!isScreenshotInputEnabled.value) {
+ return
+ }
+ coroutineScope.launch {
+ _isScreenshotInputActive.value = true
+ delay(400.milliseconds)
+ _isScreenshotInputActive.value = false
+ }
// Does it asynchronously because creating directories takes a little time
coroutineScope.launch {
// Makes sure the directories exist.
@@ -724,7 +723,6 @@ class MainViewModel(
fun toggleResume() {
mediaPlayer.toggleResume()
- _mediaInfo.update { it.copy(isResumed = !it.isResumed) }
}
fun setSeek(seek: Float) {
@@ -837,10 +835,15 @@ class MainViewModel(
}
private fun onSourceChanged() {
- if (_source.value.mediaType == Source.MediaType.VIDEO) {
- _aspectRatio.value = lastAspectRatio
- } else {
- _aspectRatio.value = AspectRatio.SOURCE
+ coroutineScope.launch {
+ // The aspect ratio is changed with a little delay
+ // so the existing display image is not distorted
+ delay(300.milliseconds)
+ if (_source.value.mediaType == Source.MediaType.VIDEO) {
+ _aspectRatio.value = lastAspectRatio
+ } else {
+ _aspectRatio.value = AspectRatio.SOURCE
+ }
}
_saveFile.update {
it
@@ -861,28 +864,4 @@ class MainViewModel(
_isAppExitConfirmDialogDisplayed.value = true
}
}
-
- private fun generateStaticDisplayImage(source: Source): ImageBitmap? {
- val path = (source as? Source.Local)?.path ?: Path("")
- return path
- .toFile()
- .runCatching(AudioFileIO::read)
- .getOrNull()
- ?.tag
- ?.firstArtwork
- ?.binaryData
- ?.inputStream()
- ?.use(::loadImageBitmap)
- ?: run {
- when (source.mediaType) {
- Source.MediaType.IMAGE -> decodeImage(
- path = path,
- mimeType = source.mimeType,
- desiredSizeIfVector = 512f
- )
- Source.MediaType.AUDIO -> defaultAudioImage
- else -> null
- }
- }
- }
}
diff --git a/src/main/kotlin/ir/mahozad/cutcon/Utilities.kt b/src/main/kotlin/ir/mahozad/cutcon/Utilities.kt
index 8a1a3f2..172c440 100644
--- a/src/main/kotlin/ir/mahozad/cutcon/Utilities.kt
+++ b/src/main/kotlin/ir/mahozad/cutcon/Utilities.kt
@@ -27,7 +27,6 @@ import java.awt.image.BufferedImage
import java.io.InputStream
import java.nio.file.Path
import java.time.LocalDate
-import java.util.*
import javax.imageio.ImageIO
import kotlin.io.path.*
import kotlin.math.roundToInt
@@ -44,6 +43,7 @@ private val hexFormat = HexFormat {
}
private val digitRegex = Regex("[۰-۹0-9٠-٩]") // Farsi | Latin | Arabic
private val numberRegex = Regex("${digitRegex.pattern}+")
+private val durationRegex = Regex("""^(\d{1,2}:){1,2}\d{1,2}$""")
private val ipRegex = Regex("""(${digitRegex.pattern}{1,3}\.){3}${digitRegex.pattern}{1,3}""")
private val dateDelimiterRegex = Regex("""[-و \t_.,،:;؛|/\\]""")
private val redundantDelimiterRegex = Regex("${dateDelimiterRegex.pattern}+")
@@ -101,21 +101,16 @@ fun parseMarkdownAsChangelog(
logger.info { "Parsed changelog" }
}
-fun Path.convertSvgToPng(desiredPngSize: Float? = null): Path? {
- return runCatching {
- val imageData = decodeImage(
- path = this,
- mimeType = "image/svg+xml",
- desiredSizeIfVector = desiredPngSize
- )?.toAwtImage()
- val imagePath = createTempFile(suffix = ".png")
- imagePath.outputStream().use { ImageIO.write(imageData, "PNG", it) }
- imagePath
- }
- .onSuccess { logger.info { "Converted $this to PNG in $it" } }
- .onFailure { logger.warn(it) { "Could not convert $this to PNG" } }
- .getOrNull()
+fun convertSvgToPng(path: Path, size: Float? = null): Path? = runCatching {
+ val imageData = decodeImage(path, size)?.toAwtImage()
+ val imagePath = createTempFile(suffix = ".png")
+ imagePath.outputStream().use { ImageIO.write(imageData, "PNG", it) }
+ imagePath
}
+ .onSuccess { logger.info { "Converted $path to PNG in $it" } }
+ .onFailure { logger.warn(it) { "Could not convert $path to PNG" } }
+ .getOrNull()
+
/**
* If changed the parameter from [Path] to [InputStream], pay attention to the following notes.
@@ -128,20 +123,15 @@ fun Path.convertSvgToPng(desiredPngSize: Float? = null): Path? {
*/
fun decodeImage(
path: Path,
- mimeType: String? = null,
- desiredSizeIfVector: Float? = null
+ sizeOverrideIfVector: Float? = null
): ImageBitmap? {
- val mimeTypeDetected = mimeType ?: path.detectMimeType()
- return if (mimeTypeDetected == "image/svg+xml") {
- // Catches exception thrown from stream or if it is .svgz as it is NOT supported by skia (yet)
- runCatching { path.inputStream().use { loadSvgAsBitmap(it, desiredSizeIfVector) } }.getOrNull()
- } else if (mimeTypeDetected?.startsWith("image/") == true) {
- // Catches exceptions thrown from stream or if image format is unsupported
- runCatching { path.inputStream().use { loadImageBitmap(it) } }.getOrNull()
+ val mimeType = path.detectMimeType()
+ return if (mimeType == "image/svg+xml") {
+ runCatching { path.inputStream().use { loadSvgAsBitmap(it, sizeOverrideIfVector) } }.getOrNull()
} else {
- null
+ runCatching { path.inputStream().use(::loadImageBitmap) }.getOrNull()
}.also {
- logger.info { "Decoded image $path" }
+ logger.info { "Decoded image $path as $it" }
}
}
@@ -207,8 +197,13 @@ fun String.normalizeDigits() = replace(numberRegex) { it.value.toLong().toString
fun String.substringBetween(l: String, r: String) = substringAfter(l).substringBefore(r)
fun String.toDuration(): Duration? {
- if (isEmpty()) return null
- val (s, m, h) = split(":").map(String::toInt).reversed() + 0 // Ensure contains hour
+ val (s, m, h) = this
+ .takeIf { it matches durationRegex }
+ ?.split(':')
+ ?.map(String::toInt)
+ ?.reversed()
+ ?.plus(0) // Ensures contains hour
+ ?: return null
return h.hours + m.minutes + s.seconds
}
@@ -220,13 +215,14 @@ fun Float.toQuality() = Quality
fun calculateMaxSizeInFrame(
frameWidth: Dp,
frameHeight: Dp,
+ displayDensity: Float,
desiredAspectRatio: Float
): DpSize {
val frameAspectRatio = (frameWidth / frameHeight)
val (width, height) = if (frameAspectRatio > desiredAspectRatio) {
- frameHeight * desiredAspectRatio to frameHeight
+ frameHeight * desiredAspectRatio / displayDensity to frameHeight
} else {
- frameWidth to frameWidth / desiredAspectRatio
+ frameWidth to frameWidth / desiredAspectRatio / displayDensity
}
return DpSize(width, height)
}
@@ -270,7 +266,7 @@ fun Flow.emitLatestEvery(
* See https://stackoverflow.com/q/5507565
*/
fun Path.detectMimeType(): String? {
- if (extension == "ts") return "video/mp2t"
+ if (extension.lowercase() == "ts") return "video/mp2t"
return runCatching(tika::detect)
.onSuccess { logger.info { "Detected mime type $it for $this" } }
.onFailure { logger.warn(it) { "Could not detect mime type of $this" } }
diff --git a/src/main/kotlin/ir/mahozad/cutcon/component/MediaPlayer.kt b/src/main/kotlin/ir/mahozad/cutcon/component/MediaPlayer.kt
index b63466e..35464d2 100644
--- a/src/main/kotlin/ir/mahozad/cutcon/component/MediaPlayer.kt
+++ b/src/main/kotlin/ir/mahozad/cutcon/component/MediaPlayer.kt
@@ -2,24 +2,29 @@ package ir.mahozad.cutcon.component
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asComposeImageBitmap
+import androidx.compose.ui.res.loadImageBitmap
import io.github.oshai.kotlinlogging.KotlinLogging.logger
import ir.mahozad.cutcon.BuildConfig
import ir.mahozad.cutcon.assetsPath
+import ir.mahozad.cutcon.decodeImage
import ir.mahozad.cutcon.defaultAudioVolume
import ir.mahozad.cutcon.defaultIsAudioMuted
+import ir.mahozad.cutcon.detectMimeType
import ir.mahozad.cutcon.model.Clip
import ir.mahozad.cutcon.model.Progress
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.*
+import org.jaudiotagger.audio.AudioFileIO
import org.jetbrains.skia.Bitmap
import org.jetbrains.skia.ColorAlphaType
import org.jetbrains.skia.ColorType
import org.jetbrains.skia.ImageInfo
import uk.co.caprica.vlcj.factory.discovery.NativeDiscovery
import uk.co.caprica.vlcj.factory.discovery.strategy.NativeDiscoveryStrategy
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventAdapter
+import uk.co.caprica.vlcj.player.base.State
import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface
import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurface
import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapters
@@ -28,20 +33,32 @@ import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCall
import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback
import uk.co.caprica.vlcj.player.embedded.videosurface.callback.format.RV32BufferFormat
import java.io.File
+import java.net.URI
import java.net.URL
import java.nio.ByteBuffer
+import java.nio.file.Path
import javax.swing.SwingUtilities
+import kotlin.io.path.Path
import kotlin.io.path.absolutePathString
import kotlin.io.path.div
import kotlin.math.roundToInt
+import kotlin.time.Duration.Companion.ZERO
import kotlin.time.Duration.Companion.milliseconds
import uk.co.caprica.vlcj.factory.MediaPlayerFactory as VlcMediaPlayerFactory
import uk.co.caprica.vlcj.player.base.MediaPlayer as VlcMediaPlayer
-import uk.co.caprica.vlcj.player.base.MediaPlayerEventAdapter as VlcMediaPlayerEventAdapter
interface MediaPlayer {
- val video: Flow
+
+ val output: Flow