Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5dd90e3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)



------------------
This commit was generated by Migit

src/gui/audioplayer.cpp

@@ -1638,7 +1638,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        },
@@ -1657,7 +1657,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)
 	{

src/gui/components/cc_frm_scrollbar.cpp

@@ -165,9 +165,6 @@ void CComponentsScrollBar::initSegments()
 		y_seg += h_seg + append_y_offset;
 
 		int id = sb_segments_obj->getCCItemId(item);
-		if (sb_mark_id > id){
-			dprintf(DEBUG_NORMAL, "[CComponentsScrollBar] %s: sb_mark_id out of range current=%d allowed=%d\n", __func__, sb_mark_id, id);
-		}
 
 		//set color for marked id
 		if (sb_mark_id == id){

src/gui/followscreenings.cpp

@@ -151,14 +151,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 && g_settings.timer_followscreenings < 2 /*always*/) { //NI
+	if (followlist.size() == 1 && g_settings.timer_followscreenings < 2 /*always*/) //NI
+	{
 		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;
@@ -183,4 +189,3 @@ void CFollowScreenings::show()
 		m.exec(NULL, "");
 	}
 }
-

src/gui/videosettings.cpp

@@ -677,6 +677,7 @@ void CVideoSettings::nextMode(void)
 	int curmode = 0;
 	int i;
 	bool disp_cur = 1;
+	int res = messages_return::none;
 
 	for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
 		if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) {
@@ -688,7 +689,9 @@ void CVideoSettings::nextMode(void)
 
 	while(1) {
 		CVFD::getInstance()->ShowText(text);
-		int res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2);
+
+		if (res != messages_return::cancel_info) // avoid unnecessary display of messageboxes, when user is trying to press repeated format button
+			res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2);
 
 		if(disp_cur && res != messages_return::handled)
 			break;

src/gui/widget/msgbox.cpp

@@ -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!!

src/neutrino.cpp

@@ -2211,7 +2211,11 @@ void CNeutrinoApp::InitSectiondClient()
 	dprintf(DEBUG_NORMAL, "had to wait %ld ms for sectionsd to start up\n", time_monotonic_ms() - t);
 #endif
 	g_Sectionsd = new CSectionsdClient;
-	g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME);
+	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);
@@ -3516,7 +3520,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)))
@@ -3534,7 +3538,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;