From 080f11aef2546a5fd3b3ba2b5ba562bbe03d69f8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 6 May 2015 10:37:39 +0200 Subject: [PATCH] move LOGODIR and LOGODIR_VAR to global.h Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/11ccc53f0b529a6fca3ae17c298083b0d8c614ef Author: vanhofen Date: 2015-05-06 (Wed, 06 May 2015) Origin message was: ------------------ - move LOGODIR and LOGODIR_VAR to global.h ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/pictureviewer/pictureviewer.cpp | 3 --- src/global.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index b5ca90b6d..17d07c89b 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -513,9 +513,6 @@ void CPictureViewer::getSize(const char* name, int* width, int *height) } } -#define LOGODIR ICONSDIR "/logo" -#define LOGODIR_VAR ICONSDIR_VAR "/logo" - bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string& ChannelName, std::string & name, int *width, int *height) { std::string fileType[] = { ".png", ".jpg" , ".gif" }; diff --git a/src/global.h b/src/global.h index aeccaef70..94e5a781c 100644 --- a/src/global.h +++ b/src/global.h @@ -52,6 +52,9 @@ #define PLUGINDIR_VAR "/var/tuxbox/plugins" #define PLUGINDIR_MNT "/mnt/plugins" +#define LOGODIR ICONSDIR "/logo" +#define LOGODIR_VAR ICONSDIR_VAR "/logo" + NEUTRINO_CPP SNeutrinoSettings g_settings; NEUTRINO_CPP SglobalInfo g_info;