Jacek Jendrzej
ca83324763
Merge branch 'master' into pu/mp
2017-06-07 16:20:47 +02:00
M. Liebmann
624f2b3154
Merge branch 'pu/fb-setmode'
2017-06-07 14:18:01 +02:00
Thilo Graf
141d198b29
Followscreenings: add enumeration for a better readability
2017-06-07 14:17:12 +02:00
svenhoefer
64f35bd2ef
- filebrowser: use "dirs first" sort method by default
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-06-07 14:17:11 +02:00
Jacek Jendrzej
fb23ac0126
Merge branch 'master' into pu/mp
...
except c08144a9d9edb0a5937e
2017-05-10 15:37:31 +02:00
Thilo Graf
60fed9cc02
Merge branch 'master' into pu/fb-setmode
2017-05-10 10:45:28 +02:00
svenhoefer
c08144a9d9
- clearify comment
2017-05-09 13:31:59 +02:00
svenhoefer
edb0a5937e
- neutrino: fix hw_caps init; it must be initialized after zapit start
2017-05-08 23:44:45 +02:00
M. Liebmann
b612c1f620
Fix videosystem auto mode
2017-03-28 23:56:57 +02:00
M. Liebmann
515ab1fe59
CFbAccelCSHD2::setMode: Fix if ENABLE_CHANGE_OSD_RESOLUTION is not defined
2017-03-23 21:32:48 +01:00
M. Liebmann
ea18657562
src/neutrino.cpp: Simplification EVT_AUTO_SET_VIDEOSYSTEM handling
2017-03-23 21:32:48 +01:00
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
M. Liebmann
8212746cf1
Merge branch 'master' into pu/fb-setmode
2017-03-20 23:11:33 +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
M. Liebmann
be49686432
Merge branch 'master' into pu/fb-setmode
2017-03-20 00:00:35 +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
M. Liebmann
2ca9d9c4f9
Merge branch 'master' into pu/fb-setmode
2017-03-19 08:38:15 +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
M. Liebmann
b190e0c4ff
Merge branch 'master' into pu/fb-setmode
2017-03-15 21:19:08 +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
5ce34d5cf9
Revert "- allow to force given osd resolution in "videosystem = auto" mode"
...
This reverts commit 6fc24e990b
2017-03-12 06:32:52 +01:00
M. Liebmann
6a531d4304
Merge branch 'master' into pu/fb-setmode
2017-03-08 12:35:39 +01:00
M. Liebmann
87b7260c48
Add src/compatibility.h to include software-dependency macros
2017-03-08 12:35:20 +01:00
M. Liebmann
7ad59776d1
Merge branch 'master' into pu/fb-setmode
2017-03-08 00:35:16 +01:00
M. Liebmann
b58aa9ad6f
Fix malloc_stats() call for newer uClibc-ng versions
2017-03-08 00:34:48 +01:00
svenhoefer
6fc24e990b
- allow to force given osd resolution in "videosystem = auto" mode
2017-03-06 23:50:15 +01:00
M. Liebmann
bab10ee438
Merge branch 'master' into pu/fb-setmode
2017-03-06 22:06:38 +01:00
svenhoefer
29fd05002f
- port hardware_caps from Neutrino-MP
2017-03-06 21:49:32 +01:00
M. Liebmann
b1dcce0ad3
COsdHelpers: Remove no longer required function resetOsdResolution()
2017-03-05 19:54:09 +01:00
M. Liebmann
fa08347ef4
COsdHelpers: Add function setVideoSystem()
2017-03-05 19:54:09 +01:00
Stefan Seyfried
abec1c311b
Merge remote-tracking branch 'tuxbox/master'
2017-03-04 19:32:30 +01:00
M. Liebmann
6c3b5dcd93
Merge branch 'master' into pu/fb-setmode
2017-03-02 23:38:19 +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
ff11dd44ab
osd resolution: Use COsdHelpers::changeOsdResolution() to adjust...
...
...OSD resolution after switching video format
2017-02-28 15:04:09 +01:00
M. Liebmann
2174dde26b
Merge branch 'master' into pu/fb-setmode
2017-02-24 18:55:15 +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
M. Liebmann
1dccb68ad1
Merge branch 'master' into pu/fb-setmode
2017-02-23 15:14:54 +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
M. Liebmann
9209326a1b
Merge branch 'master' into pu/fb-setmode
2017-02-22 06:25:45 +01:00
Stefan Seyfried
f45456d7a8
rcinput: remove unused/unimplemented click functions
2017-02-22 06:24:48 +01:00
