From d053b40620ca6f3c105f7691abbb40b0d1afae47 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Mon, 10 Oct 2016 20:51:05 +0200 Subject: [PATCH 1/3] Fix compile error at src/gui/audioplayer.cpp - Complement to commit aa65a61 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/01f3a562299ba94855f5abb17280c35b07bd1c9e Author: Michael Liebmann Date: 2016-10-10 (Mon, 10 Oct 2016) ------------------ This commit was generated by Migit --- src/gui/audioplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 07f48f756..ebb947153 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1825,7 +1825,7 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos) { int xpos = m_x - ConnectLineBox_Width; int ypos1 = m_y + m_title_height + m_theight + pos*m_fheight; - int ypos2 = m_y + (m_height - m_info_height) + INFO_BOX_Y_OFFSET; + int ypos2 = m_y + (m_height - m_info_height) + OFFSET_INTER; int ypos1a = ypos1 + (m_fheight / 2); int ypos2a = ypos2 + (m_info_height / 2); From cdc1aa2ce26ba4124acd3ed0f97f0081c65ed7b0 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 11 Oct 2016 00:43:38 +0200 Subject: [PATCH 2/3] test_menue.cpp: fix broken build with --enable-testing Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/133ec1f2bbf373a139fea4c13d7c8916efb5d3d2 Author: Thilo Graf Date: 2016-10-11 (Tue, 11 Oct 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/test_menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 2ad4e0734..8769c4120 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -38,7 +38,7 @@ #include #include #include - +#include #include #include From 1afef53db4edcb0bdb7865cec598f7e1f2a7b2ec Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 11 Oct 2016 22:12:44 +0200 Subject: [PATCH 3/3] httptool: add missing CURLOPT_SSL_VERIFYPEER curl option Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3d8f4959ea42578ba37e541872576dd27a738277 Author: vanhofen Date: 2016-10-11 (Tue, 11 Oct 2016) Origin message was: ------------------ - httptool: add missing CURLOPT_SSL_VERIFYPEER curl option ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/system/httptool.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp index 72314f10d..772d22161 100644 --- a/src/system/httptool.cpp +++ b/src/system/httptool.cpp @@ -91,6 +91,7 @@ printf("url is %s\n", URL.c_str()); curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str()); curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1); curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); //NI + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false); //NI curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, connecttimeout); //NI curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); #ifdef DEBUG