mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 14:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2174dde26b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-24 (Fri, 24 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-24 18:55:15 +01:00
parent d95aa92eff a8df61b3c1
commit 4f679de2be
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/audioplayer.cpp
View File

@@ -1601,7 +1601,7 @@ void CAudioPlayerGui::paintFoot()
if (m_screensaver)
return;
const struct button_label ScondLineButtons[3] =
const struct button_label SecondLineButtons[3] =
{
{ NEUTRINO_ICON_BUTTON_OKAY , LOCALE_AUDIOPLAYER_PLAY },
{ NEUTRINO_ICON_BUTTON_HELP , LOCALE_AUDIOPLAYER_KEYLEVEL },
@@ -1620,7 +1620,7 @@ void CAudioPlayerGui::paintFoot()
int bwidth = m_width - (2*c_rad_mid);
if (!m_playlist.empty())
::paintButtons(m_x + c_rad_mid, top+m_buttonHeight, bwidth, 3, ScondLineButtons, bwidth, m_buttonHeight);
::paintButtons(m_x + c_rad_mid, top+m_buttonHeight, bwidth, 3, SecondLineButtons, bwidth, m_buttonHeight);
if (m_key_level == 0)
{

11
src/gui/followscreenings.cpp
View File

@@ -145,14 +145,20 @@ void CFollowScreenings::updateRightIcon(int ix, time_t start, unsigned int durat
void CFollowScreenings::show()
{
if (channel_id == 0)
return;
char actionstr[32];
getFollowScreenings();
if (followlist.size() == 1) {
if (followlist.size() == 1)
{
snprintf(actionstr, sizeof(actionstr), "%lu", followlist.front().startTime);
exec(NULL, actionstr);
} else {
}
else if (followlist.size() > 1)
{
CMenuWidget m(LOCALE_EPGVIEWER_SELECT_SCREENING, NEUTRINO_ICON_SETTINGS);
const char *icon = NEUTRINO_ICON_BUTTON_RED;
neutrino_msg_t directKey = CRCInput::RC_red;
@@ -177,4 +183,3 @@ void CFollowScreenings::show()
m.exec(NULL, "");
}
}

3
src/gui/widget/msgbox.cpp
View File

@@ -315,6 +315,9 @@ int CMsgBox::exec()
result = (msg_result_t)ccw_footer->getSelectedButtonObject()->getButtonResult();
loop = false;
}
else if (msg == NeutrinoMessages::RECORD_START || msg == NeutrinoMessages::RECORD_STOP) {
CNeutrinoApp::getInstance()->handleMsg(msg, data);
}
//***ignore***
else if (CNeutrinoApp::getInstance()->listModeKey(msg)){
// do nothing //TODO: if passed rc messages are ignored rc messaages: has no effect here too!!

10
src/neutrino.cpp
View File

@@ -5,7 +5,7 @@
and some other guys
Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2006-2014 Stefan Seyfried
Copyright (C) 2006-2016 Stefan Seyfried
Copyright (C) 2011 CoolStream International Ltd
@@ -2069,7 +2069,11 @@ void CNeutrinoApp::InitZapitClient()
void CNeutrinoApp::InitSectiondClient()
{
g_Sectionsd = new CSectionsdClient;
struct timespec t;
if (clock_gettime(CLOCK_MONOTONIC, &t)) {
dprintf(DEBUG_NORMAL, "CLOCK_MONOTONIC not supported? (%m), falling back to EVT_TIMESET\n");
g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME);
}
g_Sectionsd->registerEvent(CSectionsdClient::EVT_GOT_CN_EPG, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_EIT_COMPLETE, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME);
@@ -3265,7 +3269,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
if (rec_mode == CRecordManager::RECMODE_OFF || rec_mode == CRecordManager::RECMODE_TSHIFT)
CRecordManager::getInstance()->Record(live_channel_id);
delete[] (unsigned char*) data;
return messages_return::handled | messages_return::cancel_all;
return messages_return::handled;
}
if(mode == mode_standby){
if((eventinfo->channel_id != live_channel_id) && !(SAME_TRANSPONDER(live_channel_id, eventinfo->channel_id)))
@@ -3278,7 +3282,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
delete[] (unsigned char*) data;
return messages_return::handled | messages_return::cancel_all;
return messages_return::handled;
}
else if( msg == NeutrinoMessages::RECORD_STOP) {
CTimerd::RecordingStopInfo* recinfo = (CTimerd::RecordingStopInfo*)data;