moviedb: outsource moviedb sources into own subdir

configure.ac

@@ -650,6 +650,7 @@ src/gui/Makefile
 src/gui/bedit/Makefile
 src/gui/components/Makefile
 src/gui/lua/Makefile
+src/gui/moviedb/Makefile
 src/gui/moviebrowser/Makefile
 src/gui/widget/Makefile
 src/gui/widget/yaft/Makefile

src/Makefile.am

@@ -82,6 +82,7 @@ neutrino_LDADD = \
 	driver/movieinfo.o \
 	gui/moviebrowser/mb.o \
 	gui/libneutrino_gui2.a \
+	gui/moviedb/libneutrino_gui_moviedb.a \
 	gui/components/libneutrino_gui_components.a \
 	$(LUALIBS) \
 	eitd/libsectionsd.a \

src/gui/Makefile.am

@@ -13,7 +13,7 @@ version.h:
 noinst_HEADERS = version.h
 .PHONY: version.h
 
-SUBDIRS = bedit components moviebrowser widget
+SUBDIRS = bedit components moviebrowser moviedb widget
 
 if ENABLE_LUA
 SUBDIRS += lua
@@ -65,8 +65,6 @@ libneutrino_gui_a_SOURCES = \
 	infoviewer.cpp \
 	infoviewer_bb.cpp \
 	keybind_setup.cpp \
-	mdb-imdb.cpp \
-	mdb-tmdb.cpp \
 	mediaplayer.cpp \
 	mediaplayer_setup.cpp \
 	miscsettings_menu.cpp \

src/gui/epgview.h

@@ -35,8 +35,8 @@
 
 #include <system/settings.h>
 
-#include "mdb-imdb.h"
+#include "moviedb/mdb-imdb.h"
-#include "mdb-tmdb.h"
+#include "moviedb/mdb-tmdb.h"
 #include <driver/movieinfo.h>
 #include "widget/menue.h"
 #include "widget/navibar.h"

src/gui/moviebrowser/mb.cpp

@@ -51,8 +51,8 @@
 #include "mb_functions.h"
 #include "mb_help.h"
 #include <gui/filebrowser.h>
-#include <gui/mdb-imdb.h>
+#include <gui/moviedb/mdb-imdb.h>
-#include <gui/mdb-tmdb.h>
+#include <gui/moviedb/mdb-tmdb.h>
 #include <gui/epgview.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/icons.h>

src/gui/moviedb/Makefile.am

@@ -0,0 +1,23 @@
+AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
+
+AM_CPPFLAGS += \
+	-I$(top_builddir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/lib/libeventserver \
+	-I$(top_srcdir)/lib/libconfigfile \
+	-I$(top_srcdir)/lib/xmltree \
+	-I$(top_srcdir)/lib/jsoncpp \
+	@SIGC_CFLAGS@ \
+	@FREETYPE_CFLAGS@ \
+	@LUA_CFLAGS@ \
+	@HWLIB_CFLAGS@
+
+noinst_LIBRARIES = libneutrino_gui_moviedb.a
+
+
+libneutrino_gui_moviedb_a_SOURCES = \
+	mdb-imdb.cpp \
+	mdb-tmdb.cpp

src/gui/moviedb/mdb-tmdb.cpp

@@ -15,8 +15,7 @@
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 
@@ -38,6 +37,7 @@
 #include <neutrino.h>
 #include <system/settings.h>
 #include <system/set_threadname.h>
+#include <system/debug.h>
 #include <driver/screen_max.h>
 #include <global.h>
 #include "mdb-tmdb.h"
@@ -183,14 +183,15 @@ bool CTMDB::getMovieDetails(std::string lang, bool second)
 			for (unsigned int i = 0; i < elements.size() && i < 10; i++)
 			{
 				minfo.cast +=  "  " + elements[i].get("character", "").asString() + " (" + elements[i].get("name", "").asString() + ")\n";
-				//printf("test: %s (%s)\n",elements[i].get("character","").asString().c_str(),elements[i].get("name","").asString().c_str());
+				// dprintf(DEBUG_NORMAL, "[TMDB]: %s (%s)\n", elements[i].get("character","").asString().c_str(), elements[i].get("name","").asString().c_str());
 			}
 
 			unlink(posterfile.c_str());
 			if (hasPoster())
+			{
 				getBigPoster(posterfile.c_str());
-			//printf("[TMDB]: %s (%s) %s\n %s\n %d\n",minfo.epgtitle.c_str(),minfo.original_title.c_str(),minfo.release_date.c_str(),minfo.overview.c_str(),minfo.found);
+				// dprintf(DEBUG_NORMAL, "[TMDB]: %s (%s) %s\n %s\n %d\n", minfo.epgtitle.c_str(), minfo.original_title.c_str(), minfo.release_date.c_str(), minfo.overview.c_str(), minfo.found);
-
+			}
 			return true;
 		}
 	}

src/gui/moviedb/mdb-tmdb.h

@@ -15,8 +15,7 @@
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #ifndef __TMDB__