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

Fix display volumebar when channellist is visible

Browse Source
This commit is contained in:
M. Liebmann
2014-01-28 12:54:07 +01:00
parent da2738cd9e
commit 65859318d0
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/volumebar.cpp
View File

@@ -124,7 +124,9 @@ void CVolumeBar::initVolumeBarPosition()
if (( neutrino->getMode() != CNeutrinoApp::mode_scart ) && ( neutrino->getMode() != CNeutrinoApp::mode_audio) && ( neutrino->getMode() != CNeutrinoApp::mode_pic)) { if (( neutrino->getMode() != CNeutrinoApp::mode_scart ) && ( neutrino->getMode() != CNeutrinoApp::mode_audio) && ( neutrino->getMode() != CNeutrinoApp::mode_pic)) {
if ((neutrino->isMuted()) && (!g_settings.mode_clock)) if ((neutrino->isMuted()) && (!g_settings.mode_clock))
x_corr = mute_dx + h_spacer; x_corr = mute_dx + h_spacer;
if (g_settings.mode_clock) if (CNeutrinoApp::getInstance()->getChannellistIsVisible() == true)
y += std::max(39, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight()) + v_spacer;
else if (g_settings.mode_clock)
y = clock_y + clock_height + v_spacer + SHADOW_OFFSET; y = clock_y + clock_height + v_spacer + SHADOW_OFFSET;
} }
x = sw - width - x_corr; x = sw - width - x_corr;

3
src/neutrino.cpp
View File

@@ -221,6 +221,7 @@ CNeutrinoApp::CNeutrinoApp()
current_muted = 0; current_muted = 0;
recordingstatus = 0; recordingstatus = 0;
g_channel_list_changed = false; g_channel_list_changed = false;
channellist_visible = false;
} }
/*------------------------------------------------------------------------------------- /*-------------------------------------------------------------------------------------
@@ -2365,6 +2366,7 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
{ {
neutrino_msg_t msg = _msg; neutrino_msg_t msg = _msg;
InfoClock->enableInfoClock(false); InfoClock->enableInfoClock(false);
channellist_visible = true;
StopSubtitles(); StopSubtitles();
@@ -2448,6 +2450,7 @@ _repeat:
goto _show; goto _show;
} }
channellist_visible = false;
if (!from_menu) if (!from_menu)
InfoClock->enableInfoClock(true); InfoClock->enableInfoClock(true);

2
src/neutrino.h
View File

@@ -103,6 +103,7 @@ private:
int radiosort[LIST_MODE_LAST]; int radiosort[LIST_MODE_LAST];
CMoviePluginChangeExec *MoviePluginChanger; CMoviePluginChangeExec *MoviePluginChanger;
bool channellist_visible;
void SDT_ReloadChannels(); void SDT_ReloadChannels();
void setupNetwork( bool force= false ); void setupNetwork( bool force= false );
@@ -211,6 +212,7 @@ public:
void stopDaemonsForFlash(); void stopDaemonsForFlash();
int showChannelList(const neutrino_msg_t msg, bool from_menu = false); int showChannelList(const neutrino_msg_t msg, bool from_menu = false);
CPersonalizeGui & getPersonalizeGui() { return personalize; } CPersonalizeGui & getPersonalizeGui() { return personalize; }
bool getChannellistIsVisible() { return channellist_visible; }
}; };
#endif #endif