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
12
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
6c452ada
Commit
6c452ada
authored
8 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Fill playlist later & prevent race conditions
parent
98d016e0
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/audio/AudioPlayer.java
+25
-11
25 additions, 11 deletions
vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
with
25 additions
and
11 deletions
vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
+
25
−
11
View file @
6c452ada
...
...
@@ -28,6 +28,7 @@ import android.content.SharedPreferences;
import
android.media.AudioManager
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.os.Message
;
import
android.preference.PreferenceManager
;
import
android.support.annotation.Nullable
;
import
android.support.annotation.RequiresPermission
;
...
...
@@ -78,7 +79,6 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
private
boolean
mPreviewingSeek
=
false
;
private
PlaylistAdapter
mPlaylistAdapter
;
private
Handler
mHandler
=
new
Handler
();
private
boolean
mAdvFuncVisible
;
private
boolean
mPlaylistSwitchVisible
;
...
...
@@ -91,25 +91,20 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
private
static
final
String
PREF_PLAYLIST_TIPS_SHOWN
=
"playlist_tips_shown"
;
private
static
final
String
PREF_AUDIOPLAYER_TIPS_SHOWN
=
"audioplayer_tips_shown"
;
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
mPlaylistAdapter
=
new
PlaylistAdapter
(
this
);
}
@Override
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
mBinding
=
AudioPlayerBinding
.
inflate
(
inflater
);
mBinding
.
songsList
.
setLayoutManager
(
new
LinearLayoutManager
(
mBinding
.
getRoot
().
getContext
()));
mBinding
.
songsList
.
setAdapter
(
mPlaylistAdapter
);
mBinding
.
audioMediaSwitcher
.
setAudioMediaSwitcherListener
(
mHeaderMediaSwitcherListener
);
mBinding
.
coverMediaSwitcher
.
setAudioMediaSwitcherListener
(
mCoverMediaSwitcherListener
);
return
mBinding
.
getRoot
();
}
@Override
public
void
onViewCreated
(
final
View
view
,
@Nullable
Bundle
savedInstanceState
)
{
super
.
onViewCreated
(
view
,
savedInstanceState
);
mPlaylistAdapter
=
new
PlaylistAdapter
(
this
);
mBinding
.
songsList
.
setLayoutManager
(
new
LinearLayoutManager
(
mBinding
.
getRoot
().
getContext
()));
mBinding
.
songsList
.
setAdapter
(
mPlaylistAdapter
);
mBinding
.
audioMediaSwitcher
.
setAudioMediaSwitcherListener
(
mHeaderMediaSwitcherListener
);
mBinding
.
coverMediaSwitcher
.
setAudioMediaSwitcherListener
(
mCoverMediaSwitcherListener
);
mBinding
.
playlistSearchText
.
getEditText
().
addTextChangedListener
(
this
);
ItemTouchHelper
.
Callback
callback
=
new
SwipeDragItemTouchHelperCallback
(
mPlaylistAdapter
);
...
...
@@ -175,6 +170,11 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
}
public
void
update
()
{
mHandler
.
removeMessages
(
UPDATE
);
mHandler
.
sendEmptyMessageDelayed
(
UPDATE
,
50
);
}
public
void
doUpdate
()
{
if
(
mService
==
null
||
getActivity
()
==
null
)
return
;
...
...
@@ -660,4 +660,18 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
if
(
getFragmentManager
()
!=
null
)
super
.
setUserVisibleHint
(
isVisibleToUser
);
}
private
static
final
int
UPDATE
=
0
;
private
Handler
mHandler
=
new
Handler
()
{
@Override
public
void
handleMessage
(
Message
msg
)
{
switch
(
msg
.
what
)
{
case
UPDATE:
doUpdate
();
break
;
default
:
super
.
handleMessage
(
msg
);
}
}
};
}
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