Reformat my own source code with clang-format
Signed-off-by: Christopher Snowhill <kode54@gmail.com>CQTexperiment
Christopher Snowhill
parent
361f61618a
commit
85c7073649
|
|
@ -0,0 +1,176 @@
|
|||
# The style used for all options not specifically set in the configuration.
|
||||
BasedOnStyle: LLVM
|
||||
|
||||
# The extra indent or outdent of access modifiers, e.g. public:.
|
||||
AccessModifierOffset: 0
|
||||
|
||||
# If true, aligns escaped newlines as far left as possible. Otherwise puts them into the right-most column.
|
||||
AlignEscapedNewlinesLeft: false
|
||||
|
||||
# If true, aligns trailing comments.
|
||||
AlignTrailingComments: false
|
||||
|
||||
# Allow putting all parameters of a function declaration onto the next line even if BinPackParameters is false.
|
||||
AllowAllParametersOfDeclarationOnNextLine: false
|
||||
|
||||
# Allows contracting simple braced statements to a single line.
|
||||
AllowShortBlocksOnASingleLine: true
|
||||
|
||||
# If true, short case labels will be contracted to a single line.
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
|
||||
# Dependent on the value, int f() { return 0; } can be put on a single line. Possible values: None, Inline, All.
|
||||
AllowShortFunctionsOnASingleLine: None
|
||||
|
||||
# If true, if (a) return; can be put on a single line.
|
||||
AllowShortIfStatementsOnASingleLine: true
|
||||
|
||||
# If true, while (true) continue; can be put on a single line.
|
||||
AllowShortLoopsOnASingleLine: true
|
||||
|
||||
# If true, always break after function definition return types. More truthfully called ‘break before the identifier following the type in a function definition’.
|
||||
AlwaysBreakAfterDefinitionReturnType: false
|
||||
|
||||
# If true, always break before multiline string literals.
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
|
||||
# If true, always break after the template<...> of a template declaration.
|
||||
AlwaysBreakTemplateDeclarations: true
|
||||
|
||||
# If false, a function call’s arguments will either be all on the same line or will have one line each.
|
||||
#BinPackArguments: true
|
||||
|
||||
# If false, a function declaration’s or function definition’s parameters will either all be on the same line or will have one line each.
|
||||
BinPackParameters: true
|
||||
|
||||
# The way to wrap binary operators. Possible values: None, NonAssignment, All.
|
||||
BreakBeforeBinaryOperators: None
|
||||
|
||||
# The brace breaking style to use. Possible values: Attach, Linux, Stroustrup, Allman, GNU.
|
||||
BreakBeforeBraces: Attach
|
||||
|
||||
# If true, ternary operators will be placed after line breaks.
|
||||
BreakBeforeTernaryOperators: false
|
||||
|
||||
# Always break constructor initializers before commas and align the commas with the colon.
|
||||
BreakConstructorInitializersBeforeComma: false
|
||||
|
||||
# The column limit. A column limit of 0 means that there is no column limit.
|
||||
ColumnLimit: 0
|
||||
|
||||
# A regular expression that describes comments with special meaning, which should not be split into lines or otherwise changed.
|
||||
CommentPragmas: '^ IWYU pragma:'
|
||||
|
||||
# If the constructor initializers don’t fit on a line, put each initializer on its own line.
|
||||
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
||||
|
||||
# The number of characters to use for indentation of constructor initializer lists.
|
||||
ConstructorInitializerIndentWidth: 0
|
||||
|
||||
# Indent width for line continuations.
|
||||
ContinuationIndentWidth: 0
|
||||
|
||||
# If true, format braced lists as best suited for C++11 braced lists.
|
||||
Cpp11BracedListStyle: false
|
||||
|
||||
# If true, analyze the formatted file for the most common alignment of & and *. PointerAlignment is then used only as fallback.
|
||||
DerivePointerAlignment: true
|
||||
|
||||
# Disables formatting at all.
|
||||
DisableFormat: false
|
||||
|
||||
# If true, clang-format detects whether function calls and definitions are formatted with one parameter per line.
|
||||
ExperimentalAutoDetectBinPacking: false
|
||||
|
||||
# A vector of macros that should be interpreted as foreach loops instead of as function calls.
|
||||
#ForEachMacros: ''
|
||||
|
||||
# Indent case labels one level from the switch statement. When false, use the same indentation level as for the switch statement. Switch statement body is always indented one level more than case labels.
|
||||
IndentCaseLabels: true
|
||||
|
||||
# The number of columns to use for indentation.
|
||||
IndentWidth: 4
|
||||
|
||||
# Indent if a function definition or declaration is wrapped after the type.
|
||||
IndentWrappedFunctionNames: false
|
||||
|
||||
# If true, empty lines at the start of blocks are kept.
|
||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||
|
||||
# Language, this format style is targeted at. Possible values: None, Cpp, Java, JavaScript, Proto.
|
||||
# Language: None
|
||||
|
||||
# The maximum number of consecutive empty lines to keep.
|
||||
MaxEmptyLinesToKeep: 1
|
||||
|
||||
# The indentation used for namespaces. Possible values: None, Inner, All.
|
||||
NamespaceIndentation: All
|
||||
|
||||
# The number of characters to use for indentation of ObjC blocks.
|
||||
ObjCBlockIndentWidth: 4
|
||||
|
||||
# Add a space after @property in Objective-C, i.e. use \@property (readonly) instead of \@property(readonly).
|
||||
ObjCSpaceAfterProperty: false
|
||||
|
||||
# Add a space in front of an Objective-C protocol list, i.e. use Foo <Protocol> instead of Foo<Protocol>.
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
|
||||
# The penalty for breaking a function call after “call(”.
|
||||
PenaltyBreakBeforeFirstCallParameter: 1000
|
||||
|
||||
# The penalty for each line break introduced inside a comment.
|
||||
PenaltyBreakComment: 1000
|
||||
|
||||
# The penalty for breaking before the first <<.
|
||||
PenaltyBreakFirstLessLess: 1000
|
||||
|
||||
# The penalty for each line break introduced inside a string literal.
|
||||
PenaltyBreakString: 1000
|
||||
|
||||
# The penalty for each character outside of the column limit.
|
||||
PenaltyExcessCharacter: 1000
|
||||
|
||||
# Penalty for putting the return type of a function onto its own line.
|
||||
PenaltyReturnTypeOnItsOwnLine: 1000
|
||||
|
||||
# Pointer and reference alignment style. Possible values: Left, Right, Middle.
|
||||
PointerAlignment: Left
|
||||
|
||||
# If true, a space may be inserted after C style casts.
|
||||
SpaceAfterCStyleCast: false
|
||||
|
||||
# If false, spaces will be removed before assignment operators.
|
||||
SpaceBeforeAssignmentOperators: true
|
||||
|
||||
# Defines in which cases to put a space before opening parentheses. Possible values: Never, ControlStatements, Always.
|
||||
SpaceBeforeParens: Never
|
||||
|
||||
# If true, spaces may be inserted into ‘()’.
|
||||
SpaceInEmptyParentheses: false
|
||||
|
||||
# The number of spaces before trailing line comments (// - comments).
|
||||
SpacesBeforeTrailingComments: 1
|
||||
|
||||
# If true, spaces will be inserted after ‘<’ and before ‘>’ in template argument lists.
|
||||
SpacesInAngles: false
|
||||
|
||||
# If true, spaces may be inserted into C style casts.
|
||||
SpacesInCStyleCastParentheses: false
|
||||
|
||||
# If true, spaces are inserted inside container literals (e.g. ObjC and Javascript array and dict literals).
|
||||
SpacesInContainerLiterals: false
|
||||
|
||||
# If true, spaces will be inserted after ‘(‘ and before ‘)’.
|
||||
SpacesInParentheses: false
|
||||
|
||||
# If true, spaces will be inserted after ‘[‘ and before ‘]’.
|
||||
SpacesInSquareBrackets: false
|
||||
|
||||
# Format compatible with this standard, e.g. use A<A<int> > instead of A<A<int>> for LS_Cpp03. Possible values: Cpp03, Cpp11, Auto.
|
||||
Standard: Auto
|
||||
|
||||
# The number of columns used for tab stops.
|
||||
TabWidth: 4
|
||||
|
||||
# The way to use tab characters in the resulting file. Possible values: Never, ForIndentation, Always.
|
||||
UseTab: ForIndentation
|
||||
|
|
@ -9,59 +9,56 @@
|
|||
@class PlaylistLoader;
|
||||
@class SUUpdater;
|
||||
|
||||
@interface AppController : NSObject
|
||||
{
|
||||
IBOutlet NSObjectController *currentEntryController;
|
||||
|
||||
@interface AppController : NSObject {
|
||||
IBOutlet NSObjectController *currentEntryController;
|
||||
|
||||
IBOutlet PlaybackController *playbackController;
|
||||
|
||||
IBOutlet PlaylistController *playlistController;
|
||||
IBOutlet PlaylistController *playlistController;
|
||||
IBOutlet PlaylistLoader *playlistLoader;
|
||||
|
||||
|
||||
IBOutlet NSWindow *mainWindow;
|
||||
IBOutlet NSWindow *miniWindow;
|
||||
IBOutlet NSSplitView *mainView;
|
||||
|
||||
IBOutlet NSWindow *miniWindow;
|
||||
IBOutlet NSSplitView *mainView;
|
||||
|
||||
IBOutlet NSSegmentedControl *playbackButtons;
|
||||
IBOutlet NSButton *fileButton;
|
||||
IBOutlet NSButton *shuffleButton;
|
||||
IBOutlet NSButton *repeatButton;
|
||||
IBOutlet NSButton *randomizeButton;
|
||||
IBOutlet NSButton *randomizeButton;
|
||||
|
||||
IBOutlet NSTextField *totalTimeField;
|
||||
|
||||
IBOutlet PlaylistView *playlistView;
|
||||
|
||||
|
||||
IBOutlet NSMenuItem *showIndexColumn;
|
||||
IBOutlet NSMenuItem *showTitleColumn;
|
||||
IBOutlet NSMenuItem *showAlbumArtistColumn;
|
||||
IBOutlet NSMenuItem *showAlbumArtistColumn;
|
||||
IBOutlet NSMenuItem *showArtistColumn;
|
||||
IBOutlet NSMenuItem *showAlbumColumn;
|
||||
IBOutlet NSMenuItem *showGenreColumn;
|
||||
IBOutlet NSMenuItem *showLengthColumn;
|
||||
IBOutlet NSMenuItem *showTrackColumn;
|
||||
IBOutlet NSMenuItem *showYearColumn;
|
||||
|
||||
IBOutlet NSMenu *dockMenu;
|
||||
IBOutlet NSMenuItem *currentArtistItem;
|
||||
|
||||
IBOutlet NSWindowController *spotlightWindowController;
|
||||
|
||||
IBOutlet FileTreeViewController *fileTreeViewController;
|
||||
|
||||
IBOutlet SUUpdater *updater;
|
||||
|
||||
NSOperationQueue *queue; // Since we are the app delegate, we take care of the op queue
|
||||
|
||||
NSMutableSet* expandedNodes;
|
||||
|
||||
BOOL miniMode;
|
||||
|
||||
|
||||
IBOutlet NSMenu *dockMenu;
|
||||
IBOutlet NSMenuItem *currentArtistItem;
|
||||
|
||||
IBOutlet NSWindowController *spotlightWindowController;
|
||||
|
||||
IBOutlet FileTreeViewController *fileTreeViewController;
|
||||
|
||||
IBOutlet SUUpdater *updater;
|
||||
|
||||
NSOperationQueue *queue; // Since we are the app delegate, we take care of the op queue
|
||||
|
||||
NSMutableSet *expandedNodes;
|
||||
|
||||
BOOL miniMode;
|
||||
}
|
||||
|
||||
@property (strong) IBOutlet NSButton *infoButton;
|
||||
@property (strong) IBOutlet NSButton *infoButtonMini;
|
||||
@property(strong) IBOutlet NSButton *infoButton;
|
||||
@property(strong) IBOutlet NSButton *infoButtonMini;
|
||||
|
||||
- (IBAction)openURL:(id)sender;
|
||||
|
||||
|
|
@ -78,7 +75,7 @@
|
|||
|
||||
- (void)initDefaults;
|
||||
|
||||
//Fun stuff
|
||||
// Fun stuff
|
||||
- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag;
|
||||
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename;
|
||||
- (void)application:(NSApplication *)theApplication openFiles:(NSArray *)filenames;
|
||||
|
|
@ -91,23 +88,23 @@
|
|||
- (void)clickPrev;
|
||||
- (void)clickNext;
|
||||
- (void)clickSpam;
|
||||
- (void)clickSeek: (NSTimeInterval)position;
|
||||
- (void)clickSeek:(NSTimeInterval)position;
|
||||
|
||||
- (IBAction)increaseFontSize:(id)sender;
|
||||
- (IBAction)decreaseFontSize:(id)sender;
|
||||
- (void)changeFontSize:(float)size;
|
||||
|
||||
- (void)nodeExpanded:(NSNotification*)notification;
|
||||
- (void)nodeCollapsed:(NSNotification*)notification;
|
||||
- (void)nodeExpanded:(NSNotification *)notification;
|
||||
- (void)nodeCollapsed:(NSNotification *)notification;
|
||||
|
||||
- (IBAction)toggleMiniMode:(id)sender;
|
||||
- (IBAction)toggleToolbarStyle:(id)sender;
|
||||
|
||||
@property NSWindow * mainWindow;
|
||||
@property NSWindow * miniWindow;
|
||||
@property NSWindow *mainWindow;
|
||||
@property NSWindow *miniWindow;
|
||||
|
||||
@property BOOL miniMode;
|
||||
|
||||
@property (nonatomic) BOOL floatingMiniWindow;
|
||||
@property(nonatomic) BOOL floatingMiniWindow;
|
||||
|
||||
@end
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -12,15 +12,15 @@
|
|||
|
||||
@interface DockIconController : NSObject {
|
||||
NSImage *dockImage;
|
||||
|
||||
|
||||
IBOutlet PlaybackController *playbackController;
|
||||
|
||||
NSInteger lastPlaybackStatus;
|
||||
NSInteger lastColorfulStatus;
|
||||
NSNumber *lastProgressStatus;
|
||||
|
||||
NSImageView *imageView;
|
||||
NSProgressIndicator *progressIndicator;
|
||||
|
||||
NSInteger lastPlaybackStatus;
|
||||
NSInteger lastColorfulStatus;
|
||||
NSNumber *lastProgressStatus;
|
||||
|
||||
NSImageView *imageView;
|
||||
NSProgressIndicator *progressIndicator;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -7,197 +7,172 @@
|
|||
//
|
||||
|
||||
#import "DockIconController.h"
|
||||
#import <CogAudio/Status.h>
|
||||
#import "PlaybackController.h"
|
||||
#import <CogAudio/Status.h>
|
||||
|
||||
@implementation DockIconController
|
||||
|
||||
static NSString *DockIconPlaybackStatusObservationContext = @"DockIconPlaybackStatusObservationContext";
|
||||
|
||||
- (void)startObserving
|
||||
{
|
||||
[playbackController addObserver:self forKeyPath:@"playbackStatus" options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial) context:(__bridge void * _Nullable)(DockIconPlaybackStatusObservationContext)];
|
||||
[playbackController addObserver:self forKeyPath:@"progressBarStatus" options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial) context:(__bridge void * _Nullable)(DockIconPlaybackStatusObservationContext)];
|
||||
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.colorfulDockIcons" options:0 context:(__bridge void * _Nullable)(DockIconPlaybackStatusObservationContext)];
|
||||
- (void)startObserving {
|
||||
[playbackController addObserver:self forKeyPath:@"playbackStatus" options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial) context:(__bridge void *_Nullable)(DockIconPlaybackStatusObservationContext)];
|
||||
[playbackController addObserver:self forKeyPath:@"progressBarStatus" options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial) context:(__bridge void *_Nullable)(DockIconPlaybackStatusObservationContext)];
|
||||
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.colorfulDockIcons" options:0 context:(__bridge void *_Nullable)(DockIconPlaybackStatusObservationContext)];
|
||||
}
|
||||
|
||||
- (void)stopObserving
|
||||
{
|
||||
- (void)stopObserving {
|
||||
[playbackController removeObserver:self forKeyPath:@"playbackStatus"];
|
||||
[playbackController removeObserver:self forKeyPath:@"progressBarStatus"];
|
||||
[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.colorfulDockIcons"];
|
||||
[playbackController removeObserver:self forKeyPath:@"progressBarStatus"];
|
||||
[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.colorfulDockIcons"];
|
||||
}
|
||||
|
||||
static NSString *getBadgeName(NSString *baseName, BOOL colorfulIcons)
|
||||
{
|
||||
if (colorfulIcons)
|
||||
{
|
||||
return [baseName stringByAppendingString:@"Colorful"];
|
||||
}
|
||||
else
|
||||
{
|
||||
return baseName;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)refreshDockIcon:(NSInteger)playbackStatus withProgress:(double)progressStatus
|
||||
{
|
||||
BOOL displayChanged = NO;
|
||||
BOOL drawIcon = NO;
|
||||
BOOL removeProgress = NO;
|
||||
|
||||
if ( playbackStatus < 0 )
|
||||
playbackStatus = lastPlaybackStatus;
|
||||
else
|
||||
{
|
||||
lastPlaybackStatus = playbackStatus;
|
||||
drawIcon = YES;
|
||||
}
|
||||
|
||||
if ( progressStatus < -2 )
|
||||
progressStatus = [lastProgressStatus doubleValue];
|
||||
else
|
||||
{
|
||||
if (progressStatus < 0 && [lastProgressStatus doubleValue] >= 0)
|
||||
removeProgress = YES;
|
||||
lastProgressStatus = [NSNumber numberWithDouble:progressStatus];
|
||||
}
|
||||
|
||||
BOOL displayProgress = (progressStatus >= 0.0);
|
||||
|
||||
NSImage *badgeImage = nil;
|
||||
|
||||
BOOL colorfulIcons = [[NSUserDefaults standardUserDefaults] boolForKey:@"colorfulDockIcons"];
|
||||
|
||||
if ((colorfulIcons && lastColorfulStatus < 1) ||
|
||||
(!colorfulIcons && lastColorfulStatus != 0))
|
||||
{
|
||||
lastColorfulStatus = colorfulIcons ? 1 : 0;
|
||||
drawIcon = YES;
|
||||
}
|
||||
|
||||
NSDockTile *dockTile = [NSApp dockTile];
|
||||
|
||||
if (drawIcon)
|
||||
{
|
||||
switch (playbackStatus) {
|
||||
case CogStatusPlaying:
|
||||
badgeImage = [NSImage imageNamed:getBadgeName(@"playDockBadge", colorfulIcons)];
|
||||
break;
|
||||
case CogStatusPaused:
|
||||
badgeImage = [NSImage imageNamed:getBadgeName(@"pauseDockBadge", colorfulIcons)];
|
||||
break;
|
||||
|
||||
default:
|
||||
badgeImage = [NSImage imageNamed:getBadgeName(@"stopDockBadge", colorfulIcons)];
|
||||
break;
|
||||
}
|
||||
|
||||
NSSize badgeSize = [badgeImage size];
|
||||
|
||||
NSImage *newDockImage = [dockImage copy];
|
||||
[newDockImage lockFocus];
|
||||
|
||||
[badgeImage drawInRect:NSMakeRect(0, 0, 128, 128)
|
||||
fromRect:NSMakeRect(0, 0, badgeSize.width, badgeSize.height)
|
||||
operation:NSCompositingOperationSourceOver fraction:1.0];
|
||||
|
||||
[newDockImage unlockFocus];
|
||||
|
||||
imageView = [[NSImageView alloc] init];
|
||||
[imageView setImage:newDockImage];
|
||||
[dockTile setContentView:imageView];
|
||||
|
||||
progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0, 0.0, dockTile.size.width, 10.0)];
|
||||
[progressIndicator setStyle:NSProgressIndicatorBarStyle];
|
||||
[progressIndicator setIndeterminate:NO];
|
||||
[progressIndicator setBezeled:YES];
|
||||
[progressIndicator setMinValue:0];
|
||||
[progressIndicator setMaxValue:100];
|
||||
[progressIndicator setHidden:YES];
|
||||
|
||||
[imageView addSubview:progressIndicator];
|
||||
|
||||
displayChanged = YES;
|
||||
}
|
||||
|
||||
if (displayProgress)
|
||||
{
|
||||
if (!imageView)
|
||||
{
|
||||
imageView = [[NSImageView alloc] init];
|
||||
[imageView setImage:[NSApp applicationIconImage]];
|
||||
[dockTile setContentView:imageView];
|
||||
}
|
||||
|
||||
if (!progressIndicator)
|
||||
{
|
||||
progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0, 0.0, dockTile.size.width, 10.0)];
|
||||
[progressIndicator setIndeterminate:NO];
|
||||
[progressIndicator setBezeled:YES];
|
||||
[progressIndicator setMinValue:0];
|
||||
[progressIndicator setMaxValue:100];
|
||||
|
||||
[imageView addSubview:progressIndicator];
|
||||
}
|
||||
|
||||
[progressIndicator setDoubleValue:progressStatus];
|
||||
[progressIndicator setHidden:NO];
|
||||
|
||||
displayChanged = YES;
|
||||
}
|
||||
|
||||
if (removeProgress)
|
||||
{
|
||||
if (progressIndicator)
|
||||
[progressIndicator setHidden:YES];
|
||||
|
||||
displayChanged = YES;
|
||||
}
|
||||
|
||||
if (displayChanged)
|
||||
[dockTile display];
|
||||
}
|
||||
|
||||
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
|
||||
{
|
||||
if ([DockIconPlaybackStatusObservationContext isEqual:(__bridge id)(context)])
|
||||
{
|
||||
if ([keyPath isEqualToString:@"playbackStatus"])
|
||||
{
|
||||
NSInteger playbackStatus = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
|
||||
|
||||
[self refreshDockIcon:playbackStatus withProgress:-10];
|
||||
}
|
||||
else if ([keyPath isEqualToString:@"progressBarStatus"])
|
||||
{
|
||||
double progressStatus = [[change objectForKey:NSKeyValueChangeNewKey] doubleValue];
|
||||
|
||||
[self refreshDockIcon:-1 withProgress:progressStatus];
|
||||
}
|
||||
else if ([keyPath isEqualToString:@"values.colorfulDockIcons"])
|
||||
{
|
||||
[self refreshDockIcon:-1 withProgress:-10];
|
||||
}
|
||||
static NSString *getBadgeName(NSString *baseName, BOOL colorfulIcons) {
|
||||
if(colorfulIcons) {
|
||||
return [baseName stringByAppendingString:@"Colorful"];
|
||||
} else {
|
||||
return baseName;
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
|
||||
- (void)refreshDockIcon:(NSInteger)playbackStatus withProgress:(double)progressStatus {
|
||||
BOOL displayChanged = NO;
|
||||
BOOL drawIcon = NO;
|
||||
BOOL removeProgress = NO;
|
||||
|
||||
if(playbackStatus < 0)
|
||||
playbackStatus = lastPlaybackStatus;
|
||||
else {
|
||||
lastPlaybackStatus = playbackStatus;
|
||||
drawIcon = YES;
|
||||
}
|
||||
|
||||
if(progressStatus < -2)
|
||||
progressStatus = [lastProgressStatus doubleValue];
|
||||
else {
|
||||
if(progressStatus < 0 && [lastProgressStatus doubleValue] >= 0)
|
||||
removeProgress = YES;
|
||||
lastProgressStatus = [NSNumber numberWithDouble:progressStatus];
|
||||
}
|
||||
|
||||
BOOL displayProgress = (progressStatus >= 0.0);
|
||||
|
||||
NSImage *badgeImage = nil;
|
||||
|
||||
BOOL colorfulIcons = [[NSUserDefaults standardUserDefaults] boolForKey:@"colorfulDockIcons"];
|
||||
|
||||
if((colorfulIcons && lastColorfulStatus < 1) ||
|
||||
(!colorfulIcons && lastColorfulStatus != 0)) {
|
||||
lastColorfulStatus = colorfulIcons ? 1 : 0;
|
||||
drawIcon = YES;
|
||||
}
|
||||
|
||||
NSDockTile *dockTile = [NSApp dockTile];
|
||||
|
||||
if(drawIcon) {
|
||||
switch(playbackStatus) {
|
||||
case CogStatusPlaying:
|
||||
badgeImage = [NSImage imageNamed:getBadgeName(@"playDockBadge", colorfulIcons)];
|
||||
break;
|
||||
case CogStatusPaused:
|
||||
badgeImage = [NSImage imageNamed:getBadgeName(@"pauseDockBadge", colorfulIcons)];
|
||||
break;
|
||||
|
||||
default:
|
||||
badgeImage = [NSImage imageNamed:getBadgeName(@"stopDockBadge", colorfulIcons)];
|
||||
break;
|
||||
}
|
||||
|
||||
NSSize badgeSize = [badgeImage size];
|
||||
|
||||
NSImage *newDockImage = [dockImage copy];
|
||||
[newDockImage lockFocus];
|
||||
|
||||
[badgeImage drawInRect:NSMakeRect(0, 0, 128, 128)
|
||||
fromRect:NSMakeRect(0, 0, badgeSize.width, badgeSize.height)
|
||||
operation:NSCompositingOperationSourceOver
|
||||
fraction:1.0];
|
||||
|
||||
[newDockImage unlockFocus];
|
||||
|
||||
imageView = [[NSImageView alloc] init];
|
||||
[imageView setImage:newDockImage];
|
||||
[dockTile setContentView:imageView];
|
||||
|
||||
progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0, 0.0, dockTile.size.width, 10.0)];
|
||||
[progressIndicator setStyle:NSProgressIndicatorBarStyle];
|
||||
[progressIndicator setIndeterminate:NO];
|
||||
[progressIndicator setBezeled:YES];
|
||||
[progressIndicator setMinValue:0];
|
||||
[progressIndicator setMaxValue:100];
|
||||
[progressIndicator setHidden:YES];
|
||||
|
||||
[imageView addSubview:progressIndicator];
|
||||
|
||||
displayChanged = YES;
|
||||
}
|
||||
|
||||
if(displayProgress) {
|
||||
if(!imageView) {
|
||||
imageView = [[NSImageView alloc] init];
|
||||
[imageView setImage:[NSApp applicationIconImage]];
|
||||
[dockTile setContentView:imageView];
|
||||
}
|
||||
|
||||
if(!progressIndicator) {
|
||||
progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0.0, 0.0, dockTile.size.width, 10.0)];
|
||||
[progressIndicator setIndeterminate:NO];
|
||||
[progressIndicator setBezeled:YES];
|
||||
[progressIndicator setMinValue:0];
|
||||
[progressIndicator setMaxValue:100];
|
||||
|
||||
[imageView addSubview:progressIndicator];
|
||||
}
|
||||
|
||||
[progressIndicator setDoubleValue:progressStatus];
|
||||
[progressIndicator setHidden:NO];
|
||||
|
||||
displayChanged = YES;
|
||||
}
|
||||
|
||||
if(removeProgress) {
|
||||
if(progressIndicator)
|
||||
[progressIndicator setHidden:YES];
|
||||
|
||||
displayChanged = YES;
|
||||
}
|
||||
|
||||
if(displayChanged)
|
||||
[dockTile display];
|
||||
}
|
||||
|
||||
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
|
||||
if([DockIconPlaybackStatusObservationContext isEqual:(__bridge id)(context)]) {
|
||||
if([keyPath isEqualToString:@"playbackStatus"]) {
|
||||
NSInteger playbackStatus = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
|
||||
|
||||
[self refreshDockIcon:playbackStatus withProgress:-10];
|
||||
} else if([keyPath isEqualToString:@"progressBarStatus"]) {
|
||||
double progressStatus = [[change objectForKey:NSKeyValueChangeNewKey] doubleValue];
|
||||
|
||||
[self refreshDockIcon:-1 withProgress:progressStatus];
|
||||
} else if([keyPath isEqualToString:@"values.colorfulDockIcons"]) {
|
||||
[self refreshDockIcon:-1 withProgress:-10];
|
||||
}
|
||||
} else {
|
||||
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
- (void)awakeFromNib {
|
||||
dockImage = [[NSImage imageNamed:@"icon_blank"] copy];
|
||||
lastColorfulStatus = -1;
|
||||
lastProgressStatus = [NSNumber numberWithDouble:-1];
|
||||
imageView = nil;
|
||||
progressIndicator = nil;
|
||||
lastColorfulStatus = -1;
|
||||
lastProgressStatus = [NSNumber numberWithDouble:-1];
|
||||
imageView = nil;
|
||||
progressIndicator = nil;
|
||||
[self startObserving];
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
- (void)dealloc {
|
||||
[self stopObserving];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@
|
|||
@interface MediaKeysApplication : NSApplication
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -10,68 +10,67 @@
|
|||
#import "AppController.h"
|
||||
#import "Logging.h"
|
||||
|
||||
#import <MediaPlayer/MPNowPlayingInfoCenter.h>
|
||||
#import <MediaPlayer/MPRemoteCommandCenter.h>
|
||||
#import <MediaPlayer/MPRemoteCommand.h>
|
||||
#import <MediaPlayer/MPMediaItem.h>
|
||||
#import <MediaPlayer/MPNowPlayingInfoCenter.h>
|
||||
#import <MediaPlayer/MPRemoteCommand.h>
|
||||
#import <MediaPlayer/MPRemoteCommandCenter.h>
|
||||
#import <MediaPlayer/MPRemoteCommandEvent.h>
|
||||
|
||||
@implementation MediaKeysApplication {
|
||||
AppController *_appController;
|
||||
AppController *_appController;
|
||||
}
|
||||
|
||||
- (void)finishLaunching {
|
||||
[super finishLaunching];
|
||||
_appController = (AppController *)[self delegate];
|
||||
[super finishLaunching];
|
||||
_appController = (AppController *)[self delegate];
|
||||
|
||||
MPRemoteCommandCenter *remoteCommandCenter = [MPRemoteCommandCenter sharedCommandCenter];
|
||||
MPRemoteCommandCenter *remoteCommandCenter = [MPRemoteCommandCenter sharedCommandCenter];
|
||||
|
||||
[remoteCommandCenter.playCommand setEnabled:YES];
|
||||
[remoteCommandCenter.pauseCommand setEnabled:YES];
|
||||
[remoteCommandCenter.togglePlayPauseCommand setEnabled:YES];
|
||||
[remoteCommandCenter.stopCommand setEnabled:YES];
|
||||
[remoteCommandCenter.changePlaybackPositionCommand setEnabled:YES];
|
||||
[remoteCommandCenter.nextTrackCommand setEnabled:YES];
|
||||
[remoteCommandCenter.previousTrackCommand setEnabled:YES];
|
||||
[remoteCommandCenter.playCommand setEnabled:YES];
|
||||
[remoteCommandCenter.pauseCommand setEnabled:YES];
|
||||
[remoteCommandCenter.togglePlayPauseCommand setEnabled:YES];
|
||||
[remoteCommandCenter.stopCommand setEnabled:YES];
|
||||
[remoteCommandCenter.changePlaybackPositionCommand setEnabled:YES];
|
||||
[remoteCommandCenter.nextTrackCommand setEnabled:YES];
|
||||
[remoteCommandCenter.previousTrackCommand setEnabled:YES];
|
||||
|
||||
[[remoteCommandCenter playCommand] addTarget:self action:@selector(clickPlay)];
|
||||
[[remoteCommandCenter pauseCommand] addTarget:self action:@selector(clickPause)];
|
||||
[[remoteCommandCenter togglePlayPauseCommand] addTarget:self action:@selector(clickPlay)];
|
||||
[[remoteCommandCenter stopCommand] addTarget:self action:@selector(clickStop)];
|
||||
[[remoteCommandCenter changePlaybackPositionCommand] addTarget:self action:@selector(clickSeek:)];
|
||||
[[remoteCommandCenter nextTrackCommand] addTarget:self action:@selector(clickNext)];
|
||||
[[remoteCommandCenter previousTrackCommand] addTarget:self action:@selector(clickPrev)];
|
||||
[[remoteCommandCenter playCommand] addTarget:self action:@selector(clickPlay)];
|
||||
[[remoteCommandCenter pauseCommand] addTarget:self action:@selector(clickPause)];
|
||||
[[remoteCommandCenter togglePlayPauseCommand] addTarget:self action:@selector(clickPlay)];
|
||||
[[remoteCommandCenter stopCommand] addTarget:self action:@selector(clickStop)];
|
||||
[[remoteCommandCenter changePlaybackPositionCommand] addTarget:self action:@selector(clickSeek:)];
|
||||
[[remoteCommandCenter nextTrackCommand] addTarget:self action:@selector(clickNext)];
|
||||
[[remoteCommandCenter previousTrackCommand] addTarget:self action:@selector(clickPrev)];
|
||||
}
|
||||
|
||||
- (MPRemoteCommandHandlerStatus)clickPlay {
|
||||
[_appController clickPlay];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
[_appController clickPlay];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
}
|
||||
|
||||
- (MPRemoteCommandHandlerStatus)clickPause {
|
||||
[_appController clickPause];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
[_appController clickPause];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
}
|
||||
|
||||
- (MPRemoteCommandHandlerStatus)clickStop {
|
||||
[_appController clickStop];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
[_appController clickStop];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
}
|
||||
|
||||
- (MPRemoteCommandHandlerStatus)clickNext {
|
||||
[_appController clickNext];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
[_appController clickNext];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
}
|
||||
|
||||
- (MPRemoteCommandHandlerStatus)clickPrev {
|
||||
[_appController clickPrev];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
[_appController clickPrev];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
}
|
||||
|
||||
- (MPRemoteCommandHandlerStatus)clickSeek: (MPChangePlaybackPositionCommandEvent*)event {
|
||||
[_appController clickSeek:event.positionTime];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
- (MPRemoteCommandHandlerStatus)clickSeek:(MPChangePlaybackPositionCommandEvent *)event {
|
||||
[_appController clickSeek:event.positionTime];
|
||||
return MPRemoteCommandHandlerStatusSuccess;
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
#import "AppController.h"
|
||||
#import "AudioScrobbler.h"
|
||||
#import "CogAudio/AudioPlayer.h"
|
||||
#import "CogAudio/Status.h"
|
||||
#import "TrackingSlider.h"
|
||||
#import "AudioScrobbler.h"
|
||||
#import "AppController.h"
|
||||
|
||||
#import <AVFoundation/AVFoundation.h>
|
||||
#import <AudioToolbox/AudioToolbox.h>
|
||||
#import <AudioUnit/AudioUnit.h>
|
||||
#import <AVFoundation/AVFoundation.h>
|
||||
#import <CoreAudio/CoreAudioTypes.h>
|
||||
|
||||
#import "AUPlayerView.h"
|
||||
|
|
@ -23,42 +23,41 @@ extern NSString *CogPlaybackDidPauseNotficiation;
|
|||
extern NSString *CogPlaybackDidResumeNotficiation;
|
||||
extern NSString *CogPlaybackDidStopNotficiation;
|
||||
|
||||
extern NSDictionary * makeRGInfo(PlaylistEntry *pe);
|
||||
extern NSDictionary *makeRGInfo(PlaylistEntry *pe);
|
||||
|
||||
@class PlaylistController;
|
||||
@class PlaylistView;
|
||||
@class PlaylistLoader;
|
||||
|
||||
@interface PlaybackController : NSObject
|
||||
{
|
||||
IBOutlet AppController *appController;
|
||||
|
||||
IBOutlet PlaylistController *playlistController;
|
||||
@interface PlaybackController : NSObject {
|
||||
IBOutlet AppController *appController;
|
||||
|
||||
IBOutlet PlaylistController *playlistController;
|
||||
IBOutlet PlaylistView *playlistView;
|
||||
IBOutlet PlaylistLoader *playlistLoader;
|
||||
|
||||
|
||||
IBOutlet NSSlider *volumeSlider;
|
||||
|
||||
|
||||
IBOutlet NSArrayController *outputDevices;
|
||||
|
||||
|
||||
NSTimer *positionTimer;
|
||||
|
||||
|
||||
AudioPlayer *audioPlayer;
|
||||
|
||||
|
||||
CogStatus playbackStatus;
|
||||
double position;
|
||||
double lastPosition;
|
||||
double lastPosition;
|
||||
BOOL seekable;
|
||||
BOOL fading;
|
||||
|
||||
// progress bar display
|
||||
double progressBarStatus;
|
||||
|
||||
BOOL _eqWasOpen;
|
||||
BOOL _eqStubbed;
|
||||
AudioUnit _eq;
|
||||
AUPluginUI *_equi;
|
||||
}
|
||||
|
||||
// progress bar display
|
||||
double progressBarStatus;
|
||||
|
||||
BOOL _eqWasOpen;
|
||||
BOOL _eqStubbed;
|
||||
AudioUnit _eq;
|
||||
AUPluginUI *_equi;
|
||||
}
|
||||
|
||||
@property CogStatus playbackStatus;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -15,11 +15,11 @@
|
|||
@class AudioScrobbler;
|
||||
|
||||
@interface PlaybackEventController
|
||||
: NSObject <NSUserNotificationCenterDelegate, UNUserNotificationCenterDelegate> {
|
||||
IBOutlet PlaybackController *playbackController;
|
||||
: NSObject <NSUserNotificationCenterDelegate, UNUserNotificationCenterDelegate> {
|
||||
IBOutlet PlaybackController *playbackController;
|
||||
|
||||
IBOutlet NSWindow *mainWindow;
|
||||
IBOutlet NSWindow *miniWindow;
|
||||
IBOutlet NSWindow *mainWindow;
|
||||
IBOutlet NSWindow *miniWindow;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -20,372 +20,372 @@ NSString *TrackLength = @"Total Time";
|
|||
NSString *TrackPath = @"Location";
|
||||
NSString *TrackState = @"Player State";
|
||||
|
||||
typedef NS_ENUM(NSInteger, TrackStatus) { TrackPlaying, TrackPaused, TrackStopped };
|
||||
typedef NS_ENUM(NSInteger, TrackStatus) { TrackPlaying,
|
||||
TrackPaused,
|
||||
TrackStopped };
|
||||
|
||||
@implementation PlaybackEventController {
|
||||
AudioScrobbler *scrobbler;
|
||||
AudioScrobbler *scrobbler;
|
||||
|
||||
NSOperationQueue *queue;
|
||||
NSOperationQueue *queue;
|
||||
|
||||
PlaylistEntry *entry;
|
||||
PlaylistEntry *entry;
|
||||
|
||||
Boolean didGainUN API_AVAILABLE(macosx(10.14));
|
||||
Boolean didGainUN API_AVAILABLE(macosx(10.14));
|
||||
}
|
||||
|
||||
- (void)initDefaults {
|
||||
NSDictionary *defaultsDictionary = @{
|
||||
@"enableAudioScrobbler" : @YES,
|
||||
@"automaticallyLaunchLastFM" : @NO,
|
||||
@"notifications.enable" : @YES,
|
||||
@"notifications.itunes-style" : @YES,
|
||||
@"notifications.show-album-art" : @YES
|
||||
};
|
||||
NSDictionary *defaultsDictionary = @{
|
||||
@"enableAudioScrobbler": @YES,
|
||||
@"automaticallyLaunchLastFM": @NO,
|
||||
@"notifications.enable": @YES,
|
||||
@"notifications.itunes-style": @YES,
|
||||
@"notifications.show-album-art": @YES
|
||||
};
|
||||
|
||||
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
|
||||
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
|
||||
}
|
||||
|
||||
- (id)init {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
[self initDefaults];
|
||||
self = [super init];
|
||||
if(self) {
|
||||
[self initDefaults];
|
||||
|
||||
didGainUN = NO;
|
||||
didGainUN = NO;
|
||||
|
||||
if (@available(macOS 10.14, *)) {
|
||||
UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
|
||||
[center
|
||||
requestAuthorizationWithOptions:UNAuthorizationOptionAlert
|
||||
completionHandler:^(BOOL granted, NSError *_Nullable error) {
|
||||
self->didGainUN = granted;
|
||||
if(@available(macOS 10.14, *)) {
|
||||
UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
|
||||
[center
|
||||
requestAuthorizationWithOptions:UNAuthorizationOptionAlert
|
||||
completionHandler:^(BOOL granted, NSError *_Nullable error) {
|
||||
self->didGainUN = granted;
|
||||
|
||||
if (granted) {
|
||||
UNNotificationAction *skipAction = [UNNotificationAction
|
||||
actionWithIdentifier:@"skip"
|
||||
title:@"Skip"
|
||||
options:UNNotificationActionOptionNone];
|
||||
if(granted) {
|
||||
UNNotificationAction *skipAction = [UNNotificationAction
|
||||
actionWithIdentifier:@"skip"
|
||||
title:@"Skip"
|
||||
options:UNNotificationActionOptionNone];
|
||||
|
||||
UNNotificationCategory *playCategory = [UNNotificationCategory
|
||||
categoryWithIdentifier:@"play"
|
||||
actions:@[ skipAction ]
|
||||
intentIdentifiers:@[]
|
||||
options:UNNotificationCategoryOptionNone];
|
||||
UNNotificationCategory *playCategory = [UNNotificationCategory
|
||||
categoryWithIdentifier:@"play"
|
||||
actions:@[skipAction]
|
||||
intentIdentifiers:@[]
|
||||
options:UNNotificationCategoryOptionNone];
|
||||
|
||||
[center setNotificationCategories:
|
||||
[NSSet setWithObject:playCategory]];
|
||||
}
|
||||
}];
|
||||
[center setNotificationCategories:
|
||||
[NSSet setWithObject:playCategory]];
|
||||
}
|
||||
}];
|
||||
|
||||
[center setDelegate:self];
|
||||
}
|
||||
[center setDelegate:self];
|
||||
}
|
||||
|
||||
queue = [[NSOperationQueue alloc] init];
|
||||
[queue setMaxConcurrentOperationCount:1];
|
||||
queue = [[NSOperationQueue alloc] init];
|
||||
[queue setMaxConcurrentOperationCount:1];
|
||||
|
||||
scrobbler = [[AudioScrobbler alloc] init];
|
||||
[[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
|
||||
scrobbler = [[AudioScrobbler alloc] init];
|
||||
[[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
|
||||
|
||||
entry = nil;
|
||||
}
|
||||
entry = nil;
|
||||
}
|
||||
|
||||
return self;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)userNotificationCenter:(UNUserNotificationCenter *)center
|
||||
willPresentNotification:(UNNotification *)notification
|
||||
withCompletionHandler:
|
||||
(void (^)(UNNotificationPresentationOptions options))completionHandler
|
||||
API_AVAILABLE(macos(10.14)) {
|
||||
UNNotificationPresentationOptions presentationOptions = UNNotificationPresentationOptionAlert;
|
||||
(void (^)(UNNotificationPresentationOptions options))completionHandler
|
||||
API_AVAILABLE(macos(10.14)) {
|
||||
UNNotificationPresentationOptions presentationOptions = UNNotificationPresentationOptionAlert;
|
||||
|
||||
completionHandler(presentationOptions);
|
||||
completionHandler(presentationOptions);
|
||||
}
|
||||
|
||||
- (void)userNotificationCenter:(UNUserNotificationCenter *)center
|
||||
didReceiveNotificationResponse:(UNNotificationResponse *)response
|
||||
withCompletionHandler:(void (^)(void))completionHandler API_AVAILABLE(macos(10.14)) {
|
||||
if ([[response actionIdentifier] isEqualToString:@"skip"]) {
|
||||
[playbackController next:self];
|
||||
}
|
||||
didReceiveNotificationResponse:(UNNotificationResponse *)response
|
||||
withCompletionHandler:(void (^)(void))completionHandler API_AVAILABLE(macos(10.14)) {
|
||||
if([[response actionIdentifier] isEqualToString:@"skip"]) {
|
||||
[playbackController next:self];
|
||||
}
|
||||
}
|
||||
|
||||
- (NSDictionary *)fillNotificationDictionary:(PlaylistEntry *)pe status:(TrackStatus)status {
|
||||
NSMutableDictionary *dict = [NSMutableDictionary dictionary];
|
||||
if (pe == nil) return dict;
|
||||
NSMutableDictionary *dict = [NSMutableDictionary dictionary];
|
||||
if(pe == nil) return dict;
|
||||
|
||||
[dict setObject:[[pe URL] absoluteString] forKey:TrackPath];
|
||||
if ([pe title]) [dict setObject:[pe title] forKey:TrackTitle];
|
||||
if ([pe artist]) [dict setObject:[pe artist] forKey:TrackArtist];
|
||||
if ([pe album]) [dict setObject:[pe album] forKey:TrackAlbum];
|
||||
if ([pe genre]) [dict setObject:[pe genre] forKey:TrackGenre];
|
||||
if ([pe track])
|
||||
[dict setObject:[pe trackText] forKey:TrackNumber];
|
||||
if ([pe length])
|
||||
[dict setObject:[NSNumber numberWithInteger:(NSInteger)([[pe length] doubleValue] * 1000.0)]
|
||||
forKey:TrackLength];
|
||||
[dict setObject:[[pe URL] absoluteString] forKey:TrackPath];
|
||||
if([pe title]) [dict setObject:[pe title] forKey:TrackTitle];
|
||||
if([pe artist]) [dict setObject:[pe artist] forKey:TrackArtist];
|
||||
if([pe album]) [dict setObject:[pe album] forKey:TrackAlbum];
|
||||
if([pe genre]) [dict setObject:[pe genre] forKey:TrackGenre];
|
||||
if([pe track])
|
||||
[dict setObject:[pe trackText] forKey:TrackNumber];
|
||||
if([pe length])
|
||||
[dict setObject:[NSNumber numberWithInteger:(NSInteger)([[pe length] doubleValue] * 1000.0)]
|
||||
forKey:TrackLength];
|
||||
|
||||
NSString *state = nil;
|
||||
NSString *state = nil;
|
||||
|
||||
switch (status) {
|
||||
case TrackPlaying:
|
||||
state = @"Playing";
|
||||
break;
|
||||
case TrackPaused:
|
||||
state = @"Paused";
|
||||
break;
|
||||
case TrackStopped:
|
||||
state = @"Stopped";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
switch(status) {
|
||||
case TrackPlaying:
|
||||
state = @"Playing";
|
||||
break;
|
||||
case TrackPaused:
|
||||
state = @"Paused";
|
||||
break;
|
||||
case TrackStopped:
|
||||
state = @"Stopped";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
[dict setObject:state forKey:TrackState];
|
||||
[dict setObject:state forKey:TrackState];
|
||||
|
||||
return dict;
|
||||
return dict;
|
||||
}
|
||||
|
||||
- (void)performPlaybackDidBeginActions:(PlaylistEntry *)pe {
|
||||
if (NO == [pe error]) {
|
||||
entry = pe;
|
||||
if(NO == [pe error]) {
|
||||
entry = pe;
|
||||
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:pe status:TrackPlaying]
|
||||
deliverImmediately:YES];
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:pe status:TrackPlaying]
|
||||
deliverImmediately:YES];
|
||||
|
||||
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
||||
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
||||
|
||||
if ([defaults boolForKey:@"notifications.enable"]) {
|
||||
if ([defaults boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler start:pe];
|
||||
if ([AudioScrobbler isRunning]) return;
|
||||
}
|
||||
if([defaults boolForKey:@"notifications.enable"]) {
|
||||
if([defaults boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler start:pe];
|
||||
if([AudioScrobbler isRunning]) return;
|
||||
}
|
||||
|
||||
if (@available(macOS 10.14, *)) {
|
||||
if (didGainUN) {
|
||||
UNUserNotificationCenter *center =
|
||||
[UNUserNotificationCenter currentNotificationCenter];
|
||||
if(@available(macOS 10.14, *)) {
|
||||
if(didGainUN) {
|
||||
UNUserNotificationCenter *center =
|
||||
[UNUserNotificationCenter currentNotificationCenter];
|
||||
|
||||
UNMutableNotificationContent *content =
|
||||
[[UNMutableNotificationContent alloc] init];
|
||||
UNMutableNotificationContent *content =
|
||||
[[UNMutableNotificationContent alloc] init];
|
||||
|
||||
content.title = @"Now Playing";
|
||||
content.title = @"Now Playing";
|
||||
|
||||
NSString *subtitle;
|
||||
if ([pe artist] && [pe album]) {
|
||||
subtitle = [NSString stringWithFormat:@"%@ - %@", [pe artist], [pe album]];
|
||||
} else if ([pe artist]) {
|
||||
subtitle = [pe artist];
|
||||
} else if ([pe album]) {
|
||||
subtitle = [pe album];
|
||||
} else {
|
||||
subtitle = @"";
|
||||
}
|
||||
NSString *subtitle;
|
||||
if([pe artist] && [pe album]) {
|
||||
subtitle = [NSString stringWithFormat:@"%@ - %@", [pe artist], [pe album]];
|
||||
} else if([pe artist]) {
|
||||
subtitle = [pe artist];
|
||||
} else if([pe album]) {
|
||||
subtitle = [pe album];
|
||||
} else {
|
||||
subtitle = @"";
|
||||
}
|
||||
|
||||
NSString *body = [NSString stringWithFormat:@"%@\n%@", [pe title], subtitle];
|
||||
content.body = body;
|
||||
content.sound = nil;
|
||||
content.categoryIdentifier = @"play";
|
||||
NSString *body = [NSString stringWithFormat:@"%@\n%@", [pe title], subtitle];
|
||||
content.body = body;
|
||||
content.sound = nil;
|
||||
content.categoryIdentifier = @"play";
|
||||
|
||||
if ([defaults boolForKey:@"notifications.show-album-art"] &&
|
||||
[pe albumArt]) {
|
||||
NSError *error = nil;
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
NSURL *tmpSubFolderURL = [[NSURL fileURLWithPath:NSTemporaryDirectory()]
|
||||
URLByAppendingPathComponent:@"cog-artworks-cache"
|
||||
isDirectory:true];
|
||||
if ([fileManager createDirectoryAtPath:[tmpSubFolderURL path]
|
||||
withIntermediateDirectories:true
|
||||
attributes:nil
|
||||
error:&error]) {
|
||||
NSString *tmpFileName =
|
||||
[[NSProcessInfo.processInfo globallyUniqueString]
|
||||
stringByAppendingString:@".jpg"];
|
||||
NSURL *fileURL =
|
||||
[tmpSubFolderURL URLByAppendingPathComponent:tmpFileName];
|
||||
NSImage *image = [pe albumArt];
|
||||
CGImageRef cgRef = [image CGImageForProposedRect:NULL
|
||||
context:nil
|
||||
hints:nil];
|
||||
|
||||
if (cgRef) {
|
||||
NSBitmapImageRep *newRep =
|
||||
[[NSBitmapImageRep alloc] initWithCGImage:cgRef];
|
||||
NSData *jpgData = [newRep
|
||||
representationUsingType:NSBitmapImageFileTypeJPEG
|
||||
properties:@{NSImageCompressionFactor : @0.5f}];
|
||||
[jpgData writeToURL:fileURL atomically:YES];
|
||||
if([defaults boolForKey:@"notifications.show-album-art"] &&
|
||||
[pe albumArt]) {
|
||||
NSError *error = nil;
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
NSURL *tmpSubFolderURL = [[NSURL fileURLWithPath:NSTemporaryDirectory()]
|
||||
URLByAppendingPathComponent:@"cog-artworks-cache"
|
||||
isDirectory:true];
|
||||
if([fileManager createDirectoryAtPath:[tmpSubFolderURL path]
|
||||
withIntermediateDirectories:true
|
||||
attributes:nil
|
||||
error:&error]) {
|
||||
NSString *tmpFileName =
|
||||
[[NSProcessInfo.processInfo globallyUniqueString]
|
||||
stringByAppendingString:@".jpg"];
|
||||
NSURL *fileURL =
|
||||
[tmpSubFolderURL URLByAppendingPathComponent:tmpFileName];
|
||||
NSImage *image = [pe albumArt];
|
||||
CGImageRef cgRef = [image CGImageForProposedRect:NULL
|
||||
context:nil
|
||||
hints:nil];
|
||||
|
||||
UNNotificationAttachment *icon =
|
||||
[UNNotificationAttachment attachmentWithIdentifier:@"art"
|
||||
URL:fileURL
|
||||
options:nil
|
||||
error:&error];
|
||||
if (error) {
|
||||
// We have size limit of 10MB per image attachment.
|
||||
NSLog(@"%@", error.localizedDescription);
|
||||
} else {
|
||||
content.attachments = @[ icon ];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(cgRef) {
|
||||
NSBitmapImageRep *newRep =
|
||||
[[NSBitmapImageRep alloc] initWithCGImage:cgRef];
|
||||
NSData *jpgData = [newRep
|
||||
representationUsingType:NSBitmapImageFileTypeJPEG
|
||||
properties:@{ NSImageCompressionFactor: @0.5f }];
|
||||
[jpgData writeToURL:fileURL atomically:YES];
|
||||
|
||||
UNNotificationRequest *request =
|
||||
[UNNotificationRequest requestWithIdentifier:@"PlayTrack"
|
||||
content:content
|
||||
trigger:nil];
|
||||
UNNotificationAttachment *icon =
|
||||
[UNNotificationAttachment attachmentWithIdentifier:@"art"
|
||||
URL:fileURL
|
||||
options:nil
|
||||
error:&error];
|
||||
if(error) {
|
||||
// We have size limit of 10MB per image attachment.
|
||||
NSLog(@"%@", error.localizedDescription);
|
||||
} else {
|
||||
content.attachments = @[icon];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[center addNotificationRequest:request
|
||||
withCompletionHandler:^(NSError *_Nullable error) {
|
||||
NSLog(@"%@", error.localizedDescription);
|
||||
}];
|
||||
}
|
||||
} else {
|
||||
NSUserNotification *notif = [[NSUserNotification alloc] init];
|
||||
notif.title = [pe title];
|
||||
UNNotificationRequest *request =
|
||||
[UNNotificationRequest requestWithIdentifier:@"PlayTrack"
|
||||
content:content
|
||||
trigger:nil];
|
||||
|
||||
NSString *subtitle;
|
||||
if ([pe artist] && [pe album]) {
|
||||
subtitle = [NSString stringWithFormat:@"%@ - %@", [pe artist], [pe album]];
|
||||
} else if ([pe artist]) {
|
||||
subtitle = [pe artist];
|
||||
} else if ([pe album]) {
|
||||
subtitle = [pe album];
|
||||
} else {
|
||||
subtitle = @"";
|
||||
}
|
||||
[center addNotificationRequest:request
|
||||
withCompletionHandler:^(NSError *_Nullable error) {
|
||||
NSLog(@"%@", error.localizedDescription);
|
||||
}];
|
||||
}
|
||||
} else {
|
||||
NSUserNotification *notif = [[NSUserNotification alloc] init];
|
||||
notif.title = [pe title];
|
||||
|
||||
if ([defaults boolForKey:@"notifications.itunes-style"]) {
|
||||
notif.subtitle = subtitle;
|
||||
[notif setValue:@YES forKey:@"_showsButtons"];
|
||||
} else {
|
||||
notif.informativeText = subtitle;
|
||||
}
|
||||
NSString *subtitle;
|
||||
if([pe artist] && [pe album]) {
|
||||
subtitle = [NSString stringWithFormat:@"%@ - %@", [pe artist], [pe album]];
|
||||
} else if([pe artist]) {
|
||||
subtitle = [pe artist];
|
||||
} else if([pe album]) {
|
||||
subtitle = [pe album];
|
||||
} else {
|
||||
subtitle = @"";
|
||||
}
|
||||
|
||||
if ([notif respondsToSelector:@selector(setContentImage:)]) {
|
||||
if ([defaults boolForKey:@"notifications.show-album-art"] &&
|
||||
[pe albumArtInternal]) {
|
||||
NSImage *image = [pe albumArt];
|
||||
if([defaults boolForKey:@"notifications.itunes-style"]) {
|
||||
notif.subtitle = subtitle;
|
||||
[notif setValue:@YES forKey:@"_showsButtons"];
|
||||
} else {
|
||||
notif.informativeText = subtitle;
|
||||
}
|
||||
|
||||
if ([defaults boolForKey:@"notifications.itunes-style"]) {
|
||||
[notif setValue:image forKey:@"_identityImage"];
|
||||
} else {
|
||||
notif.contentImage = image;
|
||||
}
|
||||
}
|
||||
}
|
||||
if([notif respondsToSelector:@selector(setContentImage:)]) {
|
||||
if([defaults boolForKey:@"notifications.show-album-art"] &&
|
||||
[pe albumArtInternal]) {
|
||||
NSImage *image = [pe albumArt];
|
||||
|
||||
notif.actionButtonTitle = @"Skip";
|
||||
if([defaults boolForKey:@"notifications.itunes-style"]) {
|
||||
[notif setValue:image forKey:@"_identityImage"];
|
||||
} else {
|
||||
notif.contentImage = image;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[[NSUserNotificationCenter defaultUserNotificationCenter]
|
||||
scheduleNotification:notif];
|
||||
}
|
||||
}
|
||||
}
|
||||
notif.actionButtonTitle = @"Skip";
|
||||
|
||||
[[NSUserNotificationCenter defaultUserNotificationCenter]
|
||||
scheduleNotification:notif];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void)performPlaybackDidPauseActions {
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:entry status:TrackPaused]
|
||||
deliverImmediately:YES];
|
||||
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler pause];
|
||||
}
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:entry status:TrackPaused]
|
||||
deliverImmediately:YES];
|
||||
if([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler pause];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)performPlaybackDidResumeActions {
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:entry status:TrackPlaying]
|
||||
deliverImmediately:YES];
|
||||
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler resume];
|
||||
}
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:entry status:TrackPlaying]
|
||||
deliverImmediately:YES];
|
||||
if([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler resume];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)performPlaybackDidStopActions {
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:entry status:TrackStopped]
|
||||
deliverImmediately:YES];
|
||||
entry = nil;
|
||||
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler stop];
|
||||
}
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
postNotificationName:TrackNotification
|
||||
object:nil
|
||||
userInfo:[self fillNotificationDictionary:entry status:TrackStopped]
|
||||
deliverImmediately:YES];
|
||||
entry = nil;
|
||||
if([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
|
||||
[scrobbler stop];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)awakeFromNib {
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(playbackDidBegin:)
|
||||
name:CogPlaybackDidBeginNotficiation
|
||||
object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(playbackDidPause:)
|
||||
name:CogPlaybackDidPauseNotficiation
|
||||
object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(playbackDidResume:)
|
||||
name:CogPlaybackDidResumeNotficiation
|
||||
object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(playbackDidStop:)
|
||||
name:CogPlaybackDidStopNotficiation
|
||||
object:nil];
|
||||