Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove self cast target #6277

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Remove self cast target #6277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc7ec0e
Remove self cast target
thornbill Oct 30, 2024
ca7311c
Simplify play target sorting
thornbill Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,20 @@ const RemotePlayMenu: FC<RemotePlayMenuProps> = ({
open={open}
onClose={onMenuClose}
>
{!isChromecastPluginLoaded && ([
<MenuItem key='cast-unsupported-item' disabled>
{!isChromecastPluginLoaded && (
<MenuItem disabled>
<ListItemIcon>
<Warning />
</ListItemIcon>
<ListItemText>
{globalize.translate('GoogleCastUnsupported')}
</ListItemText>
</MenuItem>,
<Divider key='cast-unsupported-divider' />
])}
</MenuItem>
)}

{!isChromecastPluginLoaded && playbackTargets.length > 0 && (
<Divider />
)}

{playbackTargets.map(target => (
<MenuItem
Expand Down
27 changes: 2 additions & 25 deletions src/components/playback/playbackmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,31 +852,8 @@ export class PlaybackManager {
self.getTargets = function () {
const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);

return Promise.all(promises).then(function (responses) {
return ServerConnections.currentApiClient().getCurrentUser().then(function (user) {
const targets = [];

targets.push({
name: globalize.translate('HeaderMyDevice'),
id: 'localplayer',
playerName: 'localplayer',
playableMediaTypes: ['Audio', 'Video', 'Photo', 'Book'],
isLocalPlayer: true,
supportedCommands: self.getSupportedCommands({
isLocalPlayer: true
}),
user: user
});

for (const subTargets of responses) {
for (const subTarget of subTargets) {
targets.push(subTarget);
}
}

return targets.sort(sortPlayerTargets);
});
});
return Promise.all(promises)
.then(responses => responses.flat().sort(sortPlayerTargets));
};

self.playerHasSecondarySubtitleSupport = function (player = self._currentPlayer) {
Expand Down
1 change: 0 additions & 1 deletion src/strings/en-us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@
"HeaderMetadataSettings": "Metadata Settings",
"HeaderMoreLikeThis": "More Like This",
"HeaderMusicQuality": "Music Quality",
"HeaderMyDevice": "My Device",
"HeaderMyMedia": "My Media",
"HeaderMyMediaSmall": "My Media (small)",
"HeaderNavigation": "Navigation",
Expand Down
Loading