Merge branch 'pr/255'

* pr/255: Attend to various warnings High CPU Fix Various Fixes
radiant-player · Dec 6, 2014 · a23b0c2 · a23b0c2
2 parents 97c5d30 + 427c02d
commit a23b0c2
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 30 deletions.
diff --git a/radiant-player-mac/AppDelegate.m b/radiant-player-mac/AppDelegate.m
@@ -764,7 +764,7 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
     }
 
     // Determine whether the player is using thumbs or stars.
-    isStarsRatingSystem = [[webView windowScriptObject] evaluateWebScript:@"MusicAPI.Rating.isStarsRatingSystem()"] == YES;
+    isStarsRatingSystem = (int)[[webView windowScriptObject] evaluateWebScript:@"MusicAPI.Rating.isStarsRatingSystem()"] == YES;
 
     [self setupRatingMenuItems];
 }

diff --git a/radiant-player-mac/LastFm/LastFmService.m b/radiant-player-mac/LastFm/LastFmService.m
@@ -150,7 +150,6 @@ - (void)fetchTrackLovedStatus:(NSString *)track artist:(NSString *)artist sender
 
 - (void)openRecentTracksPage:(id)sender
 {
-    NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
     NSString *username = [[[LastFm sharedInstance] username] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     NSString *page = [NSString stringWithFormat:@"http://www.last.fm/user/%@", username];
     NSURL *url = [NSURL URLWithString:page];

diff --git a/radiant-player-mac/Popup/PlaybackSliderCell.m b/radiant-player-mac/Popup/PlaybackSliderCell.m
@@ -94,7 +94,7 @@ - (void)drawKnob:(NSRect)knobRect
     NSPoint curPoint = NSMakePoint(aRect.origin.x, aRect.origin.y + 3);
     NSInteger curMinutes = ((self.integerValue / 1000) / 60);
     NSInteger curSeconds = ((self.integerValue / 1000) % 60);
-    NSAttributedString *curTime = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%d:%02d", curMinutes, curSeconds]
+    NSAttributedString *curTime = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld:%02ld", (long)curMinutes, (long)curSeconds]
                                                                   attributes:attributes];
 
     [[NSColor orangeColor] set];
@@ -109,7 +109,7 @@ - (void)drawKnob:(NSRect)knobRect
     NSPoint totalPoint = NSMakePoint(aRect.size.width, aRect.origin.y + 3);
     NSInteger totalMinutes = ((int)(self.maxValue / 1000) / 60);
     NSInteger totalSeconds = ((int)(self.maxValue / 1000) % 60);
-    NSAttributedString *totalTime = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%d:%02d", totalMinutes, totalSeconds]
+    NSAttributedString *totalTime = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%ld:%02ld", (long)totalMinutes, (long)totalSeconds]
                                                                     attributes:attributes];
 
     [[NSColor grayColor] set];

diff --git a/radiant-player-mac/Popup/PopupPanel.m b/radiant-player-mac/Popup/PopupPanel.m
@@ -90,11 +90,7 @@ - (void)closeAndNotify:(BOOL)notify
     [[NSAnimationContext currentContext] setDuration:.15];
     [[self animator] setAlphaValue:0];
     [NSAnimationContext endGrouping];
-
-    dispatch_after(dispatch_walltime(NULL, NSEC_PER_SEC * .15 * 2), dispatch_get_main_queue(), ^{
-
-        [self orderOut:nil];
-    });
+
 }
 
 @end
diff --git a/radiant-player-mac/Popup/PopupStatusView.h b/radiant-player-mac/Popup/PopupStatusView.h
@@ -28,7 +28,6 @@
 
 - (void)setupStatusItem;
 - (void)update;
-- (id)button;
 - (NSRect)buttonFrame;
 - (NSView *)buttonView;
 - (NSImage *)buttonImage;

diff --git a/radiant-player-mac/Popup/RatingBadgeButton.m b/radiant-player-mac/Popup/RatingBadgeButton.m
@@ -33,7 +33,7 @@ -(void)awakeFromNib
      */
 
     NSTrackingArea *boxArea = [[NSTrackingArea alloc]
-                                    initWithRect:[self convertRectFromBase:box]
+                               initWithRect:[self convertRectFromBacking:box]
                                     options:NSTrackingMouseEnteredAndExited|NSTrackingActiveAlways
                                     owner:self
                                     userInfo:@{@"badge": [NSNumber numberWithBool:NO]}];

