From 96a27aa661e2e5562dd9fac1b8eadf0304f92da1 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 13 Feb 2016 21:39:23 +0100 Subject: define for compiling without libskindesiger. Use 'make DISABLESKINDESIGNER=1' --- plex.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'plex.cpp') diff --git a/plex.cpp b/plex.cpp index aa6e022..1d2aaa1 100644 --- a/plex.cpp +++ b/plex.cpp @@ -2,11 +2,8 @@ #include "SubscriptionManager.h" #include "plex.h" #include "plexOsd.h" -#include "plexSdOsd.h" -#include "pictureCache.h" #include "services.h" -#include #include #include #include @@ -18,7 +15,10 @@ ////////////////////////////////////////////////////////////////////////////// volatile bool cMyPlugin::CalledFromCode = false; + +#ifdef SKINDESIGNER bool cMyPlugin::bSkindesigner = false; +#endif plexclient::Video cMyPlugin::CurrentVideo; bool cMyPlugin::PlayingFile = false; @@ -31,7 +31,9 @@ bool cMyPlugin::PlayingFile = false; */ cMyPlugin::cMyPlugin(void) { +#ifdef SKINDESIGNER m_pSdCheck = NULL; +#endif } /** @@ -66,6 +68,7 @@ const char *cMyPlugin::Description(void) bool cMyPlugin::Start(void) { +#ifdef SKINDESIGNER skindesignerapi::cPluginStructure reg; reg.name = "plex"; reg.libskindesignerAPIVersion = LIBSKINDESIGNERAPIVERSION; @@ -95,6 +98,7 @@ bool cMyPlugin::Start(void) } else { esyslog("[plex]: %s skindesigner not available", __FUNCTION__); } +#endif return true; } @@ -127,8 +131,10 @@ bool cMyPlugin::Initialize(void) plexclient::plexgdm::GetInstance().clientDetails(Config::GetInstance().GetUUID(), Config::GetInstance().GetHostname(), "3200", DESCRIPTION, VERSION); plexclient::plexgdm::GetInstance().Start(); plexclient::ControlServer::GetInstance().Start(); + +#ifdef SKINDESIGNER cPictureCache::GetInstance().Start(); - +#endif return true; } @@ -146,8 +152,12 @@ const char *cMyPlugin::MainMenuEntry(void) cOsdObject *cMyPlugin::MainMenuAction(void) { //dsyslog("[plex]%s:\n", __FUNCTION__); +#ifdef SKINDESIGNER if(m_pSdCheck && m_pSdCheck->SdSupport()) return new cPlexSdOsd(); else return cPlexMenu::ProcessMenu(); +#else + return cPlexMenu::ProcessMenu(); +#endif } /** -- cgit v1.2.3