From a8e6b8be206ed3437f95704d4f45e08ffd2182c9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 25 Aug 2022 21:39:33 +0200 Subject: [PATCH] remove obsolete define SCALE2RES_DEFINED Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/39a8ee32e5ee5d5a03c7e454a2f4a07eb66b0bd8 Author: vanhofen 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 --- src/driver/fb_generic.h | 2 -- src/gui/lua/luainstance.cpp | 5 ----- 2 files changed, 7 deletions(-) diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h index cd93867ae..13f1e497e 100644 --- a/src/driver/fb_generic.h +++ b/src/driver/fb_generic.h @@ -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(); diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index a385ddceb..f21080858 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -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; }