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

- movieplayer: show channellogo in infobar

Browse Source
This commit is contained in:
svenhoefer
2013-11-15 09:22:12 +01:00
parent 37e3502fb0
commit 5ce5730f84
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/infoviewer.cpp
View File

@@ -472,7 +472,7 @@ void CInfoViewer::show_current_next(bool new_chan, int epgpos)
} }
} }
void CInfoViewer::showMovieTitle(const int playState, 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)
{ {
@@ -506,7 +506,7 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel
infoViewerBB->is_visible = true; infoViewerBB->is_visible = true;
ChannelName = Channel; ChannelName = Channel;
channel_id = 0; channel_id = Channel_Id;
/* showChannelLogo() changes this, so better reset it every time... */ /* showChannelLogo() changes this, so better reset it every time... */
ChanNameX = BoxStartX + ChanWidth + SHADOW_OFFSET; ChanNameX = BoxStartX + ChanWidth + SHADOW_OFFSET;
@@ -520,7 +520,11 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel
infoViewerBB->paintshowButtonBar(); infoViewerBB->paintshowButtonBar();
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + time_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 ,ChannelName, COL_INFOBAR_TEXT, 0, true); // UTF-8 int ChannelLogoMode = 0;
if (g_settings.infobar_show_channellogo > 1)
ChannelLogoMode = showChannelLogo(channel_id, 0);
if (ChannelLogoMode == 0 || ChannelLogoMode == 3 || ChannelLogoMode == 4)
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + time_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 ,ChannelName, COL_INFOBAR_TEXT, 0, true); // UTF-8
// show_Data // show_Data
if (CMoviePlayerGui::getInstance().file_prozent > 100) if (CMoviePlayerGui::getInstance().file_prozent > 100)

2
src/gui/infoviewer.h
View File

@@ -157,7 +157,7 @@ class CInfoViewer
CInfoViewer(); CInfoViewer();
~CInfoViewer(); ~CInfoViewer();
void showMovieTitle(const int playState, 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 duration, const int curr_pos);

4
src/gui/movieplayer.cpp
View File

@@ -853,13 +853,13 @@ void CMoviePlayerGui::callInfoViewer(/*const int duration, const int curr_pos*/)
getCurrentAudioName( is_file_player, currentaudioname); getCurrentAudioName( is_file_player, currentaudioname);
if (isMovieBrowser && p_movie_info) { if (isMovieBrowser && p_movie_info) {
g_InfoViewer->showMovieTitle(playstate, p_movie_info->epgChannel, p_movie_info->epgTitle, p_movie_info->epgInfo1, g_InfoViewer->showMovieTitle(playstate, p_movie_info->epgEpgId >>16, p_movie_info->epgChannel, p_movie_info->epgTitle, p_movie_info->epgInfo1,
duration, position); duration, position);
return; return;
} }
/* not moviebrowser => use the filename as title */ /* not moviebrowser => use the filename as title */
g_InfoViewer->showMovieTitle(playstate, file_name, "", "", duration, position); g_InfoViewer->showMovieTitle(playstate, 0, file_name, "", "", duration, position);
} }
bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle) bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle)