Allowing up to 5.0x toggle playback speed. Changes to the toggle speed / auto-apply settings should now apply without resetting the video player. Changing the default toggle speed to 2.0x for new installations.

Author: joshuaseltzer

YTHFSPrefsManager.h

@@ -28,7 +28,19 @@ typedef enum YTHFSPlaybackRateOption : NSInteger {
     kYTHFSPlaybackRateOption125,
     kYTHFSPlaybackRateOption150,
     kYTHFSPlaybackRateOption175,
-    kYTHFSPlaybackRateOption200
+    kYTHFSPlaybackRateOption200,
+    kYTHFSPlaybackRateOption225,
+    kYTHFSPlaybackRateOption250,
+    kYTHFSPlaybackRateOption275,
+    kYTHFSPlaybackRateOption300,
+    kYTHFSPlaybackRateOption325,
+    kYTHFSPlaybackRateOption350,
+    kYTHFSPlaybackRateOption375,
+    kYTHFSPlaybackRateOption400,
+    kYTHFSPlaybackRateOption425,
+    kYTHFSPlaybackRateOption450,
+    kYTHFSPlaybackRateOption475,
+    kYTHFSPlaybackRateOption500
 } YTHFSPlaybackRateOption;
 
 // manager that manages the preferences for the tweak

YTHFSPrefsManager.m

@@ -22,7 +22,7 @@
 #define kYTHFSDefaultHoldGestureEnabled             NO
 #define kYTHFSDefaultDisableStockGesturesEnabled    NO
 #define kYTHFSDefaultAutoApplyRateEnabled           NO
-#define kYTHFSDefaultTogglePlaybackRate             1.5
+#define kYTHFSDefaultTogglePlaybackRate             2.0
 #define kYTHFSDefaultHoldDuration                   1.0
 
 // create static variables that will be determined once
@@ -110,7 +110,7 @@ + (YTHFSPlaybackRateOption)playbackRateOptionForValue:(CGFloat)value
     if (value > 1.00) {
         ++playbackRateOptionOffset;
     }
-    return MAX(MIN((NSInteger)(value / 0.25) - playbackRateOptionOffset, kYTHFSPlaybackRateOption200), kYTHFSPlaybackRateOption025);
+    return MAX(MIN((NSInteger)(value / 0.25) - playbackRateOptionOffset, kYTHFSPlaybackRateOption500), kYTHFSPlaybackRateOption025);
 }
 
 // return the appropriate string representation of the hold duration for the given value

YTHFSSettings.x

@@ -88,7 +88,7 @@
         selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) {
             // create a new section item for each toggle rate option that the user can select
             NSMutableArray *playbackRateSectionRows = [NSMutableArray array];
-            for (NSInteger currentRow = kYTHFSPlaybackRateOption025; currentRow <= kYTHFSPlaybackRateOption200; ++currentRow) {
+            for (NSInteger currentRow = kYTHFSPlaybackRateOption025; currentRow <= kYTHFSPlaybackRateOption500; ++currentRow) {
                 CGFloat playbackRateForRow = [YTHFSPrefsManager playbackRateValueForOption:currentRow];
                 YTSettingsSectionItem *rateSection = [YTSettingsSectionItemClass checkmarkItemWithTitle:[YTHFSPrefsManager playbackRateStringForValue:playbackRateForRow]
                     selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) {

YTHFSTweak.x

@@ -13,6 +13,9 @@
 // the long press gesture that will be created and added to the player view
 @property (nonatomic, retain) UILongPressGestureRecognizer *YTHFSLongPressGesture;
 
+// boolean that determines if the auto-apply feature needs to be invoked for the current video
+@property (nonatomic, assign) BOOL YTHFSNeedsAutoApply;
+
 // switch between the user-selected playback rate and the normal playback rate, invoked either via the hold gesture or
 // automatically when the video starts (dependent on settings)
 - (void)YTHFSSwitchPlaybackRate;
@@ -39,11 +42,6 @@
 #define kYTHFSNumTouchesRequired        1
 #define kYTHFSAllowableMovement         50
 
-// the static variables to keep track of the settings which shall persist until the YTPlayerViewController is recreated
-static CGFloat sYTHFSTogglePlaybackRate;
-static BOOL sYTHFSHapticFeedbackEnabled;
-static BOOL sYTHFSAutoApplyRateEnabled;
-
 // enum to define the direction of the playback rate feedback indicator
 typedef enum YTHFSFeedbackDirection : NSInteger {
     kYTHFSFeedbackDirectionForward,
@@ -56,12 +54,8 @@ typedef enum YTHFSFeedbackDirection : NSInteger {
 - (void)watchController:(YTWatchController *)watchController didSetPlayerViewController:(YTPlayerViewController *)playerViewController
 {
     if (playerViewController) {
-        // grab the state of the settings for this instance of the player view controller
-        sYTHFSTogglePlaybackRate = [YTHFSPrefsManager togglePlaybackRate];
-        sYTHFSHapticFeedbackEnabled = [YTHFSPrefsManager hapticFeedbackEnabled];
-
         // check to see if the toggle rate should automatically be applied when the video starts
-        sYTHFSAutoApplyRateEnabled = [YTHFSPrefsManager autoApplyRateEnabled];
+        playerViewController.YTHFSNeedsAutoApply = [YTHFSPrefsManager autoApplyRateEnabled];
 
         // add a long press gesture to configure the playback rate
         if ([YTHFSPrefsManager holdGestureEnabled]) {
@@ -111,6 +105,9 @@ typedef enum YTHFSFeedbackDirection : NSInteger {
 // the long press gesture that will be created and added to the player view
 %property (nonatomic, retain) UILongPressGestureRecognizer *YTHFSLongPressGesture;
 
+// boolean that determines if the auto-apply feature needs to be invoked for the current video
+%property (nonatomic, assign) BOOL YTHFSNeedsAutoApply;
+
 %new
 - (void)YTHFSHandleLongPressGesture:(UILongPressGestureRecognizer *)longPressGestureRecognizer
 {
@@ -128,11 +125,12 @@ typedef enum YTHFSFeedbackDirection : NSInteger {
     NSString *feedbackTitle = nil;
     YTHFSFeedbackDirection feedbackDirection = kYTHFSFeedbackDirectionForward;
     CGFloat currentPlaybackRate = [self currentPlaybackRateForVarispeedSwitchController:self.varispeedController];
-    if (currentPlaybackRate != sYTHFSTogglePlaybackRate) {
+    CGFloat togglePlaybackRate = [YTHFSPrefsManager togglePlaybackRate];
+    if (currentPlaybackRate != togglePlaybackRate) {
         // change to the toggle rate if the current playback rate is any other speed
-        [self varispeedSwitchController:self.varispeedController didSelectRate:sYTHFSTogglePlaybackRate];
-        feedbackTitle = [YTHFSPrefsManager playbackRateStringForValue:sYTHFSTogglePlaybackRate];
-        if (currentPlaybackRate > sYTHFSTogglePlaybackRate) {
+        [self varispeedSwitchController:self.varispeedController didSelectRate:togglePlaybackRate];
+        feedbackTitle = [YTHFSPrefsManager playbackRateStringForValue:togglePlaybackRate];
+        if (currentPlaybackRate > togglePlaybackRate) {
             feedbackDirection = kYTHFSFeedbackDirectionBackward;
         }
     } else {
@@ -157,7 +155,7 @@ typedef enum YTHFSFeedbackDirection : NSInteger {
     }
 
     // fire off haptic feedback to indicate that the playback rate changed (only applies to supported devices if enabled)
-    if (sYTHFSHapticFeedbackEnabled) {
+    if ([YTHFSPrefsManager hapticFeedbackEnabled]) {
         UINotificationFeedbackGenerator *feedbackGenerator = [[UINotificationFeedbackGenerator alloc] init];
         [feedbackGenerator notificationOccurred:UINotificationFeedbackTypeSuccess];
         feedbackGenerator = nil;
@@ -169,14 +167,14 @@ typedef enum YTHFSFeedbackDirection : NSInteger {
 {
     %orig;
 
-    if (sYTHFSAutoApplyRateEnabled && [self.contentVideoPlayerOverlay isKindOfClass:objc_getClass("YTMainAppVideoPlayerOverlayViewController")]) {
+    if ([YTHFSPrefsManager autoApplyRateEnabled] && self.YTHFSNeedsAutoApply && [self.contentVideoPlayerOverlay isKindOfClass:objc_getClass("YTMainAppVideoPlayerOverlayViewController")]) {
         YTMainAppVideoPlayerOverlayViewController *overlayViewController = (YTMainAppVideoPlayerOverlayViewController *)self.contentVideoPlayerOverlay;
         if (overlayViewController.isVarispeedAvailable) {
             // regardless of the current playback rate, at this point we know that the toggle rate will be applied
-            sYTHFSAutoApplyRateEnabled = NO;
+            self.YTHFSNeedsAutoApply = NO;
 
             // compare whether or not the current playback rate is what the user selected and if not, change to it now
-            if ([self currentPlaybackRateForVarispeedSwitchController:self.varispeedController] != sYTHFSTogglePlaybackRate) {
+            if ([self currentPlaybackRateForVarispeedSwitchController:self.varispeedController] != [YTHFSPrefsManager togglePlaybackRate]) {
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [self YTHFSSwitchPlaybackRate];
                 });

control

@@ -1,6 +1,6 @@
 Package: com.joshuaseltzer.ytholdforspeed
 Name: YTHoldForSpeed
-Version: 1.1.2
+Version: 1.2.0
 Architecture: iphoneos-arm
 Description: Tap and hold on the YouTube video player to toggle a selected playback speed. Preferences for the tweak are configured within the YouTube app.
 Maintainer: Joshua Seltzer <joshua.seltzer90@gmail.com>