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
180c722e
Commit
180c722e
authored
Feb 13, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make mouse-moved a void variable
parent
dc25da7e
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
16 deletions
+8
-16
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+1
-3
modules/gui/macosx/voutgl.m
modules/gui/macosx/voutgl.m
+1
-4
modules/gui/minimal_macosx/voutagl.m
modules/gui/minimal_macosx/voutagl.m
+1
-4
modules/video_filter/wrapper.c
modules/video_filter/wrapper.c
+1
-1
modules/video_output/opengl.c
modules/video_output/opengl.c
+1
-1
src/video_output/event.h
src/video_output/event.h
+1
-1
src/video_output/video_output.c
src/video_output/video_output.c
+1
-1
src/video_output/vout_intf.c
src/video_output/vout_intf.c
+1
-1
No files found.
modules/gui/macosx/vout.m
View file @
180c722e
...
@@ -668,9 +668,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -668,9 +668,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
p_vout
->
render
.
i_height
/
i_height
;
p_vout
->
render
.
i_height
/
i_height
;
}
}
var_Set
(
p_vout
,
"mouse-y"
,
val
);
var_Set
(
p_vout
,
"mouse-y"
,
val
);
var_TriggerCallback
(
p_vout
,
"mouse-moved"
);
val
.
b_bool
=
true
;
var_Set
(
p_vout
,
"mouse-moved"
,
val
);
}
}
if
(
[
self
isFullscreen
]
)
if
(
[
self
isFullscreen
]
)
[[[[
VLCMain
sharedInstance
]
controls
]
fspanel
]
fadeIn
];
[[[[
VLCMain
sharedInstance
]
controls
]
fspanel
]
fadeIn
];
...
...
modules/gui/macosx/voutgl.m
View file @
180c722e
...
@@ -1030,10 +1030,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
...
@@ -1030,10 +1030,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
p_vout
->
render
.
i_height
/
i_height
;
p_vout
->
render
.
i_height
/
i_height
;
var_Set
(
p_vout
,
"mouse-y"
,
val
);
var_Set
(
p_vout
,
"mouse-y"
,
val
);
var_TriggerCallback
(
p_vout
,
"mouse-moved"
);
val
.
b_bool
=
true
;
var_Set
(
p_vout
,
"mouse-moved"
,
val
);
break
;
break
;
}
}
...
...
modules/gui/minimal_macosx/voutagl.m
View file @
180c722e
...
@@ -588,10 +588,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
...
@@ -588,10 +588,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
p
_
vout
->
render
.
i
_
height
/
i
_
height
;
p
_
vout
->
render
.
i
_
height
/
i
_
height
;
var
_
Set
(
p
_
vout
,
"mouse-y"
,
val
)
;
var
_
Set
(
p
_
vout
,
"mouse-y"
,
val
)
;
var
_
TriggerCallback
(
p
_
vout
,
"mouse-moved"
)
;
val
.
b
_
bool
=
true
;
var
_
Set
(
p
_
vout
,
"mouse-moved"
,
val
)
;
break
;
break
;
}
}
...
...
modules/video_filter/wrapper.c
View file @
180c722e
...
@@ -487,7 +487,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
...
@@ -487,7 +487,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
{
{
var_SetInteger
(
p_vout
,
"mouse-x"
,
nmouse
.
i_x
);
var_SetInteger
(
p_vout
,
"mouse-x"
,
nmouse
.
i_x
);
var_SetInteger
(
p_vout
,
"mouse-y"
,
nmouse
.
i_y
);
var_SetInteger
(
p_vout
,
"mouse-y"
,
nmouse
.
i_y
);
var_
SetBool
(
p_vout
,
"mouse-moved"
,
true
);
var_
TriggerCallback
(
p_vout
,
"mouse-moved"
);
}
}
if
(
vlc_mouse_HasButton
(
&
omouse
,
&
nmouse
)
)
if
(
vlc_mouse_HasButton
(
&
omouse
,
&
nmouse
)
)
{
{
...
...
modules/video_output/opengl.c
View file @
180c722e
...
@@ -131,7 +131,7 @@ static int CreateVout( vlc_object_t *p_this )
...
@@ -131,7 +131,7 @@ static int CreateVout( vlc_object_t *p_this )
/* Forward events from the opengl provider */
/* Forward events from the opengl provider */
var_Create
(
p_sys
->
p_vout
,
"mouse-x"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_vout
,
"mouse-x"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_vout
,
"mouse-y"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_vout
,
"mouse-y"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_vout
,
"mouse-moved"
,
VLC_VAR_
BOOL
);
var_Create
(
p_sys
->
p_vout
,
"mouse-moved"
,
VLC_VAR_
VOID
);
var_Create
(
p_sys
->
p_vout
,
"mouse-clicked"
,
VLC_VAR_BOOL
);
var_Create
(
p_sys
->
p_vout
,
"mouse-clicked"
,
VLC_VAR_BOOL
);
var_Create
(
p_sys
->
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_sys
->
p_vout
,
"video-on-top"
,
var_Create
(
p_sys
->
p_vout
,
"video-on-top"
,
...
...
src/video_output/event.h
View file @
180c722e
...
@@ -58,7 +58,7 @@ static inline void vout_SendEventMouseMoved(vout_thread_t *vout, int x, int y)
...
@@ -58,7 +58,7 @@ static inline void vout_SendEventMouseMoved(vout_thread_t *vout, int x, int y)
{
{
var_SetInteger
(
vout
,
"mouse-x"
,
x
);
var_SetInteger
(
vout
,
"mouse-x"
,
x
);
var_SetInteger
(
vout
,
"mouse-y"
,
y
);
var_SetInteger
(
vout
,
"mouse-y"
,
y
);
var_
SetBool
(
vout
,
"mouse-moved"
,
true
);
var_
TriggerCallback
(
vout
,
"mouse-moved"
);
}
}
static
inline
void
vout_SendEventMousePressed
(
vout_thread_t
*
vout
,
int
button
)
static
inline
void
vout_SendEventMousePressed
(
vout_thread_t
*
vout
,
int
button
)
{
{
...
...
src/video_output/video_output.c
View file @
180c722e
...
@@ -405,7 +405,7 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
...
@@ -405,7 +405,7 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
var_Create
(
p_vout
,
"mouse-x"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-x"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-y"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-y"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-moved"
,
VLC_VAR_
BOOL
);
var_Create
(
p_vout
,
"mouse-moved"
,
VLC_VAR_
VOID
);
var_Create
(
p_vout
,
"mouse-clicked"
,
VLC_VAR_BOOL
);
var_Create
(
p_vout
,
"mouse-clicked"
,
VLC_VAR_BOOL
);
/* Mouse object (area of interest in a video filter) */
/* Mouse object (area of interest in a video filter) */
var_Create
(
p_vout
,
"mouse-object"
,
VLC_VAR_BOOL
);
var_Create
(
p_vout
,
"mouse-object"
,
VLC_VAR_BOOL
);
...
...
src/video_output/vout_intf.c
View file @
180c722e
...
@@ -366,7 +366,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
...
@@ -366,7 +366,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Create
(
p_vout
,
"mouse-x"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-x"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-y"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-y"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-button-down"
,
VLC_VAR_INTEGER
);
var_Create
(
p_vout
,
"mouse-moved"
,
VLC_VAR_
BOOL
);
var_Create
(
p_vout
,
"mouse-moved"
,
VLC_VAR_
VOID
);
var_Create
(
p_vout
,
"mouse-clicked"
,
VLC_VAR_BOOL
);
var_Create
(
p_vout
,
"mouse-clicked"
,
VLC_VAR_BOOL
);
var_Create
(
p_vout
,
"mouse-object"
,
VLC_VAR_BOOL
);
var_Create
(
p_vout
,
"mouse-object"
,
VLC_VAR_BOOL
);
...
...
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