diff --git a/radiant-player-mac/WebView/CookieStorage.h b/radiant-player-mac/WebView/CookieStorage.h
@@ -13,6 +13,7 @@
 @interface CookieStorage : NSObject {
     NSMutableArray *_storage;
     NSString *_storagePath;
+    NSHTTPCookieAcceptPolicy _policy;
 }
 
 + (CookieStorage *)instance;

diff --git a/radiant-player-mac/WebView/CookieStorage.m b/radiant-player-mac/WebView/CookieStorage.m
@@ -32,6 +32,7 @@ - (id)init
     if (self) {
         _storage = [NSMutableArray array];
         _storagePath = [CookieStorage defaultCookieStoragePath];
+        _policy = NSHTTPCookieAcceptPolicyAlways;
 
         [self unarchive];
     }
@@ -44,6 +45,16 @@ - (void)deleteCookie:(NSHTTPCookie *)cookie
     [_storage removeObject:cookie];
 }
 
+- (NSHTTPCookieAcceptPolicy)cookieAcceptPolicy
+{
+    return _policy;
+}
+
+- (void)setCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy
+{
+    _policy = policy;
+}
+
 - (void)setCookie:(NSHTTPCookie *)cookie
 {
     NSString *domain = [[cookie domain] lowercaseString];

diff --git a/radiant-player-mac/WebView/CustomWebView.h b/radiant-player-mac/WebView/CustomWebView.h
@@ -32,6 +32,4 @@
 
 @property (retain) NSData *invertedSpriteSheet;
 
-- (IBAction)selectAll:(id)sender;
-
 @end
diff --git a/radiant-player-mac/WebView/SpriteDownloadURLProtocol.m b/radiant-player-mac/WebView/SpriteDownloadURLProtocol.m
@@ -25,7 +25,7 @@ + (BOOL) canInitWithRequest:(NSURLRequest*)request
     return NO;
 }
 
-- (id) initWithRequest:(NSURLRequest*)theRequest cachedResponse:(NSCachedURLResponse*)cachedResponse client:(id<NSURLProtocolClient>)client
+- (id) initWithRequest:(NSURLRequest *)theRequest cachedResponse:(NSCachedURLResponse *)cachedResponse client:(id<NSURLProtocolClient>)client
 {
     // Move the delegate from the request to this instance
     NSMutableURLRequest* req = (NSMutableURLRequest*)theRequest;
@@ -56,17 +56,17 @@ - (void) stopLoading
 
 - (void)connection:(NSURLConnection*)conn didReceiveResponse:(NSURLResponse*)response
 {
-    [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:[[self request] cachePolicy]];
+    [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
     [_data setLength:0];
 }
 
-- (void)connection:(NSURLConnection*)connection didReceiveData:(NSData*)data
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
 {
     [[self client] URLProtocol:self didLoadData:data];
     [_data appendData:data];
 }
 
-- (void)connectionDidFinishLoading:(NSURLConnection*)conn
+- (void)connectionDidFinishLoading:(NSURLConnection *)conn
 {
     [[self client] URLProtocolDidFinishLoading:self];
 
@@ -83,6 +83,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection*)conn
     CGImageDestinationRef dest = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)(data), kUTTypePNG, 1, NULL);
     CGImageDestinationAddImage(dest, cgimage, NULL);
     CGImageDestinationFinalize(dest);
+    CGImageRelease(cgimage);
     CFRelease(dest);
 
     // Forward the response to your delegate however you like

diff --git a/radiant-player-mac/css/cocoa.css b/radiant-player-mac/css/cocoa.css
@@ -126,7 +126,7 @@
 
 .song-row .rating-container.stars {
     height: 100% !important;
-    margin-top: 0px !important;
+    line-height: 50%;
 }
 
 .song-row .rating-container.thumbs [data-rating] {
@@ -242,6 +242,14 @@
     margin: 0;
 }
 
+#playerSongInfo {
+    overflow: hidden;
+}
+
+#playerSongInfo .text-wrapper #playerSongTitle {
+    margin-right: 110px;
+}
+
 #player .flat-button, #player .flat-button:hover, #player .flat-button:active {
     background-color: transparent !important;
 }

