Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
bc19641a
Commit
bc19641a
authored
Jul 22, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Auto hide "VLC ZOOM SHOW" with mouse timeout.
parent
684bef82
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
modules/video_filter/magnify.c
modules/video_filter/magnify.c
+11
-2
No files found.
modules/video_filter/magnify.c
View file @
bc19641a
...
@@ -83,11 +83,15 @@ struct vout_sys_t
...
@@ -83,11 +83,15 @@ struct vout_sys_t
image_handler_t
*
p_image
;
image_handler_t
*
p_image
;
int64_t
i_hide_timeout
;
vlc_mutex_t
lock
;
vlc_mutex_t
lock
;
int
i_zoom
;
/* zoom level in percent */
int
i_zoom
;
/* zoom level in percent */
int
i_x
,
i_y
;
/* top left corner coordinates in original image */
int
i_x
,
i_y
;
/* top left corner coordinates in original image */
bool
b_visible
;
/* is "interface" visible ? */
bool
b_visible
;
/* is "interface" visible ? */
int64_t
i_last_activity
;
};
};
#define VIS_ZOOM 4
#define VIS_ZOOM 4
...
@@ -173,6 +177,8 @@ static int Init( vout_thread_t *p_vout )
...
@@ -173,6 +177,8 @@ static int Init( vout_thread_t *p_vout )
p_vout
->
p_sys
->
i_y
=
0
;
p_vout
->
p_sys
->
i_y
=
0
;
p_vout
->
p_sys
->
i_zoom
=
2
*
ZOOM_FACTOR
;
p_vout
->
p_sys
->
i_zoom
=
2
*
ZOOM_FACTOR
;
p_vout
->
p_sys
->
b_visible
=
true
;
p_vout
->
p_sys
->
b_visible
=
true
;
p_vout
->
p_sys
->
i_last_activity
=
mdate
();
p_vout
->
p_sys
->
i_hide_timeout
=
1000
*
var_GetInteger
(
p_vout
,
"mouse-hide-timeout"
);
var_AddCallback
(
p_vout
->
p_sys
->
p_vout
,
"mouse-x"
,
MouseEvent
,
p_vout
);
var_AddCallback
(
p_vout
->
p_sys
->
p_vout
,
"mouse-x"
,
MouseEvent
,
p_vout
);
var_AddCallback
(
p_vout
->
p_sys
->
p_vout
,
"mouse-y"
,
MouseEvent
,
p_vout
);
var_AddCallback
(
p_vout
->
p_sys
->
p_vout
,
"mouse-y"
,
MouseEvent
,
p_vout
);
...
@@ -258,6 +264,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -258,6 +264,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
const
int
o_x
=
p_sys
->
i_x
;
const
int
o_x
=
p_sys
->
i_x
;
const
int
o_y
=
p_sys
->
i_y
;
const
int
o_y
=
p_sys
->
i_y
;
const
int
o_zoom
=
p_sys
->
i_zoom
;
const
int
o_zoom
=
p_sys
->
i_zoom
;
const
int64_t
i_last_activity
=
p_sys
->
i_last_activity
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
vlc_mutex_unlock
(
&
p_sys
->
lock
);
/* background magnified image */
/* background magnified image */
...
@@ -338,6 +345,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -338,6 +345,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
}
}
/* print a small "VLC ZOOM" */
/* print a small "VLC ZOOM" */
if
(
b_visible
||
i_last_activity
+
p_sys
->
i_hide_timeout
>
mdate
()
)
DrawZoomStatus
(
p_oyp
->
p_pixels
,
p_oyp
->
i_pitch
,
p_oyp
->
i_pitch
,
p_oyp
->
i_lines
,
DrawZoomStatus
(
p_oyp
->
p_pixels
,
p_oyp
->
i_pitch
,
p_oyp
->
i_pitch
,
p_oyp
->
i_lines
,
1
,
v_h
,
b_visible
);
1
,
v_h
,
b_visible
);
...
@@ -557,6 +565,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
...
@@ -557,6 +565,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
__MAX
(
0
,
__MIN
(
p_vout
->
p_sys
->
i_y
,
(
int
)
p_vout
->
output
.
i_height
__MAX
(
0
,
__MIN
(
p_vout
->
p_sys
->
i_y
,
(
int
)
p_vout
->
output
.
i_height
-
(
int
)
p_vout
->
output
.
i_height
*
ZOOM_FACTOR
/
p_vout
->
p_sys
->
i_zoom
-
1
));
-
(
int
)
p_vout
->
output
.
i_height
*
ZOOM_FACTOR
/
p_vout
->
p_sys
->
i_zoom
-
1
));
p_vout
->
p_sys
->
i_last_activity
=
mdate
();
vlc_mutex_unlock
(
&
p_vout
->
p_sys
->
lock
);
vlc_mutex_unlock
(
&
p_vout
->
p_sys
->
lock
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
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