Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix up addition of stop menu item for mac dock (#287)
  • Loading branch information
johnmurrayvi committed May 3, 2014
1 parent 2a465eb commit 532f999
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
13 changes: 6 additions & 7 deletions components/integration/src/macosx/sbMacAppDelegate.mm
Expand Up @@ -81,6 +81,7 @@ - (void)_appendMenuItem:(NSString *)aTitle
menu:(NSMenu *)aParentMenu;
- (BOOL)_isPlaybackMuted;
- (BOOL)_isPlaybackPlaying;
- (BOOL)_isPlaybackStoppable;
- (NSString *)_stringForLocalizedKey:(const PRUnichar *)aBuffer;

@end
Expand Down Expand Up @@ -329,12 +330,10 @@ - (void)_addPlayerControlMenuItems:(NSMenu *)aMenu
menu:aMenu];

// Stop menu item
if ([self _isPlaybackStoppable]) {
nsString stopLabel(NS_LITERAL_STRING("playback.label.stop"));
[self _appendMenuItem:[self _stringForLocalizedKey:stopLabel.get()]
action:@selector(onStopSelected:)
menu:aMenu];
}
nsString stopLabel(NS_LITERAL_STRING("playback.label.stop"));
[self _appendMenuItem:[self _stringForLocalizedKey:stopLabel.get()]
action:@selector(onStopSelected:)
menu:aMenu];

// Mute menu item
nsString muteLabel(NS_LITERAL_STRING("playback.label.mute"));
Expand Down Expand Up @@ -456,7 +455,7 @@ - (void)onStopSelected:(id)aSender
return;
}

sequencer->stop(PR_FALSE);
sequencer->Stop(PR_FALSE);

NS_OBJC_END_TRY_ABORT_BLOCK;
}
Expand Down
1 change: 1 addition & 0 deletions locales/en-US/songbird/songbird.properties
Expand Up @@ -1198,6 +1198,7 @@ playback.label.play=Play
playback.label.pause=Pause
playback.label.next=Next
playback.label.previous=Previous
playback.label.stop=Stop
playback.label.mute=Mute

# Keep this service pane node around for legacy reaasons.
Expand Down

0 comments on commit 532f999

Please sign in to comment.