Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
530
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
db190008
Commit
db190008
authored
8 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Avoid multiple calls to ML db
parent
55f53d0b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
medialibrary/jni/utils.cpp
+13
-9
13 additions, 9 deletions
medialibrary/jni/utils.cpp
with
13 additions
and
9 deletions
medialibrary/jni/utils.cpp
+
13
−
9
View file @
db190008
...
...
@@ -34,23 +34,27 @@ mediaToMediaWrapper(JNIEnv* env, fields *fields, medialibrary::MediaPtr const& m
medialibrary
::
AlbumTrackPtr
p_albumTrack
=
mediaPtr
->
albumTrack
();
jstring
artist
=
NULL
,
genre
=
NULL
,
album
=
NULL
,
albumArtist
=
NULL
,
mrl
=
NULL
,
title
=
NULL
,
thumbnail
=
NULL
;
if
(
p_albumTrack
)
{
if
(
p_albumTrack
->
artist
()
!=
NULL
)
artist
=
env
->
NewStringUTF
(
p_albumTrack
->
artist
()
->
name
().
c_str
());
if
(
p_albumTrack
->
genre
()
!=
NULL
)
genre
=
env
->
NewStringUTF
(
p_albumTrack
->
genre
()
->
name
().
c_str
());
medialibrary
::
ArtistPtr
artistPtr
=
p_albumTrack
->
artist
();
medialibrary
::
GenrePtr
genrePtr
=
p_albumTrack
->
genre
();
medialibrary
::
AlbumPtr
albumPtr
=
p_albumTrack
->
album
();
if
(
artistPtr
!=
NULL
)
artist
=
env
->
NewStringUTF
(
artistPtr
->
name
().
c_str
());
if
(
genrePtr
!=
NULL
)
genre
=
env
->
NewStringUTF
(
genrePtr
->
name
().
c_str
());
if
(
albumPtr
!=
NULL
)
{
album
=
env
->
NewStringUTF
(
albumPtr
->
title
().
c_str
());
if
(
albumPtr
->
albumArtist
()
!=
NULL
)
albumArtist
=
env
->
NewStringUTF
(
albumPtr
->
albumArtist
()
->
name
().
c_str
());
medialibrary
::
ArtistPtr
albumArtistPtr
=
p_albumTrack
->
albumArtist
();
if
(
albumArtistPtr
!=
NULL
)
albumArtist
=
env
->
NewStringUTF
(
albumArtistPtr
->
name
().
c_str
());
}
}
title
=
mediaPtr
->
title
().
empty
()
?
NULL
:
env
->
NewStringUTF
(
mediaPtr
->
title
().
c_str
());
mrl
=
mediaPtr
->
files
().
at
(
0
)
->
mrl
().
empty
()
?
NULL
:
env
->
NewStringUTF
(
mediaPtr
->
files
().
at
(
0
)
->
mrl
().
c_str
());
thumbnail
=
mediaPtr
->
thumbnail
().
empty
()
?
NULL
:
env
->
NewStringUTF
(
mediaPtr
->
thumbnail
().
c_str
());
bool
hasVideoTracks
=
!
mediaPtr
->
videoTracks
().
empty
();
unsigned
int
width
=
hasVideoTracks
?
mediaPtr
->
videoTracks
().
at
(
0
)
->
width
()
:
0
;
unsigned
int
height
=
hasVideoTracks
?
mediaPtr
->
videoTracks
().
at
(
0
)
->
height
()
:
0
;
virtual
std
::
vector
<
medialibrary
::
VideoTrackPtr
>
videoTracks
=
mediaPtr
->
videoTracks
();
bool
hasVideoTracks
=
!
videoTracks
.
empty
();
unsigned
int
width
=
hasVideoTracks
?
videoTracks
.
at
(
0
)
->
width
()
:
0
;
unsigned
int
height
=
hasVideoTracks
?
videoTracks
.
at
(
0
)
->
height
()
:
0
;
int64_t
duration
=
mediaPtr
->
duration
();
int64_t
progress
=
duration
*
mediaPtr
->
progress
();
...
...
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