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

Minor cleanup

Browse source
This commit is contained in:
Marc Baechinger 2024-04-15 11:09:13 +02:00
parent 20e98ca125
commit a6b540545d
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -44,7 +44,7 @@
* Test Utilities: * Test Utilities:
* Remove deprecated symbols: * Remove deprecated symbols:
* Demo app: * Demo app:
* Allow setting repeat mode with Intent arguments from command line * Allow setting repeat mode with `Intent` arguments from command line
([#1266](https://github.com/androidx/media/pull/1266)). ([#1266](https://github.com/androidx/media/pull/1266)).
## 1.4 ## 1.4

3
demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java
View file

@ -45,6 +45,7 @@ public class IntentUtil {
public static final String ACTION_VIEW_LIST = "androidx.media3.demo.main.action.VIEW_LIST"; public static final String ACTION_VIEW_LIST = "androidx.media3.demo.main.action.VIEW_LIST";
// Activity extras. // Activity extras.
public static final String AV_ANALYSIS_MODE_EXTRA = "av_analysis_mode"; // copybara:strip
public static final String PREFER_EXTENSION_DECODERS_EXTRA = "prefer_extension_decoders"; public static final String PREFER_EXTENSION_DECODERS_EXTRA = "prefer_extension_decoders";
// Media item configuration extras. // Media item configuration extras.
@ -67,7 +68,7 @@ public class IntentUtil {
public static final String SUBTITLE_URI_EXTRA = "subtitle_uri"; public static final String SUBTITLE_URI_EXTRA = "subtitle_uri";
public static final String SUBTITLE_MIME_TYPE_EXTRA = "subtitle_mime_type"; public static final String SUBTITLE_MIME_TYPE_EXTRA = "subtitle_mime_type";
public static final String SUBTITLE_LANGUAGE_EXTRA = "subtitle_language"; public static final String SUBTITLE_LANGUAGE_EXTRA = "subtitle_language";
public static final String PLAYER_REPEAT_MODE_EXTRA = "repeat_mode"; public static final String REPEAT_MODE_EXTRA = "repeat_mode";
public static @Player.RepeatMode int parseRepeatModeExtra(String repeatMode) { public static @Player.RepeatMode int parseRepeatModeExtra(String repeatMode) {
switch (repeatMode) { switch (repeatMode) {

10
demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
View file

@ -262,8 +262,8 @@ public class PlayerActivity extends AppCompatActivity
* @return Whether initialization was successful. * @return Whether initialization was successful.
*/ */
protected boolean initializePlayer() { protected boolean initializePlayer() {
Intent intent = getIntent();
if (player == null) { if (player == null) {
Intent intent = getIntent();
mediaItems = createMediaItems(intent); mediaItems = createMediaItems(intent);
if (mediaItems.isEmpty()) { if (mediaItems.isEmpty()) {
@ -293,11 +293,9 @@ public class PlayerActivity extends AppCompatActivity
} }
player.setMediaItems(mediaItems, /* resetPosition= */ !haveStartPosition); player.setMediaItems(mediaItems, /* resetPosition= */ !haveStartPosition);
player.prepare(); player.prepare();
String requestedRepeatModeExtra; String repeatModeExtra = intent.getStringExtra(IntentUtil.REPEAT_MODE_EXTRA);
if ((requestedRepeatModeExtra = if (repeatModeExtra != null) {
this.getIntent().getStringExtra(IntentUtil.PLAYER_REPEAT_MODE_EXTRA)) player.setRepeatMode(IntentUtil.parseRepeatModeExtra(repeatModeExtra));
!= null) {
player.setRepeatMode(IntentUtil.parseRepeatModeExtra(requestedRepeatModeExtra));
} }
updateButtonVisibility(); updateButtonVisibility();
return true; return true;