Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	src/gui/epgview.h
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a29d0613ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



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

src/Makefile.am

@@ -81,7 +81,7 @@ neutrino_LDADD = \
 	gui/widget/libneutrino_gui_widget2.a \
 	driver/pictureviewer/libneutrino_pictureviewer.a \
 	$(MTDUTILSLIBS) \
-	gui/movieinfo.o \
+	driver/movieinfo.o \
 	gui/moviebrowser/mb.o \
 	gui/libneutrino_gui2.a \
 	gui/components/libneutrino_gui_components.a \

src/driver/Makefile.am

@@ -33,6 +33,7 @@ libneutrino_driver_a_SOURCES = \
 	fontrenderer.cpp \
 	genpsi.cpp \
 	moviecut.cpp \
+	movieinfo.cpp \
 	neutrinofonts.cpp \
 	radiotext.cpp \
 	radiotools.cpp \

src/driver/moviecut.h

@@ -20,7 +20,7 @@
 #ifndef __MOVIE_CUT__
 #define __MOVIE_CUT__
 
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <gui/components/cc.h>
 
 class CFrameBuffer;

src/driver/movieinfo.cpp

@@ -34,8 +34,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <gui/widget/msgbox.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <system/helpers.h>
 
 #include <neutrino.h>

src/driver/record.h

@@ -30,7 +30,7 @@
 #include <timerdclient/timerdtypes.h>
 
 #include <neutrinoMessages.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 
 #if HAVE_COOL_HARDWARE
 #include <record_cs.h>

src/gui/Makefile.am

@@ -72,7 +72,6 @@ libneutrino_gui_a_SOURCES = \
 	mediaplayer.cpp \
 	mediaplayer_setup.cpp \
 	miscsettings_menu.cpp \
-	movieinfo.cpp \
 	movieplayer.cpp \
 	network_service.cpp \
 	network_setup.cpp \

src/gui/epgview.h

@@ -37,7 +37,7 @@
 #include <system/settings.h>
 
 #include <gui/imdb.h> //NI
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include "widget/menue.h"
 
 #include <vector>

src/gui/moviebrowser/mb.h

@@ -53,7 +53,7 @@
 
 #include <gui/widget/textbox.h>
 #include <gui/widget/listframe.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <driver/file.h>
 #include <driver/fb_window.h>
 #include <system/ytparser.h>

src/gui/movieplayer.h

@@ -38,7 +38,7 @@
 #include <gui/bookmarkmanager.h>
 #include <gui/widget/menue.h>
 #include <gui/moviebrowser/mb.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <gui/widget/hintbox.h>
 #include <gui/timeosd.h>
 #include <driver/record.h>

src/neutrino_menue.cpp

@@ -137,8 +137,6 @@ void CNeutrinoApp::InitMenuMain()
 {
 	dprintf(DEBUG_DEBUG, "init mainmenue\n");
 
-	//NI unsigned int system_rev = cs_get_revision();
-
 	// Dynamic renumbering
 	personalize.setShortcut();
 

src/system/ytcache.h

@@ -30,7 +30,7 @@
 #include <OpenThreads/Thread>
 #include <OpenThreads/Condition>
 
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 
 class cYTCache
 {