cocoaui: cleanup delegate conformance

DeaDBeeF-Player · Nov 19, 2023 · 88bbd8b · 88bbd8b
1 parent 2dd8d3e
commit 88bbd8b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/plugins/cocoaui/ConverterWindowController.m b/plugins/cocoaui/ConverterWindowController.m
@@ -33,7 +33,7 @@
 extern DB_functions_t *deadbeef;
 static NSString *default_format = @"[%tracknumber%. ][%artist% - ]%title%";
 
-@interface ConverterWindowController () <ScriptableSelectDelegate,ScriptableItemDelegate,NSControlTextEditingDelegate>
+@interface ConverterWindowController () <ScriptableSelectDelegate,NSControlTextEditingDelegate>
 
 @property (nonatomic) ddb_converter_t *converter_plugin;
 
@@ -121,8 +121,7 @@ - (void)windowDidLoad {
     self.dspSelectViewController.view.frame = self.dspPresetSelectorContainer.bounds;
     [_dspPresetSelectorContainer addSubview:self.dspSelectViewController.view];
     self.dspSelectViewController.dataSource = self.dspPresetsDataSource;
-    self.dspSelectViewController.scriptableItemDelegate = self;
-    self.dspSelectViewController.scriptableSelectDelegate = self;
+    self.dspSelectViewController.delegate = self;
     self.dspSelectViewController.errorViewer = ScriptableErrorViewer.sharedInstance;
 
     char dsp_preset_name[100];
@@ -139,8 +138,7 @@ - (void)windowDidLoad {
     self.encoderSelectViewController.view.frame = self.encoderPresetSelectorContainer.bounds;
     [self.encoderPresetSelectorContainer addSubview:self.encoderSelectViewController.view];
     self.encoderSelectViewController.dataSource = self.encoderPresetsDataSource;
-    self.encoderSelectViewController.scriptableItemDelegate = self;
-    self.encoderSelectViewController.scriptableSelectDelegate = self;
+    self.encoderSelectViewController.delegate = self;
     self.encoderSelectViewController.errorViewer = ScriptableErrorViewer.sharedInstance;
 
     char enc_preset_name[100];
@@ -617,8 +615,6 @@ - (void)scriptableSelectItemSelected:(nonnull scriptableItem_t *)item {
     }
 }
 
-#pragma mark - ScriptableItemDelegate
-
 - (void)scriptableItemDidChange:(scriptableItem_t * _Nonnull)scriptable change:(ScriptableItemChange)change {
     if (scriptable == scriptableEncoderRoot(scriptableRootShared())) {
         NSInteger selectedEncPresetIndex = self.encoderSelectViewController.indexOfSelectedItem;

diff --git a/plugins/cocoaui/MainWindowController.m b/plugins/cocoaui/MainWindowController.m
@@ -40,7 +40,7 @@
 
 extern DB_functions_t *deadbeef;
 
-@interface MainWindowController () <NSMenuDelegate,DeletePlaylistConfirmationControllerDelegate,ScriptableSelectDelegate,ScriptableItemDelegate> {
+@interface MainWindowController () <NSMenuDelegate,DeletePlaylistConfirmationControllerDelegate,ScriptableSelectDelegate> {
     NSTimer *_updateTimer;
     char *_titlebar_playing_script;
     char *_titlebar_playing_subtitle_script;
@@ -130,8 +130,7 @@ - (void)windowDidLoad {
 
     // preset list and browse button
     self.tfQuerySelectViewController = [ScriptableSelectViewController new];
-    self.tfQuerySelectViewController.scriptableItemDelegate = self;
-    self.tfQuerySelectViewController.scriptableSelectDelegate = self;
+    self.tfQuerySelectViewController.delegate = self;
     self.tfQuerySelectViewController.view.frame = _tfQueryContainer.bounds;
     [_tfQueryContainer addSubview:self.tfQuerySelectViewController.view];
     self.tfQuerySelectViewController.errorViewer = ScriptableErrorViewer.sharedInstance;
@@ -539,8 +538,6 @@ - (void)deletePlaylistDone:(DeletePlaylistConfirmationController *)controller {
 - (void)scriptableSelectItemSelected:(scriptableItem_t *)item {
 }
 
-#pragma mark - ScriptableItemDelegate
-
 - (void)scriptableItemDidChange:(scriptableItem_t *)scriptable change:(ScriptableItemChange)change {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self.tfQuerySelectViewController reloadData];

diff --git a/plugins/cocoaui/Preferences/DspPreferencesViewController.m b/plugins/cocoaui/Preferences/DspPreferencesViewController.m
@@ -62,10 +62,9 @@ - (void)viewDidLoad {
 
     // preset list and browse button
     self.dspSelectViewController = [ScriptableSelectViewController new];
-    self.dspSelectViewController.scriptableItemDelegate = self;
+    self.dspSelectViewController.delegate = self;
     self.dspSelectViewController.view.frame = _dspPresetSelectorContainer.bounds;
     [_dspPresetSelectorContainer addSubview:self.dspSelectViewController.view];
-    self.dspSelectViewController.scriptableSelectDelegate = self;
     self.dspSelectViewController.errorViewer = ScriptableErrorViewer.sharedInstance;
     self.dspSelectViewController.dataSource = self.dspPresetsDataSource;
 
@@ -130,6 +129,7 @@ - (IBAction)presetNameCancel:(id)sender {
 
 #pragma mark - ScriptableItemDelegate
 
+// NOTE this method is reused for 2 different delegates
 - (void)scriptableItemDidChange:(scriptableItem_t *)scriptable change:(ScriptableItemChange)change {
     if (scriptable == self.dspChainDataSource.scriptable
         || scriptableItemIndexOfChild(self.dspChainDataSource.scriptable, scriptable) >= 0) {

diff --git a/plugins/cocoaui/Scriptable/ScriptableSelectViewController.h b/plugins/cocoaui/Scriptable/ScriptableSelectViewController.h
@@ -17,14 +17,14 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol ScriptableSelectDelegate
 
 - (void)scriptableSelectItemSelected:(scriptableItem_t *)item;
+- (void)scriptableItemDidChange:(scriptableItem_t *_Nonnull)scriptable change:(ScriptableItemChange)change;
 
 @end
 
 @interface ScriptableSelectViewController : NSViewController
 
 @property (nonatomic,strong) IBOutlet ScriptableTableDataSource *dataSource;
-@property (weak) NSObject<ScriptableItemDelegate> *scriptableItemDelegate;
-@property (weak) NSObject<ScriptableSelectDelegate> *scriptableSelectDelegate;
+@property (weak) NSObject<ScriptableSelectDelegate> *delegate;
 @property (weak) NSObject<ScriptableErrorViewer> *errorViewer;
 @property scriptableModel_t *scriptableModel;
 

diff --git a/plugins/cocoaui/Scriptable/ScriptableSelectViewController.m b/plugins/cocoaui/Scriptable/ScriptableSelectViewController.m
@@ -33,7 +33,7 @@ - (void)setDataSource:(ScriptableTableDataSource *)dataSource {
 - (IBAction)nameSelectedAction:(NSPopUpButton *)sender {
     NSUInteger index = sender.indexOfSelectedItem;
     [self updateModelFromCurrent];
-    [self.scriptableSelectDelegate scriptableSelectItemSelected:scriptableItemChildAtIndex(self.dataSource.scriptable, (unsigned int)index)];
+    [self.delegate scriptableSelectItemSelected:scriptableItemChildAtIndex(self.dataSource.scriptable, (unsigned int)index)];
 }
 
 - (void)initNodeEditorWindowController {
@@ -148,7 +148,7 @@ - (void)setScriptableModel:(scriptableModel_t *)scriptableModel {
 
 - (void)scriptableItemDidChange:(scriptableItem_t *)scriptable change:(ScriptableItemChange)change {
     [self updateModelFromCurrent];
-    [self.scriptableItemDelegate scriptableItemDidChange:scriptable change:change];
+    [self.delegate scriptableItemDidChange:scriptable change:change];
 }
 
 @end