Skip to content

Commit

Permalink
- Big Sur phase two
Browse files Browse the repository at this point in the history
- Restructure main window a bit more
- Remove attempt at SF Symbols icons for now
- Add Now Playing popout to Stacks style main window, tooltip instructs to click to select the current track in playlist
- Disable libFLAC plugin on macOS 10.13 and newer, letting Core Audio handle it instead. Apparently, libFLAC is not really ready for Apple Silicon yet.
  • Loading branch information
kode54 committed Nov 23, 2020
1 parent dca9655 commit dedeb39
Show file tree
Hide file tree
Showing 284 changed files with 6,565 additions and 4,870 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@
[submodule "Frameworks/libatrac9/libatrac9"]
path = Frameworks/libatrac9/libatrac9
url = https://github.com/Thealexbarney/LibAtrac9.git
[submodule "Frameworks/Sparkle"]
path = Frameworks/Sparkle
url = https://git.lopez-snowhill.net/chris/Sparkle.git
4 changes: 4 additions & 0 deletions Application/AppController.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#import "SpotlightWindowController.h"
#import "StringToURLTransformer.h"
#import "FontSizetoLineHeightTransformer.h"
#import "Cog-Swift.h"
#import "PathNode.h"
#import <CogAudio/Status.h>

Expand All @@ -36,6 +37,9 @@ + (void)initialize
NSValueTransformer *miniModeMenuTitleTransformer = [[MiniModeMenuTitleTransformer alloc] init];
[NSValueTransformer setValueTransformer:miniModeMenuTitleTransformer
forName:@"MiniModeMenuTitleTransformer"];

NSValueTransformer *playbackStatusToHiddenTransformer = [[PlaybackStatusToHiddenTransformer alloc] init];
[NSValueTransformer setValueTransformer:playbackStatusToHiddenTransformer forName:@"PlaybackStatusToHiddenTransformer"];
}


Expand Down
187 changes: 107 additions & 80 deletions Base.lproj/MainMenu.xib

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions Cog-Bridging-Header.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import <CogAudio/Status.h>
231 changes: 26 additions & 205 deletions Cog.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file removed CogAssets.xcassets/AppIcon.appiconset/icon_16x16.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed CogAssets.xcassets/AppIcon.appiconset/icon_32x32.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
{
"images" : [
{
"filename" : "icon_16x16.png",
"filename" : "Cog Icon Precomposed_16.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"filename" : "icon_16x16@2x.png",
"filename" : "Cog Icon Precomposed_16@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "icon_32x32.png",
"filename" : "Cog Icon Precomposed_32.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "icon_32x32@2x.png",
"filename" : "Cog Icon Precomposed_32@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "icon_128x128.png",
"filename" : "Cog Icon Precomposed_128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "icon_128x128@2x.png",
"filename" : "Cog Icon Precomposed_128@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "icon_256x256.png",
"filename" : "Cog Icon Precomposed_256.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "icon_256x256@2x.png",
"filename" : "Cog Icon Precomposed_256@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"filename" : "icon_512x512.png",
"filename" : "Cog Icon Precomposed_512.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "icon_512x512@2x.png",
"filename" : "Cog Icon Precomposed_512@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
Expand Down
20 changes: 19 additions & 1 deletion CogAssets.xcassets/Cog color.colorset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,30 @@
"components" : {
"alpha" : "1.000",
"blue" : "0.003",
"green" : "0.620",
"green" : "0.506",
"red" : "1.000"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.003",
"green" : "0.431",
"red" : "0.869"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
Expand Down

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions CogAssets.xcassets/sf.arrow.right.symbolset/Contents.json

This file was deleted.

161 changes: 0 additions & 161 deletions CogAssets.xcassets/sf.arrow.right.symbolset/sf.arrow.right.svg

This file was deleted.

12 changes: 0 additions & 12 deletions CogAssets.xcassets/sf.arrow.turn.up.right.symbolset/Contents.json

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit dedeb39

Please sign in to comment.