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
1ecd16ca
Commit
1ecd16ca
authored
Feb 25, 2010
by
unknown
Committed by
Jean-Paul Saman
Feb 25, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
logo: only fire when user has grabbed the object.
parent
02e704ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
modules/video_filter/logo.c
modules/video_filter/logo.c
+9
-8
No files found.
modules/video_filter/logo.c
View file @
1ecd16ca
...
@@ -153,6 +153,7 @@ typedef struct
...
@@ -153,6 +153,7 @@ typedef struct
struct
filter_sys_t
struct
filter_sys_t
{
{
filter_t
*
p_blend
;
filter_t
*
p_blend
;
vout_thread_t
*
p_vout
;
vlc_mutex_t
lock
;
vlc_mutex_t
lock
;
...
@@ -250,6 +251,8 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
...
@@ -250,6 +251,8 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
}
}
}
}
p_sys
->
p_vout
=
vlc_object_find
(
p_filter
,
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
/* */
/* */
config_ChainParse
(
p_filter
,
CFG_PREFIX
,
ppsz_filter_options
,
config_ChainParse
(
p_filter
,
CFG_PREFIX
,
ppsz_filter_options
,
p_filter
->
p_cfg
);
p_filter
->
p_cfg
);
...
@@ -317,6 +320,9 @@ static void Close( vlc_object_t *p_this )
...
@@ -317,6 +320,9 @@ static void Close( vlc_object_t *p_this )
var_DelCallback
(
p_filter
,
ppsz_filter_callbacks
[
i
],
var_DelCallback
(
p_filter
,
ppsz_filter_callbacks
[
i
],
LogoCallback
,
p_sys
);
LogoCallback
,
p_sys
);
if
(
p_sys
->
p_vout
)
vlc_object_release
(
p_sys
->
p_vout
);
if
(
p_sys
->
p_blend
)
if
(
p_sys
->
p_blend
)
filter_DeleteBlend
(
p_sys
->
p_blend
);
filter_DeleteBlend
(
p_sys
->
p_blend
);
...
@@ -536,15 +542,10 @@ static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse,
...
@@ -536,15 +542,10 @@ static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse,
}
}
/* mouse-object: area of interest */
if
(
p_sys
->
p_vout
&&
p_sys
->
b_mouse_grab
)
if
(
b_over
)
{
{
vout_thread_t
*
p_vout
=
vlc_object_find
(
p_filter
,
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
/* mouse-object: area of interest */
if
(
p_vout
)
var_SetBool
(
p_sys
->
p_vout
,
"mouse-object"
,
true
);
{
var_SetBool
(
p_vout
,
"mouse-object"
,
p_sys
->
b_mouse_grab
);
vlc_object_release
(
p_vout
);
}
}
}
if
(
p_sys
->
b_mouse_grab
||
b_over
)
if
(
p_sys
->
b_mouse_grab
||
b_over
)
...
...
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