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

Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

src/nhttpd/tuxboxapi/Makefile.am

@@ -16,6 +16,7 @@ AM_CPPFLAGS += \
 	@SIGC_CFLAGS@ \
 	@FREETYPE_CFLAGS@ \
 	@AVFORMAT_CFLAGS@ \
+	@LUA_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libnhttpd_tuxboxapi.a

src/nhttpd/tuxboxapi/neutrinoyparser.cpp

@@ -806,7 +806,7 @@ std::string  CNeutrinoYParser::func_unmount_get_list(CyhookHandler *, std::strin
 		in >> ymount >> ylocal_dir >> yfstype;
 		in.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
 		yfstype = trim(yfstype);
-		if( (yfstype == "nfs") << (yfstype == "ftp") || (yfstype == "lufsd") )
+		if( (yfstype == "nfs") || (yfstype == "ftp") || (yfstype == "lufsd") )
 		{
 			mounts=ylocal_dir +" on "+ ymount + " ("+yfstype+")";
 			ysel = ((j==0) ? "checked=\"checked\"" : "");

src/nhttpd/yhttpd_core/yhook.cpp

@@ -283,7 +283,7 @@ std::string CyhookHandler::BuildHeader(bool cache) {
 	case HTTP_MOVED_PERMANENTLY:
 		// Status HTTP_*_TEMPORARILY (redirection)
 		result += string_printf("Location: %s\r\n", NewURL.c_str());
-		// NO break HERE !!!
+		// fall through
 
 	default:
 		time_t timer = time(0);