Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve timeline scrolling performance. #3

Merged
merged 10 commits into from Mar 18, 2019
Merged

Improve timeline scrolling performance. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
245d6f2
Slice up waveform drawing.
LumingYin Mar 18, 2019
f4e6a69
Paint by nudging by 1 point to remove gap.
LumingYin Mar 18, 2019
0461429
Re-enable dismantling process.
LumingYin Mar 18, 2019
b0bd702
Also attempt to cached video thumbnails.
LumingYin Mar 18, 2019
b4475dd
Further attempts at fixing the cache.
LumingYin Mar 18, 2019
dc594d1
The success rate of thumbnail captures seems to be a probability game.
LumingYin Mar 18, 2019
02c32ef
Significantly improved success rate of screen thumbnail captures!
LumingYin Mar 18, 2019
9493367
Fix deletions.
LumingYin Mar 18, 2019
f83001f
Fix crashes.
LumingYin Mar 18, 2019
4025ef0
Update appcast
LumingYin Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Caption/Others/Info.plist
View file
Open in desktop
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2019.03.18.3</string>
<string>2019.03.18.4</string>
<key>CFBundleVersion</key>
<string>2019.03.18.3</string>
<string>2019.03.18.4</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
7 changes: 7 additions & 0 deletions Caption/Others/NSObject+KVO.h
View file
Open in desktop
@@ -1,8 +1,15 @@
@import Foundation;
@import AppKit;

@interface NSObject (KVO)

- (void)safelyRemoveObserver:(nonnull NSObject *)observer forKeyPath:(nonnull NSString *)keyPath;
- (NSURL*)applicationDataDirectory;

@end

@interface NSImage(saveAsJpegWithName)
- (void) saveAsJpegWithName:(NSString*) fileName;
- (void)saveAsFileWithType:(NSBitmapImageFileType)type withName:(NSString *)fileName;
@end

18 changes: 18 additions & 0 deletions Caption/Others/NSObject+KVO.m
View file
Open in desktop
@@ -1,5 +1,23 @@
#import "NSObject+KVO.h"

@implementation NSImage(saveAsJpegWithName)

- (void)saveAsJpegWithName:(NSString*) fileName
{
[self saveAsFileWithType:NSJPEGFileType withName:fileName];
}

- (void)saveAsFileWithType:(NSBitmapImageFileType)type withName:(NSString *)fileName {
// Cache the reduced image
NSData *imageData = [self TIFFRepresentation];
NSBitmapImageRep *imageRep = [NSBitmapImageRep imageRepWithData:imageData];
NSDictionary *imageProps = [NSDictionary dictionaryWithObject:[NSNumber numberWithFloat:1.0] forKey:NSImageCompressionFactor];
imageData = [imageRep representationUsingType:type properties:imageProps];
[imageData writeToFile:[fileName stringByExpandingTildeInPath] atomically:NO];
}
@end


@implementation NSObject (KVO)

- (void)safelyRemoveObserver:(nonnull NSObject *)observer forKeyPath:(nonnull NSString *)keyPath
Expand Down
23 changes: 7 additions & 16 deletions Caption/Views/Base.lproj/Main.storyboard
View file
Open in desktop
Expand Up @@ -1401,11 +1401,11 @@ CA
<scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QEG-SY-Hn2" customClass="QuickCaptionScrollView">
<rect key="frame" x="0.0" y="0.0" width="648" height="230"/>
<clipView key="contentView" id="k0n-uO-2Ef">
<rect key="frame" x="0.0" y="0.0" width="648" height="230"/>
<rect key="frame" x="0.0" y="0.0" width="648" height="215"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mHu-9K-0O1" customClass="TimelineOverallView" customModule="Quick_Caption" customModuleProvider="target">
<rect key="frame" x="0.0" y="-2416" width="591" height="213"/>
<rect key="frame" x="0.0" y="-2431" width="591" height="213"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K4d-N4-mRe" customClass="VideoPreviewContainerView" customModule="Quick_Caption" customModuleProvider="target">
Expand All @@ -1416,20 +1416,12 @@ CA
<rect key="frame" x="8" y="147" width="521" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</customView>
<box fixedFrame="YES" boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="fCx-cJ-p9f">
<rect key="frame" x="8" y="75" width="0.0" height="64"/>
<box fixedFrame="YES" boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="fCx-cJ-p9f" customClass="CaptionWaveformBox" customModule="Quick_Caption" customModuleProvider="target">
<rect key="frame" x="8" y="75" width="50" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<view key="contentView" ambiguous="YES" id="oVo-bP-cpU">
<rect key="frame" x="0.0" y="1" width="0.0" height="62"/>
<rect key="frame" x="1" y="1" width="48" height="62"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P2a-iw-9CG">
<rect key="frame" x="0.0" y="-1" width="521" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="DTT-i0-VKS"/>
<color key="contentTintColor" name="systemGreenColor" catalog="System" colorSpace="catalog"/>
</imageView>
</subviews>
</view>
<color key="fillColor" name="audioTrackBG"/>
</box>
Expand Down Expand Up @@ -1475,10 +1467,10 @@ CA
<constraint firstAttribute="height" constant="230" id="V95-Hy-NGv"/>
</constraints>
<scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.11764705882352941" horizontal="YES" id="wxD-Wq-Vsv">
<rect key="frame" x="0.0" y="214" width="648" height="16"/>
<rect key="frame" x="0.0" y="215" width="648" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Ilf-GR-hhe">
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="Ilf-GR-hhe">
<rect key="frame" x="-100" y="-100" width="15" height="213"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
Expand Down Expand Up @@ -1589,7 +1581,6 @@ CA
<outlet property="timelineScrollView" destination="QEG-SY-Hn2" id="6Bt-BF-igB"/>
<outlet property="videoPreviewContainerView" destination="K4d-N4-mRe" id="O3j-UH-f7o"/>
<outlet property="volumeSlider" destination="vX9-SF-5ld" id="MxB-T9-bfn"/>
<outlet property="waveformImageView" destination="P2a-iw-9CG" id="sGU-RP-60h"/>
<outlet property="waveformPreviewContainerBox" destination="fCx-cJ-p9f" id="AHR-c6-rlc"/>
</connections>
</viewController>
Expand Down
23 changes: 23 additions & 0 deletions Caption/Views/CaptionWaveformBox.swift
View file
Open in desktop
@@ -0,0 +1,23 @@
//
// CaptionWaveformBox.swift
// Quick Caption
//
// Created by Blue on 3/18/19.
// Copyright © 2019 Bright. All rights reserved.
//

import Cocoa

class CaptionWaveformBox: NSBox {
var guid: String?

func addSubWaveformView(capturedGUID: String?, imageView: NSImageView) {
if let cap = capturedGUID {
if (self.guid == cap) {
self.contentView!.addSubview(imageView)
} else {
print("Rejecting waveform from GUID:\(capturedGUID)")
}
}
}
}