svenhoefer
b1ba85c8c1
Merge branch 'master' into pu/mp
...
Conflicts:
acinclude.m4
2017-03-22 12:16:01 +01:00
svenhoefer
d2f02371e8
- neutrino: grab whole ExitRun() from neutrino-mp ...
...
This fixes my last merge commit, small typos and alignes indentation.
2017-03-21 10:29:35 +01:00
Jacek Jendrzej
8516b1662d
fix segfault aufter unbreak msgbox f9b7fca210
2017-03-20 17:40:26 +01:00
svenhoefer
b12624d1fa
Merge branch 'master' into pu/mp
...
Conflicts:
src/gui/miscsettings_menu.cpp
src/neutrino.cpp
src/system/settings.h
2017-03-20 01:31:51 +01:00
svenhoefer
b8a97a97ca
- neutrino: just code cosmetics in ExitRun()
2017-03-19 23:50:52 +01:00
svenhoefer
ec6e863e6f
- neutrino: remove unused write_si from ExitRun() function ...
...
and rename retcode to can_shutdown for a better readability
2017-03-19 23:50:52 +01:00
svenhoefer
de1ee8b73a
- use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp
2017-03-19 23:50:52 +01:00
svenhoefer
4f202b19d6
- use g_info.hw_caps->has_fan; remove old g_info.has_fan
2017-03-19 01:04:48 +01:00
TangoCash
81fb3b42fa
Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp
...
Conflicts:
src/gui/scan_setup.cpp
src/zapit/src/frontend.cpp
2017-03-15 22:47:42 +01:00
Jacek Jendrzej
f18ec050c7
src/neutrino.cpp fix possible memleak
2017-03-15 15:56:23 +01:00
svenhoefer
8bdb16cec6
Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
...
Conflicts:
src/neutrino.cpp
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
2017-03-13 16:14:33 +01:00
M. Liebmann
87b7260c48
Add src/compatibility.h to include software-dependency macros
2017-03-08 12:35:20 +01:00
M. Liebmann
b58aa9ad6f
Fix malloc_stats() call for newer uClibc-ng versions
2017-03-08 00:34:48 +01:00
svenhoefer
29fd05002f
- port hardware_caps from Neutrino-MP
2017-03-06 21:49:32 +01:00
Stefan Seyfried
abec1c311b
Merge remote-tracking branch 'tuxbox/master'
2017-03-04 19:32:30 +01:00
M. Liebmann
9fe20399c4
CNeutrinoApp::loadSetup: Fix Segfault when an remote timer is defined
2017-03-02 23:37:41 +01:00
Jacek Jendrzej
d12ea80c5b
src/neutrino.cpp init struct timer_remotebox_item, avoid segfault without InfoClock
2017-03-01 15:04:10 +01:00
svenhoefer
856c676430
- rename g_PluginList to g_Plugins; this isn't a list of plugins
2017-03-01 13:03:50 +01:00
M. Liebmann
0953e66d22
neutrino: No terminate moviebrowser, menue, etc. when recording start
2017-02-24 18:54:53 +01:00
Stefan Seyfried
d2408d1ade
rcinput/neutrino: avoid the use of EVT_TIMESET
...
sectionsd's EVT_TIMESET was only used to fix time calculations
for input repeat detection. I doubt this reliably worked anyway.
Just calculate an absolute input timestamp from CLOCK_MONOTONIC
and use that. Even better solution would be to use a newer
kernel with EVIOCSCLOCKID ioctl, leave that for later :-)
2017-02-24 15:53:44 +01:00
svenhoefer
c4aaf7678c
- neutrino.cpp: fix compiler warning; ...
...
msg and data is type long unsigned int, so %lu seems the right format,
but above %lX is used too and it works fine. So, what's the right one?
2017-02-23 12:17:30 +01:00
Stefan Seyfried
5c95139207
Merge remote-tracking branch 'tuxbox/master'
2017-02-22 08:44:53 +01:00
Stefan Seyfried
f45456d7a8
rcinput: remove unused/unimplemented click functions
2017-02-22 06:24:48 +01:00
M. Liebmann
e35969afe2
Fix compiler format warnings
2017-02-22 06:24:48 +01:00
Stefan Seyfried
418819e261
libtuxtxt: remove unused fd parameter from tuxtx_main()
2017-02-21 06:38:48 +01:00
Stefan Seyfried
9b8524b37b
rcinput: remove unused/unimplemented click functions
2017-02-20 20:36:45 +01:00
Stefan Seyfried
eb3fa7f2af
libtuxtxt: remove unused fd parameter from tuxtx_main()
2017-02-19 11:52:37 +01:00
Stefan Seyfried
7384e2155e
neutrino: move start of standby epgscan forward
...
this avoids that cpufreq is set to standby value before epgscan is
started, resulting in poor performance
2017-02-12 22:57:52 +01:00
Stefan Seyfried
2819e651c3
Merge remote-tracking branch 'tuxbox/pu/fb-modules'
...
only compile tested ;-)
2017-02-12 21:29:10 +01:00
Stefan Seyfried
4f23baae1e
neutrino: move start of standby epgscan forward
...
this avoids that cpufreq is set to standby value before epgscan is
started, resulting in poor performance
2017-02-12 15:19:51 +01:00
M. Liebmann
0cb26e6e98
Merge branch 'master' into pu/fb-modules
2017-02-12 09:24:08 +01:00
M. Liebmann
0d66899cbd
neutrino: Rename hardware defined macros for coolstream stb
...
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:21:04 +01:00
Stefan Seyfried
8b47699447
Merge remote-tracking branch 'tuxbox/master'
2017-02-11 11:18:45 +01:00
svenhoefer
ad8e6180aa
- avoid configuration mismatch in screen settings
2017-02-09 18:13:19 +01:00
svenhoefer
abb76c2efb
- remove screen_width/height from neutrino.conf; ...
...
it's just for internal usage
2017-02-09 18:13:19 +01:00
svenhoefer
aeec37af89
- rename screen_x/yres to font_scaling_x/y
2017-02-09 18:13:19 +01:00
GetAway
a62d5b7c8e
make the webtv directory configurable
2017-02-09 08:22:43 +01:00
Stefan Seyfried
7504fe264e
neutrino: initialize api before setting up framebuffer
2017-02-05 22:55:00 +01:00
Stefan Seyfried
6525d1164a
add --enable-fastscan configure option
...
The #define in src/gui/scan_setup.h did not work (undefining
ENABLE_FASTSCAN caused really strange side effects wrt background
scanning in standby mode), and all the unused code was still built.
With this configure option, people who really want this obscure feature
can enable it for their builds.
2017-02-04 12:09:47 +01:00
Stefan Seyfried
7497722646
Merge remote-tracking branch 'tuxbox/master'
2017-02-01 22:03:40 +01:00
M. Liebmann
6803a8dff3
Remove obsolete 'contrast_fonts' code from osd menu
2017-01-31 16:36:40 +01:00
Stefan Seyfried
48ff7b36a2
Merge remote-tracking branch 'tuxbox/master'
2017-01-30 21:36:09 +01:00
M. Liebmann
dc4ce280ed
CMoviePlayerGui: Bind enable/disable FileTime to enableInfoClock()
2017-01-30 07:15:46 +01:00
GetAway
17b8e684e0
- neutrino: fix umount of netfs-drives in ExitRun() function
2017-01-29 21:27:45 +01:00
Stefan Seyfried
a409047714
Merge remote-tracking branch 'tuxbox/master'
2017-01-22 22:59:39 +01:00
Thilo Graf
5014a272e5
CNeutrinoApp: try to fix display intro settings message
...
Message was not really visible on startup. Contents of InitZapper()
seems to have prevented this.
2017-01-05 22:19:05 +01:00
Jacek Jendrzej
0ed24632b7
some dead assignment
2016-12-29 18:41:25 +01:00
svenhoefer
888bfb6687
- themes: allow progressbar-settings in themes
2016-12-29 00:47:34 +01:00
Thilo Graf
c5f1a03a31
CNeutrinoApp: simplify shutdown message handling
...
Usage of only one cancel button is more plausible.
'cancel' means cancel this action. And not more!
2016-12-14 22:50:37 +01:00
Thilo Graf
8eae5c5d09
CNeutrinoApp: use default timeout from settings
2016-12-12 21:37:17 +01:00