CComponentsPicture: use current instance of CPictureViewer

reduce precautionary too much unnecessary impact


Origin commit data
------------------
Branch: ni/coolstream
Commit: e6f6931b72
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-25 (Wed, 25 Jun 2014)



------------------
This commit was generated by Migit
This commit is contained in:
2014-06-25 09:58:21 +02:00
parent 55b76b69ba
commit a78751ea55
3 changed files with 9 additions and 8 deletions

View File

@@ -66,7 +66,7 @@ class CPictureViewer
static double m_aspect_ratio_correction;
bool DisplayImage (const std::string & name, int posx, int posy, int width, int height, int transp=CFrameBuffer::TM_EMPTY);
// bool DisplayLogo (uint64_t channel_id, int posx, int posy, int width, int height);
virtual bool GetLogoName(const uint64_t& channel_id, const std::string& ChanName, std::string & name, int *width = NULL, int *height = NULL);
bool GetLogoName(const uint64_t& channel_id, const std::string& ChanName, std::string & name, int *width = NULL, int *height = NULL);
fb_pixel_t * getImage (const std::string & name, int width, int height);
fb_pixel_t * getIcon (const std::string & name, int *width, int *height);
void getSize(const char *name, int* width, int *height);