Skip to content

Commit 7bfd969

Browse files
23rd23rd
committed
Attempted to remove Chromecast.
1 parent 3bd45ec commit 7bfd969

9 files changed

Lines changed: 308 additions & 306 deletions

File tree

‎TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
import com.google.android.exoplayer2.C;
7373
import com.google.android.exoplayer2.ExoPlayer;
7474
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
75-
import com.google.android.gms.cast.MediaMetadata;
76-
import com.google.android.gms.common.images.WebImage;
75+
//import com.google.android.gms.cast.MediaMetadata;
76+
//import com.google.android.gms.common.images.WebImage;
7777

7878
import org.telegram.messenger.audioinfo.AudioInfo;
79-
import org.telegram.messenger.chromecast.ChromecastController;
79+
//import org.telegram.messenger.chromecast.ChromecastController;
8080
import org.telegram.messenger.chromecast.ChromecastFileServer;
8181
import org.telegram.messenger.chromecast.ChromecastMedia;
8282
import org.telegram.messenger.chromecast.ChromecastMediaVariations;
@@ -3981,9 +3981,9 @@ public boolean needUpdate() {
39813981
try {
39823982
CastSync.check(CastSync.TYPE_MUSIC);
39833983
if (!ignorePlayerUpdate) {
3984-
if (ChromecastController.getInstance().isCasting()) {
3985-
ChromecastController.getInstance().setCurrentMediaAndCastIfNeeded(getCurrentChromecastMedia());
3986-
}
3984+
//if (ChromecastController.getInstance().isCasting()) {
3985+
// ChromecastController.getInstance().setCurrentMediaAndCastIfNeeded(getCurrentChromecastMedia());
3986+
//}
39873987
CastSync.setPlaying(true);
39883988
}
39893989
} catch (Exception e) {
@@ -4043,28 +4043,28 @@ public ChromecastMediaVariations getCurrentChromecastMedia() {
40434043
final String mime = playingMessageObject.getMimeType();
40444044
final Uri uri = Uri.parse("file://" + file.getAbsolutePath());
40454045

4046-
final MediaMetadata metadata = new MediaMetadata();
4046+
// final MediaMetadata metadata = new MediaMetadata();
40474047
if (audioInfo != null) {
40484048
if (!TextUtils.isEmpty(audioInfo.getTitle())) {
4049-
metadata.putString(MediaMetadata.KEY_TITLE, audioInfo.getTitle());
4049+
// metadata.putString(MediaMetadata.KEY_TITLE, audioInfo.getTitle());
40504050
}
40514051
if (!TextUtils.isEmpty(audioInfo.getArtist())) {
4052-
metadata.putString(MediaMetadata.KEY_ARTIST, audioInfo.getArtist());
4052+
// metadata.putString(MediaMetadata.KEY_ARTIST, audioInfo.getArtist());
40534053
}
40544054
if (!TextUtils.isEmpty(audioInfo.getAlbum())) {
4055-
metadata.putString(MediaMetadata.KEY_ALBUM_TITLE, audioInfo.getAlbum());
4055+
// metadata.putString(MediaMetadata.KEY_ALBUM_TITLE, audioInfo.getAlbum());
40564056
}
40574057
if (!TextUtils.isEmpty(audioInfo.getAlbumArtist())) {
4058-
metadata.putString(MediaMetadata.KEY_ALBUM_ARTIST, audioInfo.getAlbumArtist());
4058+
// metadata.putString(MediaMetadata.KEY_ALBUM_ARTIST, audioInfo.getAlbumArtist());
40594059
}
40604060
if (!TextUtils.isEmpty(audioInfo.getComposer())) {
4061-
metadata.putString(MediaMetadata.KEY_COMPOSER, audioInfo.getComposer());
4061+
// metadata.putString(MediaMetadata.KEY_COMPOSER, audioInfo.getComposer());
40624062
}
40634063
if (audioInfo.getDisc() != 0) {
4064-
metadata.putInt(MediaMetadata.KEY_DISC_NUMBER, (int) audioInfo.getDisc());
4064+
// metadata.putInt(MediaMetadata.KEY_DISC_NUMBER, (int) audioInfo.getDisc());
40654065
}
40664066
if (audioInfo.getTrack() != 0) {
4067-
metadata.putInt(MediaMetadata.KEY_TRACK_NUMBER, (int) audioInfo.getTrack());
4067+
// metadata.putInt(MediaMetadata.KEY_TRACK_NUMBER, (int) audioInfo.getTrack());
40684068
}
40694069
if (audioInfo.getCover() != null) {
40704070
File coverFile = audioInfo.getCoverFile();
@@ -4088,15 +4088,15 @@ public ChromecastMediaVariations getCurrentChromecastMedia() {
40884088
audioInfo.setCoverFile(coverFile);
40894089
}
40904090
if (coverFile != null && coverFile.exists()) {
4091-
final String path = ChromecastController.getInstance().setCover(coverFile);
4092-
metadata.addImage(new WebImage(Uri.parse(ChromecastFileServer.getUrlToSource(ChromecastFileServer.getHost(), path))));
4091+
// final String path = ChromecastController.getInstance().setCover(coverFile);
4092+
// metadata.addImage(new WebImage(Uri.parse(ChromecastFileServer.getUrlToSource(ChromecastFileServer.getHost(), path))));
40934093
}
40944094
}
40954095
}
40964096
final ChromecastMedia media = ChromecastMedia.Builder.fromUri(uri, "/player_" + playingMessageObject.getId(), mime)
40974097
.setTitle(title)
40984098
.setSubtitle(subtitle)
4099-
.setMetadata(metadata)
4099+
// .setMetadata(metadata)
41004100
.build();
41014101

41024102
return ChromecastMediaVariations.of(media);
@@ -4213,9 +4213,9 @@ public void onAnimationEnd(Animator animation) {
42134213
try {
42144214
CastSync.check(CastSync.TYPE_MUSIC);
42154215
if (!ignorePlayerUpdate) {
4216-
if (ChromecastController.getInstance().isCasting()) {
4217-
ChromecastController.getInstance().setCurrentMediaAndCastIfNeeded(getCurrentChromecastMedia());
4218-
}
4216+
//if (ChromecastController.getInstance().isCasting()) {
4217+
// ChromecastController.getInstance().setCurrentMediaAndCastIfNeeded(getCurrentChromecastMedia());
4218+
//}
42194219
CastSync.setPlaying(false);
42204220
}
42214221
} catch (Exception e) {

‎TMessagesProj/src/main/java/org/telegram/messenger/chromecast/ChromecastController.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55

66
import androidx.annotation.NonNull;
77

8-
import com.google.android.gms.cast.CastDevice;
9-
import com.google.android.gms.cast.MediaError;
10-
import com.google.android.gms.cast.MediaLoadOptions;
11-
import com.google.android.gms.cast.MediaMetadata;
12-
import com.google.android.gms.cast.MediaStatus;
13-
import com.google.android.gms.cast.framework.CastContext;
14-
import com.google.android.gms.cast.framework.CastSession;
15-
import com.google.android.gms.cast.framework.SessionManager;
16-
import com.google.android.gms.cast.framework.SessionManagerListener;
17-
import com.google.android.gms.cast.framework.media.RemoteMediaClient;
8+
//import com.google.android.gms.cast.CastDevice;
9+
//import com.google.android.gms.cast.MediaError;
10+
//import com.google.android.gms.cast.MediaLoadOptions;
11+
//import com.google.android.gms.cast.MediaMetadata;
12+
//import com.google.android.gms.cast.MediaStatus;
13+
//import com.google.android.gms.cast.framework.CastContext;
14+
//import com.google.android.gms.cast.framework.CastSession;
15+
//import com.google.android.gms.cast.framework.SessionManager;
16+
//import com.google.android.gms.cast.framework.SessionManagerListener;
17+
//import com.google.android.gms.cast.framework.media.RemoteMediaClient;
1818

1919
import org.telegram.messenger.ApplicationLoader;
2020
import org.telegram.ui.CastSync;
2121
import org.telegram.ui.PhotoViewer;
2222

2323
import java.io.File;
2424
import java.util.Objects;
25-
25+
/*
2626
public class ChromecastController implements SessionManagerListener<CastSession> {
2727
private final static String CAST_CONTROLLER = "CAST_CONTROLLER";
2828
private final static String CAST_SESSION_TAG = "CAST_SESSION";
@@ -116,7 +116,6 @@ private void tryInitClient(CastSession castSession) {
116116
}
117117
118118
119-
/* * */
120119
121120
private static volatile ChromecastController Instance = null;
122121
@@ -135,7 +134,6 @@ public static ChromecastController getInstance() {
135134
136135
137136
138-
/* * */
139137
140138
static class RemoteMediaClientHandler extends RemoteMediaClient.Callback {
141139
public final RemoteMediaClient client;
@@ -261,7 +259,6 @@ public void onStatusUpdated() {
261259
262260
263261
264-
/* Session Listener */
265262
266263
@Override
267264
public void onSessionStarting(@NonNull CastSession castSession) {
@@ -312,3 +309,4 @@ public void onSessionSuspended(@NonNull CastSession castSession, int i) {
312309
}
313310
314311
}
312+
*/

‎TMessagesProj/src/main/java/org/telegram/messenger/chromecast/ChromecastControllerState.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@
1111
class ChromecastControllerState {
1212
private ChromecastFileServer server;
1313
private ChromecastMediaVariations media;
14-
private ChromecastController.RemoteMediaClientHandler client;
14+
// private ChromecastController.RemoteMediaClientHandler client;
1515

1616
public void setMedia(ChromecastMediaVariations m) {
17-
if (client != null && m != null) {
18-
addToFileServer(m);
19-
}
20-
21-
if (client != null && media != null) {
22-
removeFromFileServer(media);
23-
}
24-
25-
if (m != null && m.getVariationsCount() > 0 && !m.getVariation(0).mimeType.startsWith("audio/")) {
26-
if (server != null) {
27-
server.setCoverFile(null, null);
28-
}
29-
}
30-
31-
if (client != null && m != null) {
32-
client.load(m);
33-
}
34-
35-
media = m;
17+
// if (client != null && m != null) {
18+
// addToFileServer(m);
19+
// }
20+
//
21+
// if (client != null && media != null) {
22+
// removeFromFileServer(media);
23+
// }
24+
//
25+
// if (m != null && m.getVariationsCount() > 0 && !m.getVariation(0).mimeType.startsWith("audio/")) {
26+
// if (server != null) {
27+
// server.setCoverFile(null, null);
28+
// }
29+
// }
30+
//
31+
// if (client != null && m != null) {
32+
// client.load(m);
33+
// }
34+
//
35+
// media = m;
3636
}
3737

3838
public String setCoverFile(File file) {
@@ -52,34 +52,34 @@ public ChromecastMediaVariations getMedia() {
5252
return media;
5353
}
5454

55-
public void setClient(ChromecastController.RemoteMediaClientHandler c) {
56-
if (media != null && client == null && c != null) {
57-
addToFileServer(media);
58-
}
59-
60-
if (client != null && media != null && c == null) {
61-
removeFromFileServer(media);
62-
}
63-
64-
if (client != null) {
65-
client.unregister();
66-
}
67-
68-
if (c != null) {
69-
c.register();
70-
71-
if (media != null) {
72-
c.load(media);
73-
}
74-
}
75-
76-
client = c;
77-
}
78-
79-
@Nullable
80-
public ChromecastController.RemoteMediaClientHandler getClient() {
81-
return client;
82-
}
55+
// public void setClient(ChromecastController.RemoteMediaClientHandler c) {
56+
// if (media != null && client == null && c != null) {
57+
// addToFileServer(media);
58+
// }
59+
//
60+
// if (client != null && media != null && c == null) {
61+
// removeFromFileServer(media);
62+
// }
63+
//
64+
// if (client != null) {
65+
// client.unregister();
66+
// }
67+
//
68+
// if (c != null) {
69+
// c.register();
70+
//
71+
// if (media != null) {
72+
// c.load(media);
73+
// }
74+
// }
75+
//
76+
// client = c;
77+
// }
78+
79+
// @Nullable
80+
// public ChromecastController.RemoteMediaClientHandler getClient() {
81+
// return client;
82+
// }
8383

8484
private void addToFileServer(ChromecastMediaVariations media) {
8585
if (server == null) {

‎TMessagesProj/src/main/java/org/telegram/messenger/chromecast/ChromecastFileServer.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import com.google.android.exoplayer2.upstream.DataSource;
1414
import com.google.android.exoplayer2.upstream.DataSpec;
1515
import com.google.android.exoplayer2.upstream.FileDataSource;
16-
import com.google.android.gms.cast.MediaMetadata;
17-
import com.google.android.gms.common.images.WebImage;
16+
//import com.google.android.gms.cast.MediaMetadata;
17+
//import com.google.android.gms.common.images.WebImage;
1818

1919
import org.telegram.messenger.ApplicationLoader;
2020
import org.telegram.messenger.FileLog;
@@ -184,20 +184,20 @@ private Response serveAvailableRoutes(String host) {
184184
}
185185
sb.append(getUrlToSource(host, media.getKey()));
186186

187-
final MediaMetadata mediaMetadata = media.getValue().mediaMetadata;
188-
if (mediaMetadata == null) continue;
189-
190-
final String title = mediaMetadata.getString(MediaMetadata.KEY_TITLE);
191-
final String subtitle = mediaMetadata.getString(MediaMetadata.KEY_SUBTITLE);
192-
if (title != null) {
193-
sb.append(' ');
194-
sb.append(title);
195-
}
196-
if (subtitle != null) {
197-
sb.append(" [");
198-
sb.append(subtitle);
199-
sb.append(']');
200-
}
187+
// final MediaMetadata mediaMetadata = media.getValue().mediaMetadata;
188+
// if (mediaMetadata == null) continue;
189+
//
190+
// final String title = mediaMetadata.getString(MediaMetadata.KEY_TITLE);
191+
// final String subtitle = mediaMetadata.getString(MediaMetadata.KEY_SUBTITLE);
192+
// if (title != null) {
193+
// sb.append(' ');
194+
// sb.append(title);
195+
// }
196+
// if (subtitle != null) {
197+
// sb.append(" [");
198+
// sb.append(subtitle);
199+
// sb.append(']');
200+
// }
201201
}
202202
}
203203
return newFixedLengthResponse(Response.Status.OK, "text/plain", sb.toString());

0 commit comments

Comments
 (0)