Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
81d5510c
Commit
81d5510c
authored
6 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Do not show player when playback fails
parent
43e51385
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
+24
-12
24 additions, 12 deletions
...rc/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
with
24 additions
and
12 deletions
vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
+
24
−
12
View file @
81d5510c
...
...
@@ -23,21 +23,12 @@
package
org.videolan.vlc.gui
;
import
androidx.lifecycle.Observer
;
import
android.content.SharedPreferences
;
import
android.media.AudioManager
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.os.Message
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
com.google.android.material.appbar.AppBarLayout
;
import
androidx.coordinatorlayout.widget.CoordinatorLayout
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.core.view.ViewCompat
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.appcompat.widget.ViewStubCompat
;
import
android.util.Log
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.View
;
...
...
@@ -46,6 +37,8 @@ import android.widget.FrameLayout;
import
android.widget.ProgressBar
;
import
android.widget.TextView
;
import
com.google.android.material.appbar.AppBarLayout
;
import
org.videolan.libvlc.util.AndroidUtil
;
import
org.videolan.medialibrary.Medialibrary
;
import
org.videolan.vlc.BuildConfig
;
...
...
@@ -67,6 +60,16 @@ import org.videolan.vlc.util.WeakHandler;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.appcompat.widget.ViewStubCompat
;
import
androidx.coordinatorlayout.widget.CoordinatorLayout
;
import
androidx.core.view.ViewCompat
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.lifecycle.Observer
;
public
class
AudioPlayerContainerActivity
extends
BaseActivity
{
public
static
final
String
TAG
=
"VLC/AudioPlayerContainerActivity"
;
...
...
@@ -336,6 +339,8 @@ public class AudioPlayerContainerActivity extends BaseActivity {
final
AudioPlayerBottomSheetCallback
mAudioPlayerBottomSheetCallback
=
new
AudioPlayerBottomSheetCallback
();
private
static
final
int
ACTION_DISPLAY_PROGRESSBAR
=
1339
;
private
static
final
int
ACTION_SHOW_PLAYER
=
1340
;
private
static
final
int
ACTION_HIDE_PLAYER
=
1341
;
public
boolean
isAudioPlayerReady
()
{
return
mAudioPlayer
!=
null
;
...
...
@@ -374,8 +379,8 @@ public class AudioPlayerContainerActivity extends BaseActivity {
PlaylistManager
.
Companion
.
getShowAudioPlayer
().
observe
(
this
,
new
Observer
<
Boolean
>()
{
@Override
public
void
onChanged
(
@Nullable
Boolean
showPlayer
)
{
if
(
showPlayer
)
showAudioPlayer
(
);
else
hideAudioPlayer
(
);
if
(
showPlayer
)
mActivityHandler
.
sendEmptyMessageDelayed
(
ACTION_SHOW_PLAYER
,
100L
);
else
mActivityHandler
.
sendEmptyMessage
(
ACTION_HIDE_PLAYER
);
}
});
MediaParsingService
.
Companion
.
getProgress
().
observe
(
this
,
new
Observer
<
ScanProgress
>()
{
...
...
@@ -423,6 +428,13 @@ public class AudioPlayerContainerActivity extends BaseActivity {
removeMessages
(
ACTION_DISPLAY_PROGRESSBAR
);
owner
.
showProgressBar
();
break
;
case
ACTION_SHOW_PLAYER:
owner
.
showAudioPlayer
();
break
;
case
ACTION_HIDE_PLAYER:
removeMessages
(
ACTION_SHOW_PLAYER
);
owner
.
hideAudioPlayer
();
break
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment