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
bab5ed2b
Commit
bab5ed2b
authored
Oct 09, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: remove unused parameters in vout_*DisplayWindow()
parent
74770b69
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
src/video_output/display.c
src/video_output/display.c
+7
-4
src/video_output/display.h
src/video_output/display.h
+2
-2
src/video_output/video_output.c
src/video_output/video_output.c
+2
-5
No files found.
src/video_output/display.c
View file @
bab5ed2b
...
@@ -749,8 +749,9 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, const vout_window
...
@@ -749,8 +749,9 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, const vout_window
return
vout_window_New
(
VLC_OBJECT
(
osys
->
vout
),
"$window"
,
&
cfg_override
);
return
vout_window_New
(
VLC_OBJECT
(
osys
->
vout
),
"$window"
,
&
cfg_override
);
}
}
#endif
#endif
return
vout_NewDisplayWindow
(
osys
->
vout
,
vd
,
cfg
);
return
vout_NewDisplayWindow
(
osys
->
vout
,
cfg
);
}
}
static
void
VoutDisplayDelWindow
(
vout_display_t
*
vd
,
vout_window_t
*
window
)
static
void
VoutDisplayDelWindow
(
vout_display_t
*
vd
,
vout_window_t
*
window
)
{
{
vout_display_owner_sys_t
*
osys
=
vd
->
owner
.
sys
;
vout_display_owner_sys_t
*
osys
=
vd
->
owner
.
sys
;
...
@@ -762,7 +763,7 @@ static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window)
...
@@ -762,7 +763,7 @@ static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window)
return
;
return
;
}
}
#endif
#endif
vout_DeleteDisplayWindow
(
osys
->
vout
,
vd
,
window
);
vout_DeleteDisplayWindow
(
osys
->
vout
,
window
);
}
}
static
void
VoutDisplayFitWindow
(
vout_display_t
*
vd
,
bool
default_size
)
static
void
VoutDisplayFitWindow
(
vout_display_t
*
vd
,
bool
default_size
)
...
@@ -1446,14 +1447,16 @@ static vout_window_t *SplitterNewWindow(vout_display_t *vd, const vout_window_cf
...
@@ -1446,14 +1447,16 @@ static vout_window_t *SplitterNewWindow(vout_display_t *vd, const vout_window_cf
cfg
.
x
+=
0
;
//output->window.i_x; FIXME
cfg
.
x
+=
0
;
//output->window.i_x; FIXME
cfg
.
y
+=
0
;
//output->window.i_y;
cfg
.
y
+=
0
;
//output->window.i_y;
return
vout_NewDisplayWindow
(
osys
->
vout
,
vd
,
&
cfg
);
return
vout_NewDisplayWindow
(
osys
->
vout
,
&
cfg
);
}
}
static
void
SplitterDelWindow
(
vout_display_t
*
vd
,
vout_window_t
*
window
)
static
void
SplitterDelWindow
(
vout_display_t
*
vd
,
vout_window_t
*
window
)
{
{
vout_display_owner_sys_t
*
osys
=
vd
->
owner
.
sys
;
vout_display_owner_sys_t
*
osys
=
vd
->
owner
.
sys
;
vout_DeleteDisplayWindow
(
osys
->
vout
,
vd
,
window
);
vout_DeleteDisplayWindow
(
osys
->
vout
,
window
);
}
}
static
void
SplitterEvent
(
vout_display_t
*
vd
,
int
event
,
va_list
args
)
static
void
SplitterEvent
(
vout_display_t
*
vd
,
int
event
,
va_list
args
)
{
{
//vout_display_owner_sys_t *osys = vd->owner.sys;
//vout_display_owner_sys_t *osys = vd->owner.sys;
...
...
src/video_output/display.h
View file @
bab5ed2b
...
@@ -33,7 +33,7 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
...
@@ -33,7 +33,7 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
/* FIXME should not be there */
/* FIXME should not be there */
void
vout_SendDisplayEventMouse
(
vout_thread_t
*
,
const
vlc_mouse_t
*
);
void
vout_SendDisplayEventMouse
(
vout_thread_t
*
,
const
vlc_mouse_t
*
);
vout_window_t
*
vout_NewDisplayWindow
(
vout_thread_t
*
,
vout_display_t
*
,
const
vout_window_cfg_t
*
);
vout_window_t
*
vout_NewDisplayWindow
(
vout_thread_t
*
,
const
vout_window_cfg_t
*
);
void
vout_DeleteDisplayWindow
(
vout_thread_t
*
,
vout_
display_t
*
,
vout_
window_t
*
);
void
vout_DeleteDisplayWindow
(
vout_thread_t
*
,
vout_window_t
*
);
void
vout_UpdateDisplaySourceProperties
(
vout_display_t
*
vd
,
const
video_format_t
*
);
void
vout_UpdateDisplaySourceProperties
(
vout_display_t
*
vd
,
const
video_format_t
*
);
src/video_output/video_output.c
View file @
bab5ed2b
...
@@ -609,10 +609,9 @@ static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, cons
...
@@ -609,10 +609,9 @@ static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, cons
cfg
->
align
.
vertical
=
VOUT_DISPLAY_ALIGN_BOTTOM
;
cfg
->
align
.
vertical
=
VOUT_DISPLAY_ALIGN_BOTTOM
;
}
}
vout_window_t
*
vout_NewDisplayWindow
(
vout_thread_t
*
vout
,
vout_display_t
*
vd
,
vout_window_t
*
vout_NewDisplayWindow
(
vout_thread_t
*
vout
,
const
vout_window_cfg_t
*
cfg
)
const
vout_window_cfg_t
*
cfg
)
{
{
VLC_UNUSED
(
vd
);
vout_window_cfg_t
cfg_override
=
*
cfg
;
vout_window_cfg_t
cfg_override
=
*
cfg
;
if
(
!
var_InheritBool
(
vout
,
"embedded-video"
))
if
(
!
var_InheritBool
(
vout
,
"embedded-video"
))
...
@@ -651,10 +650,8 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
...
@@ -651,10 +650,8 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
return
window
;
return
window
;
}
}
void
vout_DeleteDisplayWindow
(
vout_thread_t
*
vout
,
vout_display_t
*
vd
,
void
vout_DeleteDisplayWindow
(
vout_thread_t
*
vout
,
vout_window_t
*
window
)
vout_window_t
*
window
)
{
{
VLC_UNUSED
(
vd
);
if
(
!
vout
->
p
->
window
.
is_unused
&&
vout
->
p
->
window
.
object
==
window
)
{
if
(
!
vout
->
p
->
window
.
is_unused
&&
vout
->
p
->
window
.
object
==
window
)
{
vout
->
p
->
window
.
is_unused
=
true
;
vout
->
p
->
window
.
is_unused
=
true
;
}
else
if
(
vout
->
p
->
window
.
is_unused
&&
vout
->
p
->
window
.
object
&&
!
window
)
{
}
else
if
(
vout
->
p
->
window
.
is_unused
&&
vout
->
p
->
window
.
object
&&
!
window
)
{
...
...
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