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

- minor code cosmetics; no binary changes

Browse Source
This commit is contained in:
svenhoefer
2016-08-02 11:36:29 +02:00
parent d3cdf8d250
commit adb48f523d
4 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/epgview.cpp
View File

@@ -817,7 +817,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
switch ( msg ) switch ( msg )
{ {
case NeutrinoMessages::EVT_TIMER: case NeutrinoMessages::EVT_TIMER:
if(!mp_info){ if (!mp_info)
{
if (data == g_InfoViewer->getUpdateTimer()) { if (data == g_InfoViewer->getUpdateTimer()) {
GetEPGData(channel_id, id, &startzeit, false); GetEPGData(channel_id, id, &startzeit, false);
if ( epg_done!= -1 ) { if ( epg_done!= -1 ) {
@@ -853,7 +854,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
showPos=0; showPos=0;
} }
break; break;
case CRCInput::RC_right: case CRCInput::RC_right:
if ((next_id != 0) && !call_fromfollowlist) 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; showPos=0;
} }
break; break;
case CRCInput::RC_down: case CRCInput::RC_down:
if (showPos+scrollCount<textCount) if (showPos+scrollCount<textCount)
{ {
@@ -872,7 +871,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
showText(showPos, sy + toph, tmdbtoggle, false); showText(showPos, sy + toph, tmdbtoggle, false);
} }
break; break;
case CRCInput::RC_up: case CRCInput::RC_up:
if (showPos > 0) { if (showPos > 0) {
showPos -= scrollCount; 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); showTimerEventBar(true, true);
} }
break; break;
// 31.05.2002 dirch record timer
case CRCInput::RC_red: case CRCInput::RC_red:
if (mp_info){ if (mp_info)
{
epgTextSwitchClear = false; epgTextSwitchClear = false;
loop = false; loop = false;
break; 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; std::string recDir;
//CTimerdClient timerdclient; //CTimerdClient timerdclient;
@@ -1015,7 +1013,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
break; break;
case CRCInput::RC_info: case CRCInput::RC_info:
{ {
if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"){ if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
{
showPos = 0; showPos = 0;
if (!tmdbtoggle) { if (!tmdbtoggle) {
cTmdb* tmdb = new cTmdb(epgData.title); 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; break;
} }
// 31.05.2002 dirch zapto timer
case CRCInput::RC_yellow: case CRCInput::RC_yellow:
{ {
if (!mp_info){ if (!mp_info)
{
if (isCurrentEPG(channel_id)) if (isCurrentEPG(channel_id))
{ {
CAdZapMenu::getInstance()->exec(NULL, "enable"); 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); show(channel_id, id, &startzeit, false, call_fromfollowlist);
showPos=0; showPos=0;
break; break;
case CRCInput::RC_ok: case CRCInput::RC_ok:
case CRCInput::RC_timeout: case CRCInput::RC_timeout:
if(fader.StartFadeOut()) { 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; loop = false;
} }
break; break;
default: default:
// konfigurierbare Keys handlen...
if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) { if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) {
if(fader.StartFadeOut()) { if(fader.StartFadeOut()) {
timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
@@ -1332,7 +1327,6 @@ const struct button_label EpgButtons[] =
}; };
void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info) void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
{ {
int x,y,h,fh; int x,y,h,fh;
int icol_w, icol_h; int icol_w, icol_h;

10
src/gui/moviebrowser.cpp
View File

@@ -1850,13 +1850,17 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
{ {
if (m_movieSelectionHandler != NULL) { if (m_movieSelectionHandler != NULL) {
std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode)); std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode));
if (!fname.empty()){ if (!fname.empty())
{
//delete Cover //delete Cover
if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)
{
unlink(fname.c_str()); unlink(fname.c_str());
refresh(); refresh();
} }
}else if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"){ }
else if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
{
//add TMDB Cover //add TMDB Cover
fname = m_movieSelectionHandler->file.Name.c_str(); fname = m_movieSelectionHandler->file.Name.c_str();
int ext_pos = 0; int ext_pos = 0;