OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 06:25:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bug fixes

Browse source
This commit is contained in:
DrKLO 2018-08-27 15:13:23 +03:00
parent fe599cd519
commit 7e327c1e2c
2 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/jni/libtgvoip

@ -1 +1 @@
Subproject commit 23ae67306d7fa1c4d5a8a9c8653f63ab93100f88
Subproject commit bfa1e6ab76a467c6c6bff7eabb7c213acc7a1b34

57
TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
View file

@ -323,56 +323,57 @@ public class MusicPlayerService extends Service implements NotificationCenter.No
}
if (remoteControlClient != null) {
int currentID=MediaController.getInstance().getPlayingMessageObject().getId();
if(notificationMessageID!=currentID){
notificationMessageID=currentID;
RemoteControlClient.MetadataEditor metadataEditor=remoteControlClient.editMetadata(true);
int currentID = MediaController.getInstance().getPlayingMessageObject().getId();
if (notificationMessageID != currentID) {
notificationMessageID = currentID;
RemoteControlClient.MetadataEditor metadataEditor = remoteControlClient.editMetadata(true);
metadataEditor.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, authorName);
metadataEditor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, songName);
if(audioInfo!=null && !TextUtils.isEmpty(audioInfo.getAlbum()))
if (audioInfo != null && !TextUtils.isEmpty(audioInfo.getAlbum()))
metadataEditor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, audioInfo.getAlbum());
metadataEditor.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration*1000L);
if(audioInfo!=null && audioInfo.getCover()!=null){
try{
metadataEditor.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration * 1000L);
if (audioInfo != null && audioInfo.getCover() != null) {
try {
metadataEditor.putBitmap(RemoteControlClient.MetadataEditor.BITMAP_KEY_ARTWORK, audioInfo.getCover());
}catch(Throwable e){
} catch (Throwable e) {
FileLog.e(e);
}
}
metadataEditor.apply();
AndroidUtilities.runOnUIThread(new Runnable(){
AndroidUtilities.runOnUIThread(new Runnable() {
@Override
public void run(){
if(remoteControlClient==null)
public void run() {
if (remoteControlClient == null || MediaController.getInstance().getPlayingMessageObject() == null) {
return;
if(MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration==C.TIME_UNSET){
}
if (MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration == C.TIME_UNSET) {
AndroidUtilities.runOnUIThread(this, 500);
return;
}
RemoteControlClient.MetadataEditor metadataEditor=remoteControlClient.editMetadata(false);
metadataEditor.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration*1000L);
RemoteControlClient.MetadataEditor metadataEditor = remoteControlClient.editMetadata(false);
metadataEditor.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration * 1000L);
metadataEditor.apply();
if(Build.VERSION.SDK_INT>=18){
if (Build.VERSION.SDK_INT >= 18) {
remoteControlClient.setPlaybackState(MediaController.getInstance().isMessagePaused() ? RemoteControlClient.PLAYSTATE_PAUSED : RemoteControlClient.PLAYSTATE_PLAYING,
Math.max(MediaController.getInstance().getPlayingMessageObject().audioProgressSec*1000L, 100),
Math.max(MediaController.getInstance().getPlayingMessageObject().audioProgressSec * 1000L, 100),
MediaController.getInstance().isMessagePaused() ? 0f : 1f);
}else{
} else {
remoteControlClient.setPlaybackState(MediaController.getInstance().isMessagePaused() ? RemoteControlClient.PLAYSTATE_PAUSED : RemoteControlClient.PLAYSTATE_PLAYING);
}
}
}, 1000);
}
if(MediaController.getInstance().isDownloadingCurrentMessage()){
if (MediaController.getInstance().isDownloadingCurrentMessage()) {
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_BUFFERING);
}else{
RemoteControlClient.MetadataEditor metadataEditor=remoteControlClient.editMetadata(false);
metadataEditor.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration*1000L);
} else {
RemoteControlClient.MetadataEditor metadataEditor = remoteControlClient.editMetadata(false);
metadataEditor.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, MediaController.getInstance().getPlayingMessageObject().audioPlayerDuration * 1000L);
metadataEditor.apply();
if(Build.VERSION.SDK_INT>=18){
if (Build.VERSION.SDK_INT >= 18) {
remoteControlClient.setPlaybackState(MediaController.getInstance().isMessagePaused() ? RemoteControlClient.PLAYSTATE_PAUSED : RemoteControlClient.PLAYSTATE_PLAYING,
Math.max(MediaController.getInstance().getPlayingMessageObject().audioProgressSec*1000L, 100),
Math.max(MediaController.getInstance().getPlayingMessageObject().audioProgressSec * 1000L, 100),
MediaController.getInstance().isMessagePaused() ? 0f : 1f);
}else{
} else {
remoteControlClient.setPlaybackState(MediaController.getInstance().isMessagePaused() ? RemoteControlClient.PLAYSTATE_PAUSED : RemoteControlClient.PLAYSTATE_PLAYING);
}
}
@ -420,10 +421,10 @@ public class MusicPlayerService extends Service implements NotificationCenter.No
} else {
stopSelf();
}
}else if(id==NotificationCenter.messagePlayingDidSeek){
} else if (id == NotificationCenter.messagePlayingDidSeek) {
MessageObject messageObject = MediaController.getInstance().getPlayingMessageObject();
if(remoteControlClient!=null && Build.VERSION.SDK_INT>=18){
long progress=Math.round(messageObject.audioPlayerDuration*(float)args[1])*1000L;
if (remoteControlClient != null && Build.VERSION.SDK_INT >= 18) {
long progress = Math.round(messageObject.audioPlayerDuration * (float) args[1]) * 1000L;
remoteControlClient.setPlaybackState(MediaController.getInstance().isMessagePaused() ? RemoteControlClient.PLAYSTATE_PAUSED : RemoteControlClient.PLAYSTATE_PLAYING,
progress,
MediaController.getInstance().isMessagePaused() ? 0f : 1f);