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

nhttpd/neutrinoapi: fix getLogoFile()

Browse Source 
Origin commit data
------------------
Commit: b66c1e9f0f
Author: martii <m4rtii@gmx.de>
Date: 2014-03-11 (Tue, 11 Mar 2014)
This commit is contained in:
martii
2014-03-11 19:49:37 +01:00
committed by vanhofen
parent 5a24dc1ce5
commit de29fd97eb
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nhttpd/tuxboxapi/neutrinoapi.cpp
View File

@@ -26,6 +26,7 @@
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#include <driver/rcinput.h> #include <driver/rcinput.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/pictureviewer/pictureviewer.h>
#include <gui/color.h> #include <gui/color.h>
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <gui/customcolor.h> #include <gui/customcolor.h>
@@ -43,6 +44,7 @@
#include <eitd/sectionsd.h> #include <eitd/sectionsd.h>
#include <OpenThreads/ScopedLock> #include <OpenThreads/ScopedLock>
extern CPictureViewer *g_PicViewer;
extern CBouquetManager *g_bouquetManager; extern CBouquetManager *g_bouquetManager;
extern CFrontend * frontend; extern CFrontend * frontend;
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
@@ -521,24 +523,11 @@ std::string CNeutrinoAPI::getCryptInfoAsString(void)
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
std::string CNeutrinoAPI::getLogoFile(std::string _logoURL, t_channel_id channelId) std::string CNeutrinoAPI::getLogoFile(std::string _logoURL __attribute__((unused)), t_channel_id channelId)
{ {
std::string channelIdAsString = string_printf( PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS , channelId & 0xFFFFFFFFFFFFULL);
std::string channelName = GetServiceName(channelId); std::string channelName = GetServiceName(channelId);
// replace(channelName, " ", "_"); std::string logoString;
_logoURL+="/"; if (g_PicViewer->GetLogoName(channelId, channelName, logoString, NULL, NULL))
if (access((_logoURL + channelName + ".png").c_str(), 4) == 0) return logoString;
return _logoURL + channelName + ".png"; return "";
else if (access((_logoURL + channelName + ".jpg").c_str(), 4) == 0)
return _logoURL + channelName + ".jpg";
else if (access((_logoURL + channelName + ".gif").c_str(), 4) == 0)
return _logoURL + channelName + ".gif";
else if(access((_logoURL + channelIdAsString + ".png").c_str(), 4) == 0)
return _logoURL + channelIdAsString + ".png";
else if (access((_logoURL + channelIdAsString + ".jpg").c_str(), 4) == 0)
return _logoURL + channelIdAsString + ".jpg";
else if (access((_logoURL + channelIdAsString + ".gif").c_str(), 4) == 0)
return _logoURL + channelIdAsString + ".gif";
else
return "";
} }