sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak new drm listener method. Fix demo app

Browse source
This commit is contained in:
Oliver Woodman 2015-09-28 11:59:10 +01:00
parent 6cb029d8c1
commit e652019bb3
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java
View file

@ -447,6 +447,11 @@ public class DemoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventLi
} }
} }
@Override
public void onDrmKeysLoaded() {
// Do nothing.
}
@Override @Override
public void onDrmSessionManagerError(Exception e) { public void onDrmSessionManagerError(Exception e) {
if (internalErrorListener != null) { if (internalErrorListener != null) {

7
library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
View file

@ -51,10 +51,9 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
public interface EventListener { public interface EventListener {
/** /**
* Invoked when DRM keys have been loaded. Depending on license setup, this might occur multiple * Invoked each time keys are loaded.
* times during playback.
*/ */
void onKeysLoaded(); void onDrmKeysLoaded();
/** /**
* Invoked when a drm error occurs. * Invoked when a drm error occurs.
@ -396,7 +395,7 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
eventHandler.post(new Runnable() { eventHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
eventListener.onKeysLoaded(); eventListener.onDrmKeysLoaded();
} }
}); });
} }