RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enabled audio player in touchbar only for songs.

This commit is contained in:
23rd 2019-05-04 12:43:22 +03:00 committed by John Preston
parent ba1691bf7e
commit 09b5055fac
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/platform/mac/touchbar.h
View File

@ -16,6 +16,7 @@ enum class TouchBarType {
None, None,
Main, Main,
AudioPlayer, AudioPlayer,
AudioPlayerForce,
}; };
} // namespace } // namespace

27
Telegram/SourceFiles/platform/mac/touchbar.mm
View File

@ -38,8 +38,6 @@ namespace {
constexpr auto kIdealIconSize = 36; constexpr auto kIdealIconSize = 36;
constexpr auto kMaximumIconSize = 44; constexpr auto kMaximumIconSize = 44;
constexpr auto kSavedMessages = 0x001;
constexpr auto kPlayPause = 0x002; constexpr auto kPlayPause = 0x002;
constexpr auto kPlaylistPrevious = 0x003; constexpr auto kPlaylistPrevious = 0x003;
constexpr auto kPlaylistNext = 0x004; constexpr auto kPlaylistNext = 0x004;
@ -370,17 +368,34 @@ NSImage *createImageFromStyleIcon(const style::icon &icon, NSSize size) {
if (self.touchBarType == type) { if (self.touchBarType == type) {
return; return;
} }
self.touchBarType = type;
if (type == TouchBarType::Main) { if (type == TouchBarType::Main) {
[self.view setTouchBar:_touchBarMain]; [self.view setTouchBar:_touchBarMain];
} else if (type == TouchBarType::AudioPlayer) { } else if (type == TouchBarType::AudioPlayer) {
if (!isCurrentSongExists()
|| Media::Player::instance()->getActiveType() != kSongType) {
return;
}
[self.view setTouchBar:_touchBarAudioPlayer]; [self.view setTouchBar:_touchBarAudioPlayer];
} else if (type == TouchBarType::AudioPlayerForce) {
[self.view setTouchBar:_touchBarAudioPlayer];
self.touchBarType = TouchBarType::AudioPlayer;
return;
} else if (type == TouchBarType::None) { } else if (type == TouchBarType::None) {
[self.view setTouchBar:nil]; [self.view setTouchBar:nil];
} }
self.touchBarType = type;
}
inline bool isCurrentSongExists() {
return Media::Player::instance()->current(kSongType).audio() != nullptr;
} }
- (void) handlePropertyChange:(Media::Player::TrackState)property { - (void) handlePropertyChange:(Media::Player::TrackState)property {
if (property.id.type() == kSongType) {
[self setTouchBar:TouchBarType::AudioPlayerForce];
} else {
return;
}
self.position = property.position < 0 ? 0 : property.position; self.position = property.position < 0 ? 0 : property.position;
self.duration = property.length; self.duration = property.length;
if (Media::Player::IsStoppedOrStopping(property.state)) { if (Media::Player::IsStoppedOrStopping(property.state)) {
@ -480,11 +495,11 @@ NSImage *createImageFromStyleIcon(const style::icon &icon, NSSize size) {
Core::Sandbox::Instance().customEnterFromEventLoop([=] { Core::Sandbox::Instance().customEnterFromEventLoop([=] {
if (command == kPlayPause) { if (command == kPlayPause) {
Media::Player::instance()->playPause(); Media::Player::instance()->playPause(kSongType);
} else if (command == kPlaylistPrevious) { } else if (command == kPlaylistPrevious) {
Media::Player::instance()->previous(); Media::Player::instance()->previous(kSongType);
} else if (command == kPlaylistNext) { } else if (command == kPlaylistNext) {
Media::Player::instance()->next(); Media::Player::instance()->next(kSongType);
} else if (command == kClosePlayer) { } else if (command == kClosePlayer) {
App::main()->closeBothPlayers(); App::main()->closeBothPlayers();
} }