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
fcf4105d
Commit
fcf4105d
authored
Mar 24, 2012
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: EPGView: fix visibility warning
parent
b0a779e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
modules/gui/qt4/components/epg/EPGView.cpp
modules/gui/qt4/components/epg/EPGView.cpp
+7
-7
No files found.
modules/gui/qt4/components/epg/EPGView.cpp
View file @
fcf4105d
...
@@ -132,15 +132,15 @@ static void cleanOverlapped( EPGEventByTimeQMap *epgItemByTime, EPGItem *epgItem
...
@@ -132,15 +132,15 @@ static void cleanOverlapped( EPGEventByTimeQMap *epgItemByTime, EPGItem *epgItem
}
}
}
}
bool
EPGView
::
addEPGEvent
(
vlc_epg_event_t
*
data
,
QString
channelName
,
bool
b_current
)
bool
EPGView
::
addEPGEvent
(
vlc_epg_event_t
*
event
data
,
QString
channelName
,
bool
b_current
)
{
{
/* Init our nested map if required */
/* Init our nested map if required */
EPGEventByTimeQMap
*
epgItemByTime
;
EPGEventByTimeQMap
*
epgItemByTime
;
EPGItem
*
epgItem
;
EPGItem
*
epgItem
;
bool
b_refresh_channels
=
false
;
bool
b_refresh_channels
=
false
;
QDateTime
eventStart
=
QDateTime
::
fromTime_t
(
data
->
i_start
);
QDateTime
eventStart
=
QDateTime
::
fromTime_t
(
event
data
->
i_start
);
if
(
eventStart
.
addSecs
(
data
->
i_duration
)
<
m_baseTime
)
if
(
eventStart
.
addSecs
(
event
data
->
i_duration
)
<
m_baseTime
)
return
false
;
/* EPG feed sent expired item */
return
false
;
/* EPG feed sent expired item */
if
(
eventStart
<
m_startTime
)
if
(
eventStart
<
m_startTime
)
{
{
...
@@ -164,13 +164,13 @@ bool EPGView::addEPGEvent( vlc_epg_event_t *data, QString channelName, bool b_cu
...
@@ -164,13 +164,13 @@ bool EPGView::addEPGEvent( vlc_epg_event_t *data, QString channelName, bool b_cu
/* Update our existing programs */
/* Update our existing programs */
epgItem
=
epgItemByTime
->
value
(
eventStart
);
epgItem
=
epgItemByTime
->
value
(
eventStart
);
epgItem
->
setCurrent
(
b_current
);
epgItem
->
setCurrent
(
b_current
);
if
(
epgItem
->
setData
(
data
)
)
/* updates our entry */
if
(
epgItem
->
setData
(
event
data
)
)
/* updates our entry */
cleanOverlapped
(
epgItemByTime
,
epgItem
,
scene
()
);
cleanOverlapped
(
epgItemByTime
,
epgItem
,
scene
()
);
mutex
.
unlock
();
mutex
.
unlock
();
return
false
;
return
false
;
}
else
{
}
else
{
/* Insert a new program entry */
/* Insert a new program entry */
epgItem
=
new
EPGItem
(
data
,
this
);
epgItem
=
new
EPGItem
(
event
data
,
this
);
cleanOverlapped
(
epgItemByTime
,
epgItem
,
scene
()
);
cleanOverlapped
(
epgItemByTime
,
epgItem
,
scene
()
);
/* Effectively insert our new program */
/* Effectively insert our new program */
epgItem
->
setCurrent
(
b_current
);
epgItem
->
setCurrent
(
b_current
);
...
@@ -187,10 +187,10 @@ bool EPGView::addEPGEvent( vlc_epg_event_t *data, QString channelName, bool b_cu
...
@@ -187,10 +187,10 @@ bool EPGView::addEPGEvent( vlc_epg_event_t *data, QString channelName, bool b_cu
return
true
;
return
true
;
}
}
void
EPGView
::
removeEPGEvent
(
vlc_epg_event_t
*
data
,
QString
channelName
)
void
EPGView
::
removeEPGEvent
(
vlc_epg_event_t
*
event
data
,
QString
channelName
)
{
{
EPGEventByTimeQMap
*
epgItemByTime
;
EPGEventByTimeQMap
*
epgItemByTime
;
QDateTime
eventStart
=
QDateTime
::
fromTime_t
(
data
->
i_start
);
QDateTime
eventStart
=
QDateTime
::
fromTime_t
(
event
data
->
i_start
);
EPGItem
*
epgItem
;
EPGItem
*
epgItem
;
bool
b_update_channels
=
false
;
bool
b_update_channels
=
false
;
...
...
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