Jacek Jendrzej
a5bc9f1050
Merge branch 'master' into pu/mp
2017-09-13 14:09:21 +02:00
Jacek Jendrzej
a7813a885d
fix pick diff error
2017-09-13 14:08:29 +02:00
Jacek Jendrzej
4e232439c3
Merge branch 'master' into pu/mp
2017-09-13 13:52:49 +02:00
vanhofen
1fae4130b8
- remove unused nkplay stuff
2017-09-13 13:48:16 +02:00
Jacek Jendrzej
2c5bf73006
Merge branch 'master' into pu/mp
2017-09-13 13:40:40 +02:00
vanhofen
816de89898
- drop easymenu
2017-09-13 13:35:23 +02:00
Jacek Jendrzej
6576729fd1
remove double includes
2017-09-08 21:21:32 +02:00
Jacek Jendrzej
8c45b2eea6
Merge branch 'master' into pu/mp
2017-08-21 13:13:03 +02:00
vanhofen
c307ed5b36
- hw_caps: remove CFEManager-code; ...
...
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start
2017-08-21 12:56:00 +02:00
Jacek Jendrzej
8c8ae9595c
Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
...
This reverts commit edb0a5937e
2017-08-21 12:53:05 +02:00
Jacek Jendrzej
0238049daf
part from 382181e289ac990fa1bc69ec528b8c25be6c6537
2017-08-21 10:57:18 +02:00
Jacek Jendrzej
491e51beeb
Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
...
This reverts commit edb0a5937e
2017-08-21 10:03:52 +02:00
Jacek Jendrzej
1763bb9e64
Merge branch 'master' into pu/mp
2017-08-08 20:06:40 +02:00
GetAway
95b535016f
neutrino.cpp: repaint of background in radio mode, when close UPNP-Browser
2017-08-07 07:52:32 +02:00
Jacek Jendrzej
72a9fa40db
Merge branch 'master' into pu/mp
2017-07-05 21:43:36 +02:00
TangoCash
57f46e1f2b
no shutdown if streaming (thx dbo)
...
prevent shutdown from timer if stb is started from deep standby > does a
timer-record > and meanwhile streaming (eg. localTV or via web-if to PC)
is active
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-07-05 10:41:27 +02:00
svenhoefer
761a2b2e73
- epgscan: allow to set rescan period to catch a bug in epgscan
...
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-07-04 12:22:53 +02:00
Jacek Jendrzej
4c3002cb26
Merge branch 'master' into pu/mp
2017-06-15 12:32:31 +02:00
Thilo Graf
78f1b294a9
CNeutrinoApp: add hook for neutrino start
...
Script will be executed on start of neutrino before. Handling is similar
like all other possible hooks, see global.h.
2017-06-15 09:07:02 +02:00
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
