From f09022693a6f14191730ee17101e88026f930068 Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Mon, 14 Feb 2022 16:58:03 -0800
Subject: [PATCH] Preferences: Got rid of appcast selection

There is only one appcast to choose from, and it has been this way for
quite some time now, so simply make it final.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
---
 .../Preferences/AppcastArrayController.h      | 14 -------
 .../Preferences/AppcastArrayController.m      | 32 ---------------
 .../Preferences/Base.lproj/Preferences.xib    | 41 +------------------
 .../Preferences.xcodeproj/project.pbxproj     |  6 ---
 4 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 Preferences/Preferences/AppcastArrayController.h
 delete mode 100644 Preferences/Preferences/AppcastArrayController.m

diff --git a/Preferences/Preferences/AppcastArrayController.h b/Preferences/Preferences/AppcastArrayController.h
deleted file mode 100644
index ee86bbc9c..000000000
--- a/Preferences/Preferences/AppcastArrayController.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  AppcastArrayController.h
-//  General
-//
-//  Created by Vincent Spader on 5/19/07.
-//  Copyright 2007 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface AppcastArrayController : NSArrayController {
-}
-
-@end
diff --git a/Preferences/Preferences/AppcastArrayController.m b/Preferences/Preferences/AppcastArrayController.m
deleted file mode 100644
index 48d0e1b6a..000000000
--- a/Preferences/Preferences/AppcastArrayController.m
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  AppcastArrayController.m
-//  General
-//
-//  Created by Vincent Spader on 5/19/07.
-//  Copyright 2007 __MyCompanyName__. All rights reserved.
-//
-
-#import "AppcastArrayController.h"
-
-@implementation AppcastArrayController
-
-- (void)awakeFromNib {
-	[self removeObjects:[self arrangedObjects]];
-
-	//[self addObject:
-	// [NSDictionary dictionaryWithObjectsAndKeys:
-	//  NSLocalizedStringFromTableInBundle(@"Stable", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"http://mamburu.net/cog/stable.xml", @"url",nil]];
-
-	//      [self addObject:
-	//              [NSDictionary dictionaryWithObjectsAndKeys:
-	//                      NSLocalizedStringFromTableInBundle(@"Unstable", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"http://cogx.org/appcast/unstable.xml", @"url",nil]];
-
-	//[self addObject:
-	// [NSDictionary dictionaryWithObjectsAndKeys:
-	//  NSLocalizedStringFromTableInBundle(@"Nightly", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"http://mamburu.net/cog/nightly.xml", @"url",nil]];
-
-	[self addObject:
-	 @{@"name": NSLocalizedStringFromTableInBundle(@"cog.losno.co wheneverly", nil, [NSBundle bundleForClass:[self class]], @""), @"url": @"https://cogcdn.cog.losno.co/mercury.xml"}];
-}
-
-@end
diff --git a/Preferences/Preferences/Base.lproj/Preferences.xib b/Preferences/Preferences/Base.lproj/Preferences.xib
index dda6b39f1..e22838229 100644
--- a/Preferences/Preferences/Base.lproj/Preferences.xib
+++ b/Preferences/Preferences/Base.lproj/Preferences.xib
@@ -190,41 +190,11 @@
             <point key="canvasLocation" x="-151" y="-33.5"/>
         </customView>
         <customView id="50" userLabel="UpdatesView">
-            <rect key="frame" x="0.0" y="0.0" width="530" height="71"/>
+            <rect key="frame" x="0.0" y="0.0" width="530" height="56"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="111">
-                    <rect key="frame" x="17" y="13" width="92" height="17"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Update Feed:" id="209">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="106">
-                    <rect key="frame" x="111" y="7" width="207" height="26"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="208">
-                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
-                        <menu key="menu" title="OtherViews" id="107">
-                            <items>
-                                <menuItem title="Stable" id="108"/>
-                                <menuItem title="Unstable" id="109"/>
-                                <menuItem title="Nightly" id="110"/>
-                            </items>
-                        </menu>
-                    </popUpButtonCell>
-                    <connections>
-                        <binding destination="115" name="content" keyPath="arrangedObjects" id="135"/>
-                        <binding destination="115" name="contentValues" keyPath="arrangedObjects.name" previousBinding="144" id="145"/>
-                        <binding destination="115" name="contentObjects" keyPath="arrangedObjects.url" previousBinding="135" id="144"/>
-                        <binding destination="52" name="selectedObject" keyPath="values.SUFeedURL" previousBinding="145" id="147"/>
-                    </connections>
-                </popUpButton>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="51">
-                    <rect key="frame" x="18" y="43" width="299" height="18"/>
+                    <rect key="frame" x="18" y="19" width="299" height="18"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <buttonCell key="cell" type="check" title="Automatically check for updates on startup" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="207">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -392,13 +362,6 @@
                 <string>name</string>
             </declaredKeys>
         </arrayController>
-        <arrayController objectClassName="NSDictionary" editable="NO" selectsInsertedObjects="NO" id="115" userLabel="Appcasts" customClass="AppcastArrayController">
-            <declaredKeys>
-                <string>name</string>
-                <string>url</string>
-            </declaredKeys>
-            <classReference key="objectClass" className="NSDictionary"/>
-        </arrayController>
         <arrayController objectClassName="NSDictionary" editable="NO" selectsInsertedObjects="NO" id="246" userLabel="PlaylistBehavior" customClass="PlaylistBehaviorArrayController">
             <declaredKeys>
                 <string>name</string>
diff --git a/Preferences/Preferences/Preferences.xcodeproj/project.pbxproj b/Preferences/Preferences/Preferences.xcodeproj/project.pbxproj
index 9a84e8be2..a35e2421d 100644
--- a/Preferences/Preferences/Preferences.xcodeproj/project.pbxproj
+++ b/Preferences/Preferences/Preferences.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		170744AD0BFF3938002475C9 /* AppcastArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 170744AC0BFF3938002475C9 /* AppcastArrayController.m */; };
 		1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */ = {isa = PBXBuildFile; fileRef = 1766C7A70B912A71004A7AE4 /* lastfm.png */; };
 		178E386E0C3DA64500EE6711 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 178E386D0C3DA64500EE6711 /* InfoPlist.strings */; };
 		17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C643360B8A77CC00C53518 /* OutputsArrayController.m */; };
@@ -78,8 +77,6 @@
 		089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		170744AB0BFF3938002475C9 /* AppcastArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppcastArrayController.h; sourceTree = "<group>"; };
-		170744AC0BFF3938002475C9 /* AppcastArrayController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppcastArrayController.m; sourceTree = "<group>"; };
 		1766C7A70B912A71004A7AE4 /* lastfm.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lastfm.png; path = Icons/lastfm.png; sourceTree = "<group>"; };
 		17C643360B8A77CC00C53518 /* OutputsArrayController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OutputsArrayController.m; sourceTree = "<group>"; };
 		17C643370B8A77CC00C53518 /* OutputsArrayController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OutputsArrayController.h; sourceTree = "<group>"; };
@@ -241,8 +238,6 @@
 		17D503410ABDB1660022D1E8 /* Custom */ = {
 			isa = PBXGroup;
 			children = (
-				170744AB0BFF3938002475C9 /* AppcastArrayController.h */,
-				170744AC0BFF3938002475C9 /* AppcastArrayController.m */,
 				83651DA427322C8700A2C097 /* MIDIFlavorBehaviorArrayController.h */,
 				83651DA327322C8700A2C097 /* MIDIFlavorBehaviorArrayController.m */,
 				837C0D3E1C50954000CAE18F /* MIDIPluginBehaviorArrayController.h */,
@@ -461,7 +456,6 @@
 				17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */,
 				837C0D401C50954000CAE18F /* MIDIPluginBehaviorArrayController.m in Sources */,
 				17C6433F0B8A783F00C53518 /* OutputPane.m in Sources */,
-				170744AD0BFF3938002475C9 /* AppcastArrayController.m in Sources */,
 				99F1813F0DE01D7A00FD5FFB /* PlaylistBehaviorArrayController.m in Sources */,
 				8372053718E3DEAF007EFAD4 /* ResamplerBehaviorArrayController.m in Sources */,
 			);