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
ddada0ed
Commit
ddada0ed
authored
May 30, 2007
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small cleanup.
parent
bfefee70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
modules/video_filter/osdmenu.c
modules/video_filter/osdmenu.c
+10
-10
No files found.
modules/video_filter/osdmenu.c
View file @
ddada0ed
...
@@ -201,18 +201,18 @@ static int CreateFilter ( vlc_object_t *p_this )
...
@@ -201,18 +201,18 @@ static int CreateFilter ( vlc_object_t *p_this )
/* Check if menu position was overridden */
/* Check if menu position was overridden */
p_filter
->
p_sys
->
b_absolute
=
VLC_TRUE
;
p_filter
->
p_sys
->
b_absolute
=
VLC_TRUE
;
if
(
i_posx
<
0
||
i_posy
<
0
)
if
(
(
i_posx
<
0
)
||
(
i_posy
<
0
)
)
{
{
p_filter
->
p_sys
->
b_absolute
=
VLC_FALSE
;
p_filter
->
p_sys
->
b_absolute
=
VLC_FALSE
;
p_filter
->
p_sys
->
p_menu
->
i_x
=
0
;
p_filter
->
p_sys
->
p_menu
->
i_x
=
0
;
p_filter
->
p_sys
->
p_menu
->
i_y
=
0
;
p_filter
->
p_sys
->
p_menu
->
i_y
=
0
;
}
}
else
if
(
i_posx
>=
0
||
i_posy
>=
0
)
else
if
(
(
i_posx
>=
0
)
||
(
i_posy
>=
0
)
)
{
{
p_filter
->
p_sys
->
p_menu
->
i_x
=
i_posx
;
p_filter
->
p_sys
->
p_menu
->
i_x
=
i_posx
;
p_filter
->
p_sys
->
p_menu
->
i_y
=
i_posy
;
p_filter
->
p_sys
->
p_menu
->
i_y
=
i_posy
;
}
}
else
if
(
p_filter
->
p_sys
->
p_menu
->
i_x
<
0
||
p_filter
->
p_sys
->
p_menu
->
i_y
<
0
)
else
if
(
(
p_filter
->
p_sys
->
p_menu
->
i_x
<
0
)
||
(
p_filter
->
p_sys
->
p_menu
->
i_y
<
0
)
)
{
{
p_filter
->
p_sys
->
b_absolute
=
VLC_FALSE
;
p_filter
->
p_sys
->
b_absolute
=
VLC_FALSE
;
p_filter
->
p_sys
->
p_menu
->
i_x
=
0
;
p_filter
->
p_sys
->
p_menu
->
i_x
=
0
;
...
@@ -226,8 +226,8 @@ static int CreateFilter ( vlc_object_t *p_this )
...
@@ -226,8 +226,8 @@ static int CreateFilter ( vlc_object_t *p_this )
p_filter
->
p_sys
->
b_update
=
VLC_FALSE
;
p_filter
->
p_sys
->
b_update
=
VLC_FALSE
;
p_filter
->
p_sys
->
b_visible
=
VLC_FALSE
;
p_filter
->
p_sys
->
b_visible
=
VLC_FALSE
;
var_AddCallback
(
p_filter
->
p_sys
->
p_menu
,
"osd-menu-update"
,
OSDMenuUpdateEvent
,
p_filter
);
var_AddCallback
(
p_filter
->
p_sys
->
p_menu
,
"osd-menu-update"
,
OSDMenuUpdateEvent
,
p_filter
);
var_AddCallback
(
p_filter
->
p_sys
->
p_menu
,
"osd-menu-visible"
,
OSDMenuVisibleEvent
,
p_filter
);
var_AddCallback
(
p_filter
->
p_sys
->
p_menu
,
"osd-menu-visible"
,
OSDMenuVisibleEvent
,
p_filter
);
/* Attach subpicture filter callback */
/* Attach subpicture filter callback */
p_filter
->
pf_sub_filter
=
Filter
;
p_filter
->
pf_sub_filter
=
Filter
;
...
@@ -235,7 +235,7 @@ static int CreateFilter ( vlc_object_t *p_this )
...
@@ -235,7 +235,7 @@ static int CreateFilter ( vlc_object_t *p_this )
es_format_Init
(
&
p_filter
->
fmt_out
,
SPU_ES
,
VLC_FOURCC
(
's'
,
'p'
,
'u'
,
' '
)
);
es_format_Init
(
&
p_filter
->
fmt_out
,
SPU_ES
,
VLC_FOURCC
(
's'
,
'p'
,
'u'
,
' '
)
);
p_filter
->
fmt_out
.
i_priority
=
0
;
p_filter
->
fmt_out
.
i_priority
=
0
;
msg_Dbg
(
p_filter
,
"successfully loaded osdmenu filter"
);
msg_Dbg
(
p_filter
,
"successfully loaded osdmenu filter"
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
error:
...
@@ -248,7 +248,7 @@ error:
...
@@ -248,7 +248,7 @@ error:
}
}
if
(
p_filter
->
p_sys
->
psz_file
)
free
(
p_filter
->
p_sys
->
psz_file
);
if
(
p_filter
->
p_sys
->
psz_file
)
free
(
p_filter
->
p_sys
->
psz_file
);
if
(
p_filter
->
p_sys
)
free
(
p_filter
->
p_sys
);
if
(
p_filter
->
p_sys
)
free
(
p_filter
->
p_sys
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -394,12 +394,12 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
...
@@ -394,12 +394,12 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
if
(
!
p_sys
->
b_update
)
if
(
!
p_sys
->
b_update
)
return
NULL
;
return
NULL
;
/* Am I too early? */
/* Am I too early? */
if
(
(
(
p_sys
->
i_last_date
+
p_sys
->
i_update
)
>
i_date
)
&&
if
(
(
(
p_sys
->
i_last_date
+
p_sys
->
i_update
)
>
i_date
)
&&
(
p_sys
->
i_end_date
>
0
)
)
(
p_sys
->
i_end_date
>
0
)
)
return
NULL
;
/* we are too early, so wait */
return
NULL
;
/* we are too early, so wait */
/* Allocate the subpicture internal data. */
/* Allocate the subpicture internal data. */
p_spu
=
p_filter
->
pf_sub_buffer_new
(
p_filter
);
p_spu
=
p_filter
->
pf_sub_buffer_new
(
p_filter
);
if
(
!
p_spu
)
return
NULL
;
if
(
!
p_spu
)
return
NULL
;
...
@@ -422,7 +422,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
...
@@ -422,7 +422,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
p_spu
->
i_stop
=
i_date
+
p_sys
->
i_timeout
;
p_spu
->
i_stop
=
i_date
+
p_sys
->
i_timeout
;
p_sys
->
i_end_date
=
p_spu
->
i_stop
;
p_sys
->
i_end_date
=
p_spu
->
i_stop
;
}
}
p_sys
->
i_last_date
=
i_date
;
p_sys
->
i_last_date
=
i_date
;
p_spu
->
i_start
=
p_sys
->
i_last_date
=
i_date
;
p_spu
->
i_start
=
p_sys
->
i_last_date
=
i_date
;
...
...
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