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
6c75bad6
Commit
6c75bad6
authored
Mar 04, 2011
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: EPGWidget: use time reference from epg stream, or ignore
parent
68031193
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
modules/gui/qt4/components/epg/EPGWidget.cpp
modules/gui/qt4/components/epg/EPGWidget.cpp
+6
-2
modules/gui/qt4/components/epg/EPGWidget.hpp
modules/gui/qt4/components/epg/EPGWidget.hpp
+1
-0
No files found.
modules/gui/qt4/components/epg/EPGWidget.cpp
View file @
6c75bad6
...
...
@@ -40,6 +40,7 @@ EPGWidget::EPGWidget( QWidget *parent ) : QWidget( parent )
m_rulerWidget
=
new
EPGRuler
(
this
);
m_epgView
=
new
EPGView
(
this
);
m_channelsWidget
=
new
EPGChannels
(
this
,
m_epgView
);
timeReference
=
QDateTime
::
currentDateTime
().
addDays
(
1
);
m_channelsWidget
->
setMinimumWidth
(
100
);
...
...
@@ -97,8 +98,10 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
{
QStringList
channelsList
;
EPGEvent
*
item
;
/* FIXME: dvb time might be from the next timezone */
QDateTime
timeReference
=
QDateTime
::
currentDateTime
();
/* if we have epg time available take new minimum time */
if
(
i_epg
>
0
&&
pp_epg
[
0
]
->
i_event
>
0
)
timeReference
=
QDateTime
::
fromTime_t
(
pp_epg
[
0
]
->
pp_event
[
0
]
->
i_start
);
/* flush our EPG data if input type has changed */
if
(
b_input_type_known
&&
i_input_type
!=
i_event_source_type
)
reset
();
...
...
@@ -123,6 +126,7 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
QDateTime
eventStart
=
QDateTime
::
fromTime_t
(
p_event
->
i_start
);
/* ensure we display ongoing item */
if
(
eventStart
<
timeReference
)
timeReference
=
eventStart
;
/* FIXME: EPGView timechanged signal is duplicate */
QList
<
EPGEvent
*>
events
=
m_events
.
values
(
channelName
);
item
=
new
EPGEvent
(
eventName
);
...
...
modules/gui/qt4/components/epg/EPGWidget.hpp
View file @
6c75bad6
...
...
@@ -57,6 +57,7 @@ private:
QMultiMap
<
QString
,
EPGEvent
*>
m_events
;
uint8_t
i_event_source_type
;
bool
b_input_type_known
;
QDateTime
timeReference
;
signals:
void
itemSelectionChanged
(
EPGEvent
*
);
...
...
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