M. Liebmann
bfcf4057d5
src/gui/videosettings.cpp: Replace BOXMODEL_APOLLO by BOXMODEL_CS_HD2
2017-03-14 00:13:35 +01:00
M. Liebmann
03c5d11572
src/gui/widget/buttons.cpp: Use system/stacktrace.h ...
...
... instead of driver/stacktrace
2017-03-14 00:13:35 +01:00
M. Liebmann
8340534ee4
src/system/stacktrace.cpp: Use dummy function for print_stacktrace()...
...
... and install_crash_handler() if HAVE_BACKTRACE is not defined
2017-03-14 00:13:35 +01:00
svenhoefer
60d3cfb962
- neutrinoyparser: stay compatible with present code in Y_Blocks.txt
2017-03-13 23:48:08 +01:00
M. Liebmann
2677543cc4
Merge branch 'master' into pu/fb-setmode
2017-03-13 21:55:50 +01:00
Jacek Jendrzej
76530e2c05
try fix segfault with --enable-cleanup
2017-03-13 19:13:37 +01:00
Jacek Jendrzej
32a0fb6de4
fix PC compil
2017-03-13 19:06:33 +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
svenhoefer
5b0faeab8c
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
M. Liebmann
d0b02a9752
CMenuWidget::calcSize: Add forgotten 'wi'
2017-03-13 10:34:37 +01:00
M. Liebmann
fa2fd94f77
Merge branch 'master' into pu/fb-setmode
2017-03-13 09:56:04 +01:00
M. Liebmann
2ed30486c4
CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes
2017-03-13 09:55:58 +01:00
M. Liebmann
30db40da1a
CMenuWidget::calcSize: Recalculation of min_width ...
...
... for adjustment to the osd resolution
2017-03-13 09:55:58 +01:00
Thilo Graf
3fa097ebb9
cc_types.h: expand button_label_cc with hint as descrpition for button
2017-03-13 09:45:38 +01:00
Thilo Graf
e777ecdfdb
cc_types: move struct button_label_cc into cc_types.h
2017-03-13 09:45:38 +01:00
Thilo Graf
e2ca965ee9
CComponentsFooter: add bg_image to button_label_cc type
2017-03-13 09:45:38 +01:00
M. Liebmann
828329452e
Merge branch 'master' into pu/fb-setmode
2017-03-12 06:37:10 +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
Thilo Graf
c766a970dc
CComponentsFooter: simplify implementation of button labels
...
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.
2017-03-11 00:45:25 +01:00
Thilo Graf
ccb82083e2
CCDraw: add possibility to use background images as item background
...
Provides functionality to use a backround image instead to render
usual box. If an image is defined, box render is disabled, but behavior
for hide, kill, cache... is not changed.
TODO:
- maybe needs global caching because images are not yet managed like icons in framebuffer class
2017-03-11 00:45:25 +01:00
Stefan Seyfried
c857fc49be
bouquetlist: don't block RC keys while list is opened
2017-03-10 19:10:19 +01:00
Stefan Seyfried
2cef61bd8e
msgbox: deobfuscate assignment of default result value
2017-03-10 19:10:06 +01:00
M. Liebmann
87cb1b514a
Merge branch 'master' into pu/fb-setmode
2017-03-10 15:38:15 +01:00
svenhoefer
0203de264f
- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
2017-03-10 15:36:13 +01:00
svenhoefer
305b1a6da5
- neutrinoyparser: use hw_caps in func_get_boxtype() ...
...
... and func_get_boxmodel()
2017-03-10 15:07:52 +01:00
svenhoefer
b902648b08
- controlapi: use hw_caps in HWInfoCGI()
2017-03-10 15:07:52 +01:00
svenhoefer
e092059f32
- controlapi: /control/info => return right name
2017-03-10 15:07: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
Stefan Seyfried
40adaa6515
bouquetlist: don't block RC keys while list is opened
2017-03-07 19:55:25 +01:00
Stefan Seyfried
17f5a63d63
msgbox: deobfuscate assignment of default result value
2017-03-07 19:46:30 +01:00
Stefan Seyfried
6f1cfd42bb
Merge remote-tracking branch 'tuxbox/master'
2017-03-07 19:43:06 +01:00
Jacek Jendrzej
bfa589eb08
make neutrino compatible with new ffmpeg
2017-03-07 15:00:17 +01:00
svenhoefer
6fc24e990b
- allow to force given osd resolution in "videosystem = auto" mode
2017-03-06 23:50:15 +01:00
M. Liebmann
1bb9fc6687
Fix osd mode switch 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
Thilo Graf
8c6a47ee3a
CMovieBrowser/cYTFeedParser: implement signals from CProgressSignals
2017-03-06 21:26:26 +01:00
Thilo Graf
7f511ebd1a
CProgressWindow/CProgressSignals: add prepared signals
...
Required for inhertance of signals used with CProgressWindow.
2017-03-06 21:26:26 +01:00
Thilo Graf
26a0f31923
CMovieBrowser: remove wrong progress value
2017-03-06 21:26:26 +01:00
Thilo Graf
4c388bb71c
CTextBox: fix pass of SCROLL_FRAME_WIDTH
2017-03-06 21:11:08 +01:00
Jacek Jendrzej
92abe90d58
src/gui/movieplayer.cpp some streams need more time pro frame
2017-03-06 14:41:25 +01:00
M. Liebmann
77f74c5966
Merge branch 'master' into pu/fb-setmode
2017-03-05 19:54:19 +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
M. Liebmann
53460e54da
CFbAccelCSHD2::setMode: Fix value for screeninfo.yres_virtual
2017-03-05 19:54:09 +01:00
Stefan Seyfried
f80f69c232
msgbox: remove explicit handling of record events
...
these are handled in the last else clause anyway
2017-03-05 19:53:34 +01:00
Stefan Seyfried
c3ab1b91d8
msgbox: remove duplicated code
2017-03-05 19:53:34 +01:00
