Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
825f771d
Commit
825f771d
authored
Mar 17, 2009
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc_media_player_is_playing(): no need to throw an exception in this case.
parent
146a7293
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
src/control/media_player.c
src/control/media_player.c
+6
-1
No files found.
src/control/media_player.c
View file @
825f771d
...
@@ -607,7 +607,6 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi,
...
@@ -607,7 +607,6 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi,
p_mi
->
p_input_thread
=
input_CreateThread
(
p_mi
->
p_input_thread
=
input_CreateThread
(
p_mi
->
p_libvlc_instance
->
p_libvlc_int
,
p_mi
->
p_md
->
p_input_item
);
p_mi
->
p_libvlc_instance
->
p_libvlc_int
,
p_mi
->
p_md
->
p_input_item
);
if
(
!
p_mi
->
p_input_thread
)
if
(
!
p_mi
->
p_input_thread
)
{
{
vlc_mutex_unlock
(
&
p_mi
->
object_lock
);
vlc_mutex_unlock
(
&
p_mi
->
object_lock
);
...
@@ -671,7 +670,12 @@ int libvlc_media_player_is_playing( libvlc_media_player_t *p_mi,
...
@@ -671,7 +670,12 @@ int libvlc_media_player_is_playing( libvlc_media_player_t *p_mi,
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
,
p_e
);
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
,
p_e
);
if
(
!
p_input_thread
)
if
(
!
p_input_thread
)
{
/* We do return the right value, no need to throw an exception */
if
(
libvlc_exception_raised
(
p_e
)
)
libvlc_exception_clear
(
p_e
);
return
0
;
return
0
;
}
libvlc_state_t
state
=
libvlc_media_player_get_state
(
p_mi
,
p_e
);
libvlc_state_t
state
=
libvlc_media_player_get_state
(
p_mi
,
p_e
);
...
@@ -720,6 +724,7 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi,
...
@@ -720,6 +724,7 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi,
input_StopThread
(
p_input_thread
,
true
);
input_StopThread
(
p_input_thread
,
true
);
vlc_object_release
(
p_input_thread
);
vlc_object_release
(
p_input_thread
);
p_mi
->
p_input_thread
=
NULL
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
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