mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Conflicts:
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2014-01-19 13:37:24 +01:00
parent 26efbbccf3 7b40b61c9a
commit eca8f5459b
15 changed files with 213 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/driver/vfd.cpp
View File

@@ -41,6 +41,9 @@
#include <sys/stat.h>
#include <daemonc/remotecontrol.h>
#include <system/helpers.h>
#include <zapit/debug.h>
#include <cs_api.h>
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -697,29 +700,23 @@ void CVFD::ShowIcon(fp_icon icon, bool show)
perror(show ? "IOC_FP_SET_ICON" : "IOC_FP_CLEAR_ICON");
}
void CVFD::ShowText(const char *str)
void CVFD::ShowText(const char * str)
{
int len = strlen(str);
int i = 0, ret;
char flags[2] = { FP_FLAG_ALIGN_LEFT, 0 };
printf("CVFD::ShowText: [%s]\n", str);
if (len > 0)
{
for (i = len; i > 0; i--) {
if (str[i - 1] != ' ')
break;
}
}
if (g_settings.lcd_scroll)
flags[0] |= FP_FLAG_SCROLL_ON | FP_FLAG_SCROLL_SIO | FP_FLAG_SCROLL_DELAY;
if (((int)strlen(text) == i && !strncmp(str, text, i)) || len > 255)
std::string txt = std::string(flags) + str;
txt = trim(txt);
printf("CVFD::ShowText: [%s]\n", txt.c_str() + 1);
size_t len = txt.length();
if (txt == text || len > 255)
return;
strncpy(text, str, i);
text[i] = '\0';
//printf("****************************** CVFD::ShowText: %s\n", str);
//FIXME !!
ret = ioctl(fd, IOC_FP_SET_TEXT, len ? str : NULL);
text = txt;
int ret = ioctl(fd, IOC_FP_SET_TEXT, len > 1 ? txt.c_str() : NULL);
if(ret < 0)
perror("IOC_FP_SET_TEXT");
}