Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Casanowow Life for love
VLC-Android
Commits
558608b7
Commit
558608b7
authored
Aug 28, 2012
by
Edward Wang
Browse files
A better name for realPlaylist
parent
60c382ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
vlc-android/src/org/videolan/vlc/AudioService.java
View file @
558608b7
...
...
@@ -86,7 +86,13 @@ public class AudioService extends Service {
private
long
mHeadsetDownTime
=
0
;
private
long
mHeadsetUpTime
=
0
;
private
boolean
mRealPlaylist
=
false
;
/**
* Distinguish between the "fake" (Java-backed) playlist versus the "real"
* (LibVLC/LibVLCcore) backed playlist.
*
* True if being backed by LibVLC, false if "virtually" backed by Java.
*/
private
boolean
mLibVLCPlaylistActive
=
false
;
@Override
public
void
onCreate
()
{
...
...
@@ -423,7 +429,7 @@ public class AudioService extends Service {
return
;
}
}
if
(
m
Real
Playlist
)
{
if
(
m
LibVLC
Playlist
Active
)
{
if
(
mRepeating
==
RepeatType
.
None
)
mLibVLC
.
next
();
else
if
(
mRepeating
==
RepeatType
.
Once
)
...
...
@@ -446,7 +452,7 @@ public class AudioService extends Service {
mCurrentMedia
=
mMediaList
.
get
(
index
-
1
);
else
return
;
if
(
m
Real
Playlist
)
{
if
(
m
LibVLC
Playlist
Active
)
{
if
(
mRepeating
==
RepeatType
.
None
)
mLibVLC
.
previous
();
else
if
(
mRepeating
==
RepeatType
.
Once
)
...
...
@@ -652,9 +658,9 @@ public class AudioService extends Service {
}
@Override
public
void
load
(
List
<
String
>
mediaPathList
,
int
position
,
boolean
realPlaylist
)
public
void
load
(
List
<
String
>
mediaPathList
,
int
position
,
boolean
libvlcBacked
)
throws
RemoteException
{
m
Real
Playlist
=
realPlaylist
;
m
LibVLC
Playlist
Active
=
libvlcBacked
;
Log
.
v
(
TAG
,
"Loading position "
+
((
Integer
)
position
).
toString
()
+
" in "
+
mediaPathList
.
toString
());
mEventManager
.
addHandler
(
mEventHandler
);
...
...
@@ -662,7 +668,7 @@ public class AudioService extends Service {
mMediaList
.
clear
();
mPrevious
.
clear
();
if
(
real
Playlist
)
{
if
(
mLibVLC
Playlist
Active
)
{
for
(
int
i
=
0
;
i
<
mediaPathList
.
size
();
i
++)
mMediaList
.
add
(
new
Media
(
mediaPathList
.
get
(
i
),
i
));
}
else
{
...
...
@@ -683,7 +689,7 @@ public class AudioService extends Service {
}
if
(
mCurrentMedia
!=
null
)
{
if
(
real
Playlist
)
{
if
(
mLibVLC
Playlist
Active
)
{
mLibVLC
.
playIndex
(
position
);
}
else
{
mLibVLC
.
readMedia
(
mCurrentMedia
.
getLocation
());
...
...
@@ -733,7 +739,7 @@ public class AudioService extends Service {
return
;
}
if
(
m
Real
Playlist
)
{
if
(
m
LibVLC
Playlist
Active
)
{
return
;
}
DatabaseManager
db
=
DatabaseManager
.
getInstance
(
AudioService
.
this
);
...
...
vlc-android/src/org/videolan/vlc/AudioServiceController.java
View file @
558608b7
...
...
@@ -212,10 +212,10 @@ public class AudioServiceController implements IAudioPlayerControl {
load
(
mediaPathList
,
position
,
false
);
}
public
void
load
(
List
<
String
>
mediaPathList
,
int
position
,
boolean
realPlaylist
)
{
public
void
load
(
List
<
String
>
mediaPathList
,
int
position
,
boolean
libvlcBacked
)
{
remoteProcedureCall
(
mAudioServiceBinder
,
Void
.
class
,
(
Void
)
null
,
"load"
,
new
Class
<?>[]
{
List
.
class
,
int
.
class
,
boolean
.
class
},
new
Object
[]
{
mediaPathList
,
position
,
realPlaylist
}
);
new
Object
[]
{
mediaPathList
,
position
,
libvlcBacked
}
);
}
public
void
append
(
List
<
String
>
mediaPathList
)
{
...
...
vlc-android/src/org/videolan/vlc/interfaces/IAudioService.aidl
View file @
558608b7
...
...
@@ -30,7 +30,7 @@ interface IAudioService {
void
shuffle
();
void
setTime
(
long
time
);
String
getCurrentMediaLocation
();
void
load
(
in
List
<
String
>
mediaPathList
,
int
position
,
boolean
realPlaylist
);
void
load
(
in
List
<
String
>
mediaPathList
,
int
position
,
boolean
libvlcBacked
);
void
append
(
in
List
<
String
>
mediaPathList
);
List
<
String
>
getItems
();
String
getItem
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment