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

Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'

Browse Source 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
This commit is contained in:
Stefan Seyfried
2012-10-14 12:51:07 +02:00
parent 41d55e7c91 890b4f2c0a
commit 345a8a274d
442 changed files with 7648 additions and 4167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -17,9 +17,10 @@
#include "teletext.h"
#include "tuxtxt.h"
#include "driver/framebuffer.h"
#include <driver/framebuffer.h>
#include <dmx.h>
#include <video.h>
#include <sys/stat.h>
/* same as in rcinput.h... */
#define KEY_TTTV KEY_FN_1
@@ -104,7 +105,7 @@ void gethotlist()
hotlistchanged = 0;
maxhotlist = -1;
sprintf(line, CONFIGDIR "/tuxtxt/hotlist%d.conf", tuxtxt_cache.vtxtpid);
sprintf(line, TUXTXTDIR "/hotlist%d.conf", tuxtxt_cache.vtxtpid);
#if TUXTXT_DEBUG
printf("TuxTxt <gethotlist %s", line);
#endif
@@ -150,7 +151,7 @@ void savehotlist()
int i;
hotlistchanged = 0;
sprintf(line, CONFIGDIR "/tuxtxt/hotlist%d.conf", tuxtxt_cache.vtxtpid);
sprintf(line, TUXTXTDIR "/hotlist%d.conf", tuxtxt_cache.vtxtpid);
#if TUXTXT_DEBUG
printf("TuxTxt <savehotlist %s", line);
#endif
@@ -261,14 +262,15 @@ void ClearFB(int /*color*/)
//memset(lfb,0, var_screeninfo.yres*fix_screeninfo.line_length);
CFrameBuffer::getInstance()->paintBackground();
}
#if 0
//never used
void ClearB(int color)
{
FillRect(0, 0, var_screeninfo.xres, var_screeninfo.yres, color); /* framebuffer */
FillRect(0, var_screeninfo.yres, var_screeninfo.xres, var_screeninfo.yres, color); /* backbuffer */
CFrameBuffer::getInstance()->blit();
}
#endif
int GetCurFontWidth()
{
int mx = (displaywidth)%(40-nofirst); // # of unused pixels
@@ -1956,6 +1958,10 @@ int Init(int source)
/* init lcd */
UpdateLCD();
/* create TUXTXTDIR if necessary */
if (!access(TUXTXTDIR, F_OK) == 0)
mkdir(TUXTXTDIR, 0755);
/* config defaults */
screenmode = 0;
screen_mode1 = 0;