diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 47d2c6082..27b2c6b7e 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -363,7 +363,6 @@ int CBouquetList::show(bool bShowChannelList) fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -547,7 +546,6 @@ int CBouquetList::show(bool bShowChannelList) hide(); if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 2b99c0e77..b4740f6c6 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -565,7 +565,6 @@ int CChannelList::show() fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -917,7 +916,6 @@ int CChannelList::show() hide(); if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } if (bShowBouquetList) { diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index c18fcf556..e6092e8c7 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -122,7 +122,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -176,7 +175,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) hide(); if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } return res; diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index fb3111d3d..4840b4014 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -846,7 +846,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -1183,7 +1182,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu this->hide(); if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } #if 0 diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 68dd5ca4b..bddab2799 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -727,7 +727,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // set back to per pixel alpha only } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -945,7 +944,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start hide(); if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // set back to per pixel alpha only } } diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 901349ced..7d70b709f 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -342,7 +342,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -694,7 +693,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam hide(); if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 625270a8b..179627657 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -870,7 +870,6 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn) fadeValue = g_settings.infobar_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha frameBuffer->setBlendLevel(100, 100);//FIXME } else @@ -973,7 +972,6 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn) g_RCInput->killTimer (sec_timer_id); if (fadeIn || fadeOut) { g_RCInput->killTimer (fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha frameBuffer->setBlendLevel(100, 100);//FIXME } @@ -1422,7 +1420,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) if (data == fadeTimer) { // hierher kann das event nur dann kommen, wenn ein anderes Fenster im Vordergrund ist! g_RCInput->killTimer (fadeTimer); - frameBuffer->setBlendLevel(g_settings.gtx_alpha1, g_settings.gtx_alpha2); + frameBuffer->setBlendMode(1); return messages_return::handled; } else if (data == lcdUpdateTimer) { //printf("CInfoViewer::handleMsg: lcdUpdateTimer\n"); diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp index 9544c5b93..0455cf651 100644 --- a/src/gui/pluginlist.cpp +++ b/src/gui/pluginlist.cpp @@ -174,7 +174,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/) fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -282,7 +281,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/) hide(); if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } return res; diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 892e44ec1..aa239944b 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -513,7 +513,6 @@ int CTimerList::show() fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -660,7 +659,6 @@ int CTimerList::show() } if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } hide(); diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 7229c06c1..1995b9f70 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -814,7 +814,6 @@ bool CUpnpBrowserGui::selectItem(std::string id) loop=false; } m_frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t)); - m_frameBuffer->setBlendLevel(g_settings.gtx_alpha1, g_settings.gtx_alpha2); m_frameBuffer->Clear(); delete viewer; } diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index a0f69ae84..191578b3e 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -538,7 +538,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) fadeValue = g_settings.menu_Content_alpha; g_RCInput->killTimer (fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } else frameBuffer->setBlendLevel(fadeValue, fadeValue); @@ -665,7 +664,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) if ( fadeIn ) { g_RCInput->killTimer(fadeTimer); fadeIn = false; - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } int rv = item->exec( this ); @@ -736,7 +734,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); - //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2); frameBuffer->setBlendMode(1); // Set back to per pixel alpha } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d8e85ba95..94dcca452 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -419,9 +419,6 @@ int CNeutrinoApp::loadSetup(const char * fname) #endif g_settings.make_hd_list = configfile.getInt32("make_hd_list", 1); - //fb-alpha values for gtx - g_settings.gtx_alpha1 = configfile.getInt32( "gtx_alpha1", 255); - g_settings.gtx_alpha2 = configfile.getInt32( "gtx_alpha2", 1); //misc g_settings.power_standby = configfile.getInt32( "power_standby", 0); @@ -875,9 +872,6 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("ci_standby_reset", g_settings.ci_standby_reset); configfile.setInt32( "make_hd_list", g_settings.make_hd_list); - //fb-alpha values for gtx - configfile.setInt32( "gtx_alpha1", g_settings.gtx_alpha1 ); - configfile.setInt32( "gtx_alpha2", g_settings.gtx_alpha2 ); //led configfile.setInt32( "led_tv_mode", g_settings.led_tv_mode); configfile.setInt32( "led_standby_mode", g_settings.led_standby_mode); diff --git a/src/system/settings.h b/src/system/settings.h index 78f3448e1..862990db5 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -151,9 +151,6 @@ struct SNeutrinoSettings int widget_fade; //colors - unsigned char gtx_alpha1; - unsigned char gtx_alpha2; - unsigned char menu_Head_alpha; unsigned char menu_Head_red; unsigned char menu_Head_green;