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

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

Browse Source 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-05-24 20:24:39 +02:00
parent 95813ab60e 00dd399ff9
commit a7f1e0e25e
50 changed files with 1106 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -738,6 +738,7 @@ static const struct key keynames[] = {
{"KEY_NEXT", KEY_NEXT},
{"KEY_PREVIOUS", KEY_PREVIOUS},
{"KEY_TIME", KEY_TIME},
{"KEY_SLEEP", KEY_SLEEP},
{"KEY_AUDIO", KEY_AUDIO},
{"KEY_REWIND", KEY_REWIND},
{"KEY_FORWARD", KEY_FORWARD},

1
src/nhttpd/web/Y_Blocks.txt
View File

@@ -595,6 +595,7 @@ start-block~remote_zee
<area shape="rect" href="javascript:rcsim('KEY_NEXT')" coords="277, 78, 299, 100" />
<area shape="rect" href="javascript:rcsim('KEY_PREVIOUS')" coords="244, 78, 265, 100" />
<area shape="rect" href="javascript:rcsim('KEY_TIME')" coords="311, 582, 333, 604" />
<area shape="rect" href="javascript:rcsim('KEY_SLEEP')" coords="244, 114, 265, 137" />
<area shape="rect" href="javascript:rcsim('KEY_AUDIO')" coords="277, 114, 300, 137" />
<area shape="rect" href="javascript:rcsim('KEY_REWIND')" coords="216, 552, 236, 574" />
<area shape="rect" href="javascript:rcsim('KEY_FORWARD')" coords="279, 552, 300, 574" />