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
13
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
edeb35dd
Commit
edeb35dd
authored
8 years ago
by
Thomas Guillem
Browse files
Options
Downloads
Patches
Plain Diff
LibVLC: Media: Update API
ParsedStatus and ParsedChanged are now merged
parent
60a9c7f3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libvlc/jni/libvlcjni-media.c
+4
-5
4 additions, 5 deletions
libvlc/jni/libvlcjni-media.c
libvlc/src/org/videolan/libvlc/Media.java
+0
-4
0 additions, 4 deletions
libvlc/src/org/videolan/libvlc/Media.java
with
4 additions
and
9 deletions
libvlc/jni/libvlcjni-media.c
+
4
−
5
View file @
edeb35dd
...
...
@@ -39,7 +39,6 @@ static const libvlc_event_type_t m_events[] = {
libvlc_MediaDurationChanged
,
libvlc_MediaStateChanged
,
libvlc_MediaParsedChanged
,
libvlc_MediaParsedStatus
,
libvlc_MediaSubItemTreeAdded
,
-
1
,
};
...
...
@@ -53,9 +52,9 @@ Media_event_cb(vlcjni_object *p_obj, const libvlc_event_t *p_ev,
pthread_mutex_lock
(
&
p_sys
->
lock
);
if
(
p_ev
->
type
==
libvlc_MediaParsed
Status
)
if
(
p_ev
->
type
==
libvlc_MediaParsed
Changed
)
{
/* no need to send libvlc_MediaParsed
Status
when parsing is synchronous */
/* no need to send libvlc_MediaParsed
Changed
when parsing is synchronous */
if
(
p_sys
->
b_parsing_sync
)
b_dispatch
=
false
;
...
...
@@ -89,8 +88,8 @@ Media_event_cb(vlcjni_object *p_obj, const libvlc_event_t *p_ev,
break
;
case
libvlc_MediaStateChanged
:
p_java_event
->
arg1
=
p_ev
->
u
.
media_state_changed
.
new_state
;
case
libvlc_MediaParsed
Status
:
p_java_event
->
arg1
=
p_ev
->
u
.
media_parsed_
status
.
new_status
;
case
libvlc_MediaParsed
Changed
:
p_java_event
->
arg1
=
p_ev
->
u
.
media_parsed_
changed
.
new_status
;
}
p_java_event
->
type
=
p_ev
->
type
;
return
true
;
...
...
This diff is collapsed.
Click to expand it.
libvlc/src/org/videolan/libvlc/Media.java
+
0
−
4
View file @
edeb35dd
...
...
@@ -40,7 +40,6 @@ public class Media extends VLCObject<Media.Event> {
//public static final int Freed = 4;
public
static
final
int
StateChanged
=
5
;
public
static
final
int
SubItemTreeAdded
=
6
;
public
static
final
int
ParsedStatus
=
7
;
protected
Event
(
int
type
)
{
super
(
type
);
...
...
@@ -414,9 +413,6 @@ public class Media extends VLCObject<Media.Event> {
mDuration
=
-
1
;
break
;
case
Event
.
ParsedChanged
:
postParse
();
break
;
case
Event
.
ParsedStatus
:
postParse
();
return
new
Event
(
eventType
,
arg1
);
case
Event
.
StateChanged
:
...
...
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