diff --git a/radiant-player-mac/css/dark-flat.css b/radiant-player-mac/css/dark-flat.css
@@ -143,7 +143,7 @@ a, .simple-dialog a {
 
 .song-row .rating-container.stars {
     height: 100% !important;
-    margin-top: 0px !important;
+    line-height: 50%;
 }
 
 .song-row .rating-container.thumbs [data-rating] {
@@ -269,6 +269,14 @@ a, .simple-dialog a {
     margin: 0;
 }
 
+#playerSongInfo {
+    overflow: hidden;
+}
+
+#playerSongInfo .text-wrapper #playerSongTitle {
+    margin-right: 110px;
+}
+
 #player .flat-button, #player .flat-button:hover, #player .flat-button:active {
     background-color: transparent !important;
 }

diff --git a/radiant-player-mac/css/dark.css b/radiant-player-mac/css/dark.css
@@ -150,7 +150,7 @@ a, .simple-dialog a {
 
 .song-row .rating-container.stars {
     height: 100% !important;
-    margin-top: 0px !important;
+    line-height: 50%;
 }
 
 .song-row .rating-container.thumbs [data-rating] {
@@ -280,6 +280,14 @@ a, .simple-dialog a {
     margin: 0;
 }
 
+#playerSongInfo {
+    overflow: hidden;
+}
+
+#playerSongInfo .text-wrapper #playerSongTitle {
+    margin-right: 110px;
+}
+
 #player .flat-button, #player .flat-button:hover, #player .flat-button:active {
     background-color: transparent !important;
 }

diff --git a/radiant-player-mac/css/navigation.css b/radiant-player-mac/css/navigation.css
@@ -1,5 +1,5 @@
 /*
- * css/cocoa.css
+ * css/navigation.css
  *
  * Custom stylesheet that handles the back and forward buttons.
  *

diff --git a/radiant-player-mac/css/spotify-black.css b/radiant-player-mac/css/spotify-black.css
@@ -178,15 +178,15 @@ a, .simple-dialog a {
 
 .song-row .rating-container.stars {
     height: 100% !important;
-    margin-top: -1px !important;
+    line-height: 50%;
 }
 
 .song-row .rating-container.thumbs [data-rating] {
-    margin-top: 6px;
+    margin-top: 0px;
 }
 
 .song-row .hover-button[data-id="menu"], .song-row .hover-button[data-id="menu"]:hover {
-    margin-top: 8px;
+    margin: 1px 0 0 0;
     border: none;
     border-radius: 0;
 }
@@ -323,6 +323,14 @@ a, .simple-dialog a {
     margin: 0;
 }
 
+#playerSongInfo {
+    overflow: hidden;
+}
+
+#playerSongInfo .text-wrapper #playerSongTitle {
+    margin-right: 110px;
+}
+
 #player .flat-button, #player .flat-button:hover, #player .flat-button:active {
     background-color: transparent !important;
 }

diff --git a/radiant-player-mac/css/yosemite.css b/radiant-player-mac/css/yosemite.css
@@ -128,7 +128,7 @@ body {
 
 .song-row .rating-container.stars {
     height: 100% !important;
-    margin-top: 0px !important;
+    line-height: 50%;
 }
 
 .song-row .rating-container.thumbs [data-rating] {
@@ -256,6 +256,14 @@ body {
     margin: 0;
 }
 
+#playerSongInfo {
+    overflow: hidden;
+}
+
+#playerSongInfo .text-wrapper #playerSongTitle {
+    margin-right: 110px;
+}
+
 #player .flat-button, #player .flat-button:hover, #player .flat-button:active {
     background-color: transparent !important;
 }

diff --git a/radiant-player-mac/en.lproj/MainMenu.xib b/radiant-player-mac/en.lproj/MainMenu.xib
@@ -131,11 +131,6 @@
                                     <action selector="delete:" target="-1" id="235"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="hIO-3X-3Jm">
-                                <connections>
-                                    <action selector="selectAll:" target="536" id="Wge-u1-feB"/>
-                                </connections>
-                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="206">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,6 +32,4 @@

		@property (retain) NSData *invertedSpriteSheet;

		- (IBAction)selectAll:(id)sender;

		@end