Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin
2020-06-19 00:34:05 +03:00
67 changed files with 3305 additions and 1472 deletions

View File

@@ -687,6 +687,9 @@ typedef enum
if (!_capturePipeline.isRecording)
return false;
if (_capturePipeline.videoDuration < 0.33)
return false;
if ([self.view.window isKindOfClass:[TGVideoMessageCaptureControllerWindow class]]) {
((TGVideoMessageCaptureControllerWindow *)self.view.window).locked = false;
}
@@ -1049,6 +1052,7 @@ typedef enum
{
[_controlsView recordingStarted];
[_controlsView setDurationString:@"0:00,00"];
self.onDuration(0);
_audioRecordingDurationSeconds = 0;
_audioRecordingDurationMilliseconds = 0.0;
@@ -1082,6 +1086,7 @@ typedef enum
}
else
{
self.onDuration(recordingDuration);
_audioRecordingDurationSeconds = currentDurationSeconds;
_audioRecordingDurationMilliseconds = currentDurationMilliseconds;
[_controlsView setDurationString:[[NSString alloc] initWithFormat:@"%d:%02d,%02d", (int)_audioRecordingDurationSeconds / 60, (int)_audioRecordingDurationSeconds % 60, (int)_audioRecordingDurationMilliseconds]];