Rubber Band DSP: Make it possible to disable it

And disable it by default in new installations, otherwise leave the setting alone. The disablement setting is shared with the engine setting, so the default should not really change anything, except for new installs. Also, the time/pitch shifting dialog disables itself and displays an obvious notice button, which opens the Rubber Band settings. Signed-off-by: Christopher Snowhill <[email protected]>
losnoco · Feb 13, 2025 · d17388e · d17388e
1 parent b913d42
commit d17388e
Show file tree

Hide file tree

Showing 18 changed files with 272 additions and 78 deletions.
diff --git a/Application/AppController.h b/Application/AppController.h
@@ -103,6 +103,9 @@
 - (void)showPathSuggester;
 + (void)globalShowPathSuggester;
 
+- (IBAction)showRubberbandSettings:(id)sender;
+- (void)globalShowRubberbandSettings;
+
 @property NSWindow *mainWindow;
 @property NSWindow *miniWindow;
 

diff --git a/Application/AppController.m b/Application/AppController.m
@@ -11,6 +11,7 @@
 #import "PlaylistEntry.h"
 #import "PlaylistLoader.h"
 #import "PlaylistView.h"
+#import "RubberbandEngineTransformer.h"
 #import "SQLiteStore.h"
 #import "SandboxBroker.h"
 #import "SpotlightWindowController.h"
@@ -71,6 +72,14 @@ + (void)initialize {
 	NSValueTransformer *numberHertzToStringTransformer = [[NumberHertzToStringTransformer alloc] init];
 	[NSValueTransformer setValueTransformer:numberHertzToStringTransformer
 									forName:@"NumberHertzToStringTransformer"];
+
+	NSValueTransformer *rubberbandEngineEnabledTransformer = [[RubberbandEngineEnabledTransformer alloc] init];
+	[NSValueTransformer setValueTransformer:rubberbandEngineEnabledTransformer
+									forName:@"RubberbandEngineEnabledTransformer"];
+
+	NSValueTransformer *rubberbandEngineHiddenTransformer = [[RubberbandEngineHiddenTransformer alloc] init];
+	[NSValueTransformer setValueTransformer:rubberbandEngineHiddenTransformer
+									forName:@"RubberbandEngineHiddenTransformer"];
 }
 - (id)init {
 	self = [super init];
@@ -801,4 +810,12 @@ + (void)globalShowPathSuggester {
 	[kAppController showPathSuggester];
 }
 
+- (void)showRubberbandSettings:(id)sender {
+	[preferencesController showRubberbandSettings:sender];
+}
+
++ (void)globalShowRubberbandSettings {
+	[kAppController showRubberbandSettings:kAppController];
+}
+
 @end
diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
@@ -100,7 +100,7 @@ - (void)initDefaults {
 		                                  @"volumeLimit": @(YES),
 		                                  @"enableHrtf": @(NO),
 		                                  @"enableHeadTracking": @(NO),
-		                                  @"rubberbandEngine": @"faster",
+		                                  /*@"rubberbandEngine": @"faster",*/
 		                                  @"rubberbandTransients": @"crisp",
 		                                  @"rubberbandDetector": @"compound",
 		                                  @"rubberbandPhase": @"laminar",

diff --git a/Audio/Chain/DSP/DSPRubberbandNode.m b/Audio/Chain/DSP/DSPRubberbandNode.m
@@ -16,6 +16,8 @@
 static void * kDSPRubberbandNodeContext = &kDSPRubberbandNodeContext;
 
 @implementation DSPRubberbandNode {
+	BOOL enableRubberband;
+
 	RubberBandState ts;
 	RubberBandOptions tslastoptions, tsnewoptions;
 	size_t blockSize, toDrop, samplesBuffered, tschannels;
@@ -44,6 +46,8 @@ - (id _Nullable)initWithController:(id _Nonnull)c previous:(id _Nullable)p laten
 	self = [super initWithController:c previous:p latency:latency];
 	if(self) {
 		NSUserDefaults *defaults = [[NSUserDefaultsController sharedUserDefaultsController] defaults];
+		enableRubberband = ![[defaults stringForKey:@"rubberbandEngine"] isEqualToString:@"disabled"];
+
 		pitch = [defaults doubleForKey:@"pitch"];
 		tempo = [defaults doubleForKey:@"tempo"];
 
@@ -106,7 +110,9 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 		tempo = [defaults doubleForKey:@"tempo"];
 		tsapplynewoptions = YES;
 	} else if([[keyPath substringToIndex:17] isEqualToString:@"values.rubberband"]) {
-		if(ts) {
+		NSUserDefaults *defaults = [[NSUserDefaultsController sharedUserDefaultsController] defaults];
+		enableRubberband = ![[defaults stringForKey:@"rubberbandEngine"] isEqualToString:@"disabled"];
+		if(enableRubberband && ts) {
 			RubberBandOptions options = [self getRubberbandOptions];
 			RubberBandOptions changed = options ^ tslastoptions;
 			if(changed) {
@@ -348,7 +354,9 @@ - (void)process {
 				[self writeChunk:chunk];
 				chunk = nil;
 			}
-			if(tsrestartengine) {
+			if(!enableRubberband && ts) {
+				[self fullShutdown];
+			} else if(tsrestartengine) {
 				[self fullShutdown];
 			} else if(tsapplynewoptions) {
 				[self partialInit];
@@ -373,7 +381,8 @@ - (AudioChunk *)convert {
 		return nil;
 	}
 
-	if(!ts || memcmp(&inputFormat, &lastInputFormat, sizeof(inputFormat)) != 0 ||
+	if((enableRubberband && !ts) ||
+	   memcmp(&inputFormat, &lastInputFormat, sizeof(inputFormat)) != 0 ||
 	   inputChannelConfig != lastInputChannelConfig) {
 		lastInputFormat = inputFormat;
 		lastInputChannelConfig = inputChannelConfig;
@@ -384,6 +393,11 @@ - (AudioChunk *)convert {
 		}
 	}
 
+	if(!ts) {
+		processEntered = NO;
+		return [self readChunk:4096];
+	}
+
 	size_t samplesToProcess = rubberband_get_samples_required(ts);
 	if(samplesToProcess > blockSize)
 		samplesToProcess = blockSize;