mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

move LOGODIR and LOGODIR_VAR to global.h

Browse Source 
Origin commit data
------------------
Commit: 11ccc53f0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- move LOGODIR and LOGODIR_VAR to global.h
This commit is contained in:
vanhofen
2015-05-06 10:37:39 +02:00
parent 3429bd79b2
commit 5ebaefc5f2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -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) 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" }; std::string fileType[] = { ".png", ".jpg" , ".gif" };

3
src/global.h
View File

@@ -52,6 +52,9 @@
#define PLUGINDIR_VAR "/var/tuxbox/plugins" #define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_MNT "/mnt/plugins" #define PLUGINDIR_MNT "/mnt/plugins"
#define LOGODIR ICONSDIR "/logo"
#define LOGODIR_VAR ICONSDIR_VAR "/logo"
NEUTRINO_CPP SNeutrinoSettings g_settings; NEUTRINO_CPP SNeutrinoSettings g_settings;
NEUTRINO_CPP SglobalInfo g_info; NEUTRINO_CPP SglobalInfo g_info;