mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- infoviewer: show movieplayers infoviewer in vzap mode if needed

Browse Source
This commit is contained in:
svenhoefer
2016-02-04 00:14:57 +01:00
parent 2c39affafe
commit 944dab5a8c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer.cpp
View File

@@ -529,7 +529,7 @@ void CInfoViewer::show_current_next(bool new_chan, int epgpos)
void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channel_Id, const std::string &Channel, void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channel_Id, const std::string &Channel,
const std::string &g_file_epg, const std::string &g_file_epg1, const std::string &g_file_epg, const std::string &g_file_epg1,
const int duration, const int curr_pos, const int duration, const int curr_pos,
const int repeat_mode) const int repeat_mode, const int _zap_mode)
{ {
if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT || if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_RIGHT || g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_RIGHT ||
@@ -544,6 +544,7 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
last_curr_id = last_next_id = 0; last_curr_id = last_next_id = 0;
showButtonBar = true; showButtonBar = true;
fileplay = true; fileplay = true;
zap_mode = _zap_mode;
reset_allScala(); reset_allScala();
if (!gotTime) if (!gotTime)
gotTime = timeset; gotTime = timeset;
@@ -573,7 +574,8 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
showRecordIcon (show_dot); showRecordIcon (show_dot);
show_dot = !show_dot; show_dot = !show_dot;
infoViewerBB->paintshowButtonBar(); if (!zap_mode)
infoViewerBB->paintshowButtonBar();
int ChannelLogoMode = 0; int ChannelLogoMode = 0;
if (g_settings.infobar_show_channellogo > 1) if (g_settings.infobar_show_channellogo > 1)

2
src/gui/infoviewer.h
View File

@@ -166,7 +166,7 @@ class CInfoViewer
void showMovieTitle(const int playState, const t_channel_id &channel_id, const std::string &title, void showMovieTitle(const int playState, const t_channel_id &channel_id, const std::string &title,
const std::string &g_file_epg, const std::string &g_file_epg1, const std::string &g_file_epg, const std::string &g_file_epg1,
const int duration, const int curr_pos, const int repeat_mode); const int duration, const int curr_pos, const int repeat_mode, const int _zap_mode = IV_MODE_DEFAULT);
void start(); void start();
void showEpgInfo(); void showEpgInfo();

2
src/gui/movieplayer.cpp
View File

@@ -1384,7 +1384,7 @@ void CMoviePlayerGui::callInfoViewer(bool init_vzap_it)
} }
} }
g_InfoViewer->showMovieTitle(playstate, mi->epgEpgId >>16, mi->epgChannel, mi->epgTitle, mi->epgInfo1, g_InfoViewer->showMovieTitle(playstate, mi->epgEpgId >>16, mi->epgChannel, mi->epgTitle, mi->epgInfo1,
duration, position, repeat_mode); duration, position, repeat_mode, init_vzap_it ? 0 /*IV_MODE_DEFAULT*/ : 1 /*IV_MODE_VIRTUAL_ZAP*/);
return; return;
} }