Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
13c61234
Commit
13c61234
authored
Jun 05, 2006
by
Filippo Carone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc: Vout object now released when needed
parent
d09a0fbf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
17 deletions
+29
-17
src/control/input.c
src/control/input.c
+6
-16
src/control/video.c
src/control/video.c
+23
-1
No files found.
src/control/input.c
View file @
13c61234
...
@@ -134,22 +134,12 @@ vlc_bool_t libvlc_input_will_play( libvlc_input_t *p_input,
...
@@ -134,22 +134,12 @@ vlc_bool_t libvlc_input_will_play( libvlc_input_t *p_input,
return
VLC_FALSE
;
return
VLC_FALSE
;
}
}
if
(
!
p_input_thread
->
b_die
&&
!
p_input_thread
->
b_dead
)
if
(
!
p_input_thread
->
b_die
&&
!
p_input_thread
->
b_dead
)
return
VLC_TRUE
;
return
VLC_FALSE
;
}
vlc_bool_t
libvlc_input_has_vout
(
libvlc_input_t
*
p_input
,
libvlc_exception_t
*
p_e
)
{
vout_thread_t
*
p_vout
=
GetVout
(
p_input
,
p_e
);
/* GetVout will raise the exception for us */
if
(
!
p_vout
)
{
{
return
VLC_FALSE
;
vlc_object_release
(
p_input_thread
);
return
VLC_TRUE
;
}
}
return
VLC_TRUE
;
vlc_object_release
(
p_input_thread
);
return
VLC_FALSE
;
}
}
src/control/video.c
View file @
13c61234
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include <vlc/vout.h>
#include <vlc/vout.h>
#include <vlc/intf.h>
#include <vlc/intf.h>
vout_thread_t
*
GetVout
(
libvlc_input_t
*
p_input
,
static
vout_thread_t
*
GetVout
(
libvlc_input_t
*
p_input
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
input_thread_t
*
p_input_thread
;
input_thread_t
*
p_input_thread
;
...
@@ -80,6 +80,9 @@ void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen,
...
@@ -80,6 +80,9 @@ void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen,
if
(
i_ret
)
if
(
i_ret
)
libvlc_exception_raise
(
p_e
,
libvlc_exception_raise
(
p_e
,
"Unexpected error while setting fullscreen value"
);
"Unexpected error while setting fullscreen value"
);
vlc_object_release
(
p_vout1
);
}
}
int
libvlc_get_fullscreen
(
libvlc_input_t
*
p_input
,
int
libvlc_get_fullscreen
(
libvlc_input_t
*
p_input
,
...
@@ -122,6 +125,9 @@ void libvlc_toggle_fullscreen( libvlc_input_t *p_input,
...
@@ -122,6 +125,9 @@ void libvlc_toggle_fullscreen( libvlc_input_t *p_input,
if
(
i_ret
)
if
(
i_ret
)
libvlc_exception_raise
(
p_e
,
libvlc_exception_raise
(
p_e
,
"Unexpected error while setting fullscreen value"
);
"Unexpected error while setting fullscreen value"
);
vlc_object_release
(
p_vout1
);
}
}
void
void
...
@@ -182,3 +188,19 @@ int libvlc_video_get_width( libvlc_input_t *p_input,
...
@@ -182,3 +188,19 @@ int libvlc_video_get_width( libvlc_input_t *p_input,
return
p_vout1
->
i_window_width
;
return
p_vout1
->
i_window_width
;
}
}
vlc_bool_t
libvlc_input_has_vout
(
libvlc_input_t
*
p_input
,
libvlc_exception_t
*
p_e
)
{
vout_thread_t
*
p_vout
=
GetVout
(
p_input
,
p_e
);
/* GetVout will raise the exception for us */
if
(
!
p_vout
)
{
return
VLC_FALSE
;
}
vlc_object_release
(
p_vout
);
return
VLC_TRUE
;
}
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