mirror of
https://github.com/TelegramMessenger/Telegram-iOS.git
synced 2026-07-06 03:33:41 +02:00
Various fixes
This commit is contained in:
parent
9453deaae1
commit
c8e3195daa
3 changed files with 12 additions and 0 deletions
|
|
@ -138,6 +138,8 @@
|
|||
_playerItemDisposable = [[SMetaDisposable alloc] init];
|
||||
_facesDisposable = [[SMetaDisposable alloc] init];
|
||||
|
||||
_thumbnailsDisposable = [[SMetaDisposable alloc] init];
|
||||
|
||||
_videoDurationVar = [[SVariable alloc] init];
|
||||
_videoDurationDisposable = [[SMetaDisposable alloc] init];
|
||||
|
||||
|
|
|
|||
|
|
@ -180,6 +180,9 @@ NSString *const TGMediaPickerPhotoStripCellKind = @"PhotoStripCell";
|
|||
{
|
||||
SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:video];
|
||||
|
||||
if (_adjustmentsDisposable == nil)
|
||||
_adjustmentsDisposable = [[SMetaDisposable alloc] init];
|
||||
|
||||
__weak TGMediaPickerPhotoStripCell *weakSelf = self;
|
||||
[_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next)
|
||||
{
|
||||
|
|
@ -220,6 +223,9 @@ NSString *const TGMediaPickerPhotoStripCellKind = @"PhotoStripCell";
|
|||
{
|
||||
SSignal *adjustmentsSignal = [self.editingContext adjustmentsSignalForItem:asset];
|
||||
|
||||
if (_adjustmentsDisposable == nil)
|
||||
_adjustmentsDisposable = [[SMetaDisposable alloc] init];
|
||||
|
||||
__weak TGMediaPickerPhotoStripCell *weakSelf = self;
|
||||
[_adjustmentsDisposable setDisposable:[adjustmentsSignal startStrictWithNext:^(TGVideoEditAdjustments *next)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -749,9 +749,13 @@ public func legacyAssetPickerEnqueueMessages(context: AccountContext, account: A
|
|||
}
|
||||
}
|
||||
|
||||
let defaultPreset = TGMediaVideoConversionPreset(rawValue: UInt32(UserDefaults.standard.integer(forKey: "TG_preferredVideoPreset_v0")))
|
||||
|
||||
var preset: TGMediaVideoConversionPreset = TGMediaVideoConversionPresetCompressedMedium
|
||||
if let selectedPreset = adjustments?.preset {
|
||||
preset = selectedPreset
|
||||
} else if preset == TGMediaVideoConversionPresetCompressedDefault && defaultPreset != TGMediaVideoConversionPresetCompressedDefault {
|
||||
preset = defaultPreset
|
||||
}
|
||||
if asAnimation {
|
||||
preset = TGMediaVideoConversionPresetAnimation
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue