mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 00:11:08 +02:00
remove obsolete define SCALE2RES_DEFINED
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39a8ee32e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-08-25 (Thu, 25 Aug 2022)
Origin message was:
------------------
- remove obsolete define SCALE2RES_DEFINED
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -290,8 +290,6 @@ class CFrameBuffer : public sigc::trackable
|
||||
virtual void blitBox2FB(const fb_pixel_t* boxBuf, const uint32_t& width, const uint32_t& height, const uint32_t& xoff, const uint32_t& yoff);
|
||||
|
||||
virtual void mark(int x, int y, int dx, int dy);
|
||||
/* Remove this when pu/fb-setmode branch is merged to master */
|
||||
#define SCALE2RES_DEFINED
|
||||
virtual int scale2Res(int size) { return size; };
|
||||
virtual bool fullHdAvailable() { return false; };
|
||||
virtual void setOsdResolutions();
|
||||
|
@@ -1399,12 +1399,7 @@ int CLuaInstance::scale2Res(lua_State *L)
|
||||
int value, ret;
|
||||
value = luaL_checkint(L, 2);
|
||||
|
||||
/* Remove this when pu/fb-setmode branch is merged to master */
|
||||
#ifdef SCALE2RES_DEFINED
|
||||
ret = CFrameBuffer::getInstance()->scale2Res(value);
|
||||
#else
|
||||
ret = value;
|
||||
#endif
|
||||
lua_pushinteger(L, ret);
|
||||
return 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user