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
75615261
Commit
75615261
authored
Jul 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remoteosd: only register mouse event callback when needed
parent
e21826c0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
modules/video_filter/remoteosd.c
modules/video_filter/remoteosd.c
+3
-9
No files found.
modules/video_filter/remoteosd.c
View file @
75615261
...
@@ -201,7 +201,6 @@ struct filter_sys_t
...
@@ -201,7 +201,6 @@ struct filter_sys_t
char
*
psz_passwd
;
/* VNC password */
char
*
psz_passwd
;
/* VNC password */
bool
b_vnc_mouse_events
;
/* Send MouseEvents ? */
bool
b_vnc_key_events
;
/* Send KeyEvents ? */
bool
b_vnc_key_events
;
/* Send KeyEvents ? */
vlc_mutex_t
lock
;
/* To lock for read/write on picture */
vlc_mutex_t
lock
;
/* To lock for read/write on picture */
...
@@ -265,15 +264,11 @@ static int CreateFilter ( vlc_object_t *p_this )
...
@@ -265,15 +264,11 @@ static int CreateFilter ( vlc_object_t *p_this )
p_sys
->
ar_color_table_yuv
[
i
][
3
]
=
255
;
p_sys
->
ar_color_table_yuv
[
i
][
3
]
=
255
;
}
}
p_sys
->
b_vnc_mouse_events
=
var_CreateGetBoolCommand
(
p_this
,
RMTOSD_CFG
"mouse-events"
);
/* Keep track of OSD Events */
/* Keep track of OSD Events */
p_sys
->
b_need_update
=
false
;
p_sys
->
b_need_update
=
false
;
/* Attach subpicture source callback */
/* Attach subpicture source callback */
p_filter
->
pf_sub_source
=
Filter
;
p_filter
->
pf_sub_source
=
Filter
;
p_filter
->
pf_sub_mouse
=
MouseEvent
;
es_format_Init
(
&
p_filter
->
fmt_out
,
SPU_ES
,
VLC_CODEC_SPU
);
es_format_Init
(
&
p_filter
->
fmt_out
,
SPU_ES
,
VLC_CODEC_SPU
);
p_filter
->
fmt_out
.
i_priority
=
ES_PRIORITY_SELECTABLE_MIN
;
p_filter
->
fmt_out
.
i_priority
=
ES_PRIORITY_SELECTABLE_MIN
;
...
@@ -288,6 +283,9 @@ static int CreateFilter ( vlc_object_t *p_this )
...
@@ -288,6 +283,9 @@ static int CreateFilter ( vlc_object_t *p_this )
goto
error
;
goto
error
;
}
}
if
(
var_InheritBool
(
p_this
,
RMTOSD_CFG
"mouse-events"
)
)
p_filter
->
pf_sub_mouse
=
MouseEvent
;
p_sys
->
b_vnc_key_events
=
var_InheritBool
(
p_this
,
p_sys
->
b_vnc_key_events
=
var_InheritBool
(
p_this
,
RMTOSD_CFG
"key-events"
);
RMTOSD_CFG
"key-events"
);
if
(
p_sys
->
b_vnc_key_events
)
if
(
p_sys
->
b_vnc_key_events
)
...
@@ -326,7 +324,6 @@ static void DestroyFilter( vlc_object_t *p_this )
...
@@ -326,7 +324,6 @@ static void DestroyFilter( vlc_object_t *p_this )
var_Destroy
(
p_this
,
RMTOSD_CFG
"host"
);
var_Destroy
(
p_this
,
RMTOSD_CFG
"host"
);
var_Destroy
(
p_this
,
RMTOSD_CFG
"password"
);
var_Destroy
(
p_this
,
RMTOSD_CFG
"password"
);
var_Destroy
(
p_this
,
RMTOSD_CFG
"mouse-events"
);
var_Destroy
(
p_this
,
RMTOSD_CFG
"alpha"
);
var_Destroy
(
p_this
,
RMTOSD_CFG
"alpha"
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
...
@@ -1203,9 +1200,6 @@ static int MouseEvent( filter_t *p_filter,
...
@@ -1203,9 +1200,6 @@ static int MouseEvent( filter_t *p_filter,
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
VLC_UNUSED
(
p_old
);
VLC_UNUSED
(
p_old
);
if
(
!
p_sys
->
b_vnc_mouse_events
)
return
VLC_SUCCESS
;
int
i_v
=
p_new
->
i_pressed
;
int
i_v
=
p_new
->
i_pressed
;
int
i_x
=
p_new
->
i_x
;
int
i_x
=
p_new
->
i_x
;
int
i_y
=
p_new
->
i_y
;
int
i_y
=
p_new
->
i_y
;
...
...
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