ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '905c376e57cd0638d6670748a1d85d8550178a32' into beta

Browse Source
This commit is contained in:
Ali 2023-09-26 13:31:33 +04:00
commit 7afa98c52c
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m
View File

@ -138,6 +138,8 @@
_playerItemDisposable = [[SMetaDisposable alloc] init]; _playerItemDisposable = [[SMetaDisposable alloc] init];
_facesDisposable = [[SMetaDisposable alloc] init]; _facesDisposable = [[SMetaDisposable alloc] init];
_thumbnailsDisposable = [[SMetaDisposable alloc] init];
_videoDurationVar = [[SVariable alloc] init]; _videoDurationVar = [[SVariable alloc] init];
_videoDurationDisposable = [[SMetaDisposable alloc] init]; _videoDurationDisposable = [[SMetaDisposable alloc] init];

6
submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m
View File

@ -180,6 +180,9 @@ NSString *const TGMediaPickerPhotoStripCellKind = @"PhotoStripCell";
{ {
SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:video]; SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:video];
if (_adjustmentsDisposable == nil)
_adjustmentsDisposable = [[SMetaDisposable alloc] init];
__weak TGMediaPickerPhotoStripCell *weakSelf = self; __weak TGMediaPickerPhotoStripCell *weakSelf = self;
[_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next) [_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next)
{ {
@ -220,6 +223,9 @@ NSString *const TGMediaPickerPhotoStripCellKind = @"PhotoStripCell";
{ {
SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:asset]; SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:asset];
if (_adjustmentsDisposable == nil)
_adjustmentsDisposable = [[SMetaDisposable alloc] init];
__weak TGMediaPickerPhotoStripCell *weakSelf = self; __weak TGMediaPickerPhotoStripCell *weakSelf = self;
[_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next) [_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next)
{ {

4
submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift
View File

@ -753,9 +753,13 @@ public func legacyAssetPickerEnqueueMessages(context: AccountContext, account: A
} }
} }
let defaultPreset = TGMediaVideoConversionPreset(rawValue: UInt32(UserDefaults.standard.integer(forKey: "TG_preferredVideoPreset_v0")))
var preset: TGMediaVideoConversionPreset = TGMediaVideoConversionPresetCompressedMedium var preset: TGMediaVideoConversionPreset = TGMediaVideoConversionPresetCompressedMedium
if let selectedPreset = adjustments?.preset { if let selectedPreset = adjustments?.preset {
preset = selectedPreset preset = selectedPreset
} else if preset == TGMediaVideoConversionPresetCompressedDefault && defaultPreset != TGMediaVideoConversionPresetCompressedDefault {
preset = defaultPreset
} }
if asAnimation { if asAnimation {
preset = TGMediaVideoConversionPresetAnimation preset = TGMediaVideoConversionPresetAnimation