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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-15 22:54:00 +01:00
parent e67e33d323 5708ad998c
commit 6bb52f0731
15 changed files with 250 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/helpers.cpp
View File

@@ -50,7 +50,7 @@
#include <driver/fontrenderer.h>
#include <global.h>
#include <driver/fontrenderer.h>
#include <driver/framebuffer.h>
//#include <driver/framebuffer.h>
#include <system/helpers.h>
#include <gui/update_ext.h>
using namespace std;
@@ -1247,6 +1247,7 @@ bool split_config_string(const std::string &str, std::map<std::string,std::strin
return !smap.empty();
}
#if 0
/* align for hw blit */
uint32_t GetWidth4FB_HW_ACC(const uint32_t _x, const uint32_t _w, const bool max)
{
@@ -1266,6 +1267,7 @@ uint32_t GetWidth4FB_HW_ACC(const uint32_t _x, const uint32_t _w, const bool max
return ret;
}
#endif
std::vector<std::string> split(const std::string &s, char delim)
{