diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index a557b743e..a08645528 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -534,7 +534,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*m return res; } -int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_startzeit, bool doLoop, bool callFromfollowlist,bool mp_info ) +int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_startzeit, bool doLoop, bool callFromfollowlist, bool mp_info ) { int res = menu_return::RETURN_REPAINT; static uint64_t id = 0; @@ -553,8 +553,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); if (channel) epg_id = channel->getEpgID(); - if(!mp_info) - GetEPGData(epg_id, id, &startzeit ); + if (!mp_info) + GetEPGData(epg_id, id, &startzeit); epgTextSwitch.clear(); if (doLoop) @@ -770,10 +770,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start textCount = epgText.size(); showText(showPos, sy + toph); // show Timer Event Buttons - showTimerEventBar (true, isCurrentEPG(channel_id), mp_info); + showTimerEventBar(true, isCurrentEPG(channel_id), mp_info); //show progressbar - if ( !mp_info && epg_done!= -1 ) + if (!mp_info && epg_done!= -1) { int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1); CProgressBar pb(pbx, sy+oy-height, 104, height-6); @@ -817,23 +817,24 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start switch ( msg ) { case NeutrinoMessages::EVT_TIMER: - if(!mp_info){ - if (data == g_InfoViewer->getUpdateTimer()) { - GetEPGData(channel_id, id, &startzeit, false); - if ( epg_done!= -1 ) { - int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1); - CProgressBar pb(pbx, sy+oy-height, 104, height-6); - pb.setType(CProgressBar::PB_TIMESCALE); - pb.setValues(epg_done, 100); - pb.paint(false); + if (!mp_info) + { + if (data == g_InfoViewer->getUpdateTimer()) { + GetEPGData(channel_id, id, &startzeit, false); + if ( epg_done!= -1 ) { + int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1); + CProgressBar pb(pbx, sy+oy-height, 104, height-6); + pb.setType(CProgressBar::PB_TIMESCALE); + pb.setValues(epg_done, 100); + pb.paint(false); + } } - } - if(data == fader.GetFadeTimer()) { - if(fader.FadeDone()) - loop = false; - } - else - CNeutrinoApp::getInstance()->handleMsg(msg, data); + if (data == fader.GetFadeTimer()) { + if (fader.FadeDone()) + loop = false; + } + else + CNeutrinoApp::getInstance()->handleMsg(msg, data); } break; case NeutrinoMessages::EVT_CURRENTNEXT_EPG: @@ -853,7 +854,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start showPos=0; } break; - case CRCInput::RC_right: if ((next_id != 0) && !call_fromfollowlist) { @@ -864,7 +864,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start showPos=0; } break; - case CRCInput::RC_down: if (showPos+scrollCount 0) { showPos -= scrollCount; @@ -903,14 +901,14 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start showTimerEventBar(true, true); } break; - - // 31.05.2002 dirch record timer case CRCInput::RC_red: - if (mp_info){ + if (mp_info) + { epgTextSwitchClear = false; loop = false; break; - }else if (!g_settings.minimode && (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)) + } + else if (!g_settings.minimode && (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)) { std::string recDir; //CTimerdClient timerdclient; @@ -1015,7 +1013,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start break; case CRCInput::RC_info: { - if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"){ + if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") + { showPos = 0; if (!tmdbtoggle) { cTmdb* tmdb = new cTmdb(epgData.title); @@ -1046,11 +1045,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start } break; } - - // 31.05.2002 dirch zapto timer case CRCInput::RC_yellow: { - if (!mp_info){ + if (!mp_info) + { if (isCurrentEPG(channel_id)) { CAdZapMenu::getInstance()->exec(NULL, "enable"); @@ -1116,7 +1114,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start show(channel_id, id, &startzeit, false, call_fromfollowlist); showPos=0; break; - case CRCInput::RC_ok: case CRCInput::RC_timeout: if(fader.StartFadeOut()) { @@ -1133,9 +1130,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start loop = false; } break; - default: - // konfigurierbare Keys handlen... if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) { if(fader.StartFadeOut()) { timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); @@ -1332,7 +1327,6 @@ const struct button_label EpgButtons[] = }; void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info) - { int x,y,h,fh; int icol_w, icol_h; diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index b65d2293b..609c093d3 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1036,7 +1036,7 @@ void CInfoViewer::loop(bool show_dot) hideIt = true; } else - g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0); + g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0); res = messages_return::cancel_info; } else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { if(fader.FadeDone()) diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 2c6356133..2c83b351f 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1850,13 +1850,17 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) { if (m_movieSelectionHandler != NULL) { std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode)); - if (!fname.empty()){ + if (!fname.empty()) + { //delete Cover - if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { - unlink(fname.c_str()); + if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) + { + unlink(fname.c_str()); refresh(); } - }else if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"){ + } + else if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") + { //add TMDB Cover fname = m_movieSelectionHandler->file.Name.c_str(); int ext_pos = 0; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index a254e4e0b..42d127be8 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1533,7 +1533,7 @@ void CMoviePlayerGui::PlayFileLoop(void) fromInfoviewer = false; } else - callInfoViewer(); + callInfoViewer(); update_lcd = true; clearSubtitle(); } else if (timeshift != TSHIFT_MODE_OFF && (msg == CRCInput::RC_text || msg == CRCInput::RC_epg || msg == NeutrinoMessages::SHOW_EPG)) {