Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-ui-redesign
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
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
Gautam Chitnis
web-ui-redesign
Commits
5b269e22
Commit
5b269e22
authored
Dec 27, 2016
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: show empty epg
always give visual feedback on hotkey
parent
c9383327
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
src/video_output/video_epg.c
src/video_output/video_epg.c
+10
-8
No files found.
src/video_output/video_epg.c
View file @
5b269e22
...
...
@@ -161,35 +161,33 @@ static subpicture_region_t * vout_BuildOSDEpg(vlc_epg_t *epg,
visible_height
*
EPG_NAME_SIZE
,
0x00ffffff
);
if
(
!
*
last_ptr
)
return
head
;
if
(
*
last_ptr
)
last_ptr
=
&
(
*
last_ptr
)
->
p_next
;
/* Display the name of the current program. */
last_ptr
=
&
(
*
last_ptr
)
->
p_next
;
*
last_ptr
=
vout_OSDEpgText
(
epg
->
p_current
?
epg
->
p_current
->
psz_name
:
NULL
,
x
+
visible_width
*
(
EPG_LEFT
+
0
.
025
),
y
+
visible_height
*
(
EPG_TOP
+
0
.
05
),
visible_height
*
EPG_PROGRAM_SIZE
,
0x00ffffff
);
if
(
!*
last_ptr
||
!
epg
->
p_current
)
return
head
;
if
(
*
last_ptr
)
last_ptr
=
&
(
*
last_ptr
)
->
p_next
;
if
(
epgtime
)
if
(
epgtime
&&
epg
->
p_current
)
{
f_progress
=
(
epgtime
-
epg
->
p_current
->
i_start
)
/
(
float
)
epg
->
p_current
->
i_duration
;
}
/* Display the current program time slider. */
last_ptr
=
&
(
*
last_ptr
)
->
p_next
;
*
last_ptr
=
vout_OSDEpgSlider
(
x
+
visible_width
*
EPG_LEFT
,
y
+
visible_height
*
(
EPG_TOP
+
0
.
1
),
visible_width
*
(
1
-
2
*
EPG_LEFT
),
visible_height
*
0
.
05
,
f_progress
);
if
(
!*
last_ptr
)
if
(
!*
last_ptr
||
!
epg
->
p_current
)
return
head
;
/* Format the hours of the beginning and the end of the current program. */
...
...
@@ -317,6 +315,10 @@ int vout_OSDEpg(vout_thread_t *vout, input_item_t *input)
epg
->
psz_name
=
strdup
(
tmp
->
psz_name
);
}
}
else
/* Always display something as user hotkey feedback */
{
epg
=
vlc_epg_New
(
0
,
0
);
}
epg_time
=
input
->
i_epg_time
;
vlc_mutex_unlock
(
&
input
->
lock
);
...
...
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