Stefan Seyfried
2089e8ff6b
fb_accel_td: implement setBlendMode/Level
...
Origin commit data
------------------
Commit: 67387a13c6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:49:14 +01:00
Stefan Seyfried
d9503201ca
sectionsdclient: remove unused scanMode variable
...
Origin commit data
------------------
Commit: 96f86f974e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:48:55 +01:00
Stefan Seyfried
ee9acfe1a4
remove unnecessary sectionsdclient.h includes
...
Origin commit data
------------------
Commit: c14c15ea24
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:48:35 +01:00
Stefan Seyfried
cdd1deb093
remove udpstreampes from build, it's unlikely to work anyway
...
Origin commit data
------------------
Commit: 2f36a0900c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:48:11 +01:00
vanhofen
e97d93f824
NI-code: Rename hardware defined macros for coolstream stb
...
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
2017-02-12 21:57:06 +01:00
vanhofen
5df8b0409e
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
configure.ac
data/fonts/Makefile.am
src/gui/cam_menu.cpp
src/gui/update.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
455e997886
configure.ac: bump revision to 3.4.2
...
Origin commit data
------------------
Commit: 73e710a917
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 17:29:30 +01:00
Michael Liebmann
0e6e6db7bd
pu/fb-modules: Rename hardware defined macros for coolstream stb
...
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
Origin commit data
------------------
Commit: 987dbe7f1d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
pu/fb-modules: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:24:51 +01:00
Michael Liebmann
3b018febe6
Merge branch 'master' into pu/fb-modules
...
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 09:24:08 +01:00
Michael Liebmann
7e9107c8a8
neutrino: Rename hardware defined macros for coolstream stb
...
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
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
Michael Liebmann
61ccbe74d9
configure: Rename hardware defined macros for coolstream stb
...
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
configure parameter: --with-boxmodel=hd1
--with-boxmodel=nevis is deprecated, but still valid
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
configure parameter: --with-boxmodel=hd2
--with-boxmodel=apollo is deprecated, but still valid
Origin commit data
------------------
Commit: bb2a848ae1
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
configure: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
configure parameter: --with-boxmodel=hd1
--with-boxmodel=nevis is deprecated, but still valid
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
configure parameter: --with-boxmodel=hd2
--with-boxmodel=apollo is deprecated, but still valid
2017-02-12 09:21:04 +01:00
Jacek Jendrzej
f5f669a803
src/driver/pictureviewer/pictureviewer.cpp Picviewer need double image bufferSize for avoid segfault
...
Origin commit data
------------------
Commit: e15f31fee4
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-11 21:08:25 +01:00
Michael Liebmann
14a8c0f7e9
Merge branch 'master' into pu/fb-modules
...
Origin commit data
------------------
Commit: 9fdbe0bc68
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-11 12:01:31 +01:00
vanhofen
8618764735
pluginlist: add default timeout to plugin-output ...
...
to avoid a blocked system. Without timeout all upcoming timers
will be ignored, if user doesn't confirm the plugin-output.
Origin commit data
------------------
Commit: 274b117f34
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-11 (Sat, 11 Feb 2017)
Origin message was:
------------------
- pluginlist: add default timeout to plugin-output ...
to avoid a blocked system. Without timeout all upcoming timers
will be ignored, if user doesn't confirm the plugin-output.
2017-02-11 11:15:09 +01:00
Michael Liebmann
ce1d73550c
Merge branch 'master' into pu/fb-modules
...
Origin commit data
------------------
Commit: 81bcddaad1
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-10 23:26:32 +01:00
Jacek Jendrzej
2f3330a736
src/driver/audiometadata.cpp init cover_temporary
...
Origin commit data
------------------
Commit: 582051b9a1
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-10 20:33:28 +01:00
Jacek Jendrzej
cd8728e2a7
src/driver/pictureviewer/pictureviewer.cpp check whether there is enough free memory for the image buffer
...
Origin commit data
------------------
Commit: 80f6e611ba
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-02-10 (Fri, 10 Feb 2017)
Origin message was:
------------------
src/driver/pictureviewer/pictureviewer.cpp check whether there is enough free memory for the image buffer
2017-02-10 20:33:15 +01:00
vanhofen
fff4d5c2fe
ni-menu: remove obsolete usage of screen_width/height
...
Origin commit data
------------------
Commit: ae408331eb
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-10 (Fri, 10 Feb 2017)
Origin message was:
------------------
- ni-menu: remove obsolete usage of screen_width/height
2017-02-10 00:23:57 +01:00
Michael Liebmann
c1dd0ff7de
Merge branch 'master' into pu/fb-modules
...
Origin commit data
------------------
Commit: db8ea57da2
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 22:58:09 +01:00
Thilo Graf
cef125aa09
Revert "CChannelList: delete with red yes button"
...
This reverts commit b7baafa2e5
.
User request: Is not desired
Origin commit data
------------------
Commit: a56bb97b50
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 22:43:00 +01:00
vanhofen
bc099cfd08
neutrino: fix build
...
Origin commit data
------------------
Commit: eef7c4c867
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
Origin message was:
------------------
- neutrino: fix build
2017-02-09 20:58:44 +01:00
vanhofen
4d15c4d61b
Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/neutrino.cpp
src/system/settings.h
Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 20:22:37 +01:00
vanhofen
e994f66c6f
avoid configuration mismatch in screen settings
...
Origin commit data
------------------
Commit: ad8e6180aa
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-13 (Fri, 13 Jan 2017)
Origin message was:
------------------
- avoid configuration mismatch in screen settings
2017-02-09 18:13:19 +01:00
vanhofen
252208b058
remove screen_width/height from neutrino.conf; ...
...
it's just for internal usage
Origin commit data
------------------
Commit: abb76c2efb
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-12 (Thu, 12 Jan 2017)
Origin message was:
------------------
- remove screen_width/height from neutrino.conf; ...
it's just for internal usage
2017-02-09 18:13:19 +01:00
vanhofen
54af49f2d0
rename screen_x/yres to font_scaling_x/y
...
Origin commit data
------------------
Commit: aeec37af89
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-12 (Thu, 12 Jan 2017)
Origin message was:
------------------
- rename screen_x/yres to font_scaling_x/y
2017-02-09 18:13:19 +01:00
Thilo Graf
829d045a99
CMenuWidget: remove dub code from init
...
Origin commit data
------------------
Commit: 0435ca20a3
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 16:35:03 +01:00
Thilo Graf
a3f59e7c4a
CMenuWidget: use only nameString as container for widget name
...
neutrino_locale_t name could be transformed always to real string to
unify this container
Origin commit data
------------------
Commit: 2dda93ed2b
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 15:52:39 +01:00
Michael Liebmann
e554281e64
CFbAccelCSHD1::~CFbAccelCSHD1: Remove unnecessary entries...
...
...that are processed in the CFrameBuffer destructor
Origin commit data
------------------
Commit: 0b7bb32813
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
03f996a8b8
fontrenderer: add hack to work around broken fullBG code
...
Origin commit data
------------------
Commit: dec601a9dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
7a63618598
fb_generic: remove unused VT switching / restoring code
...
Origin commit data
------------------
Commit: d498917594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
792a14b2f0
fb_accel: add TripleDragon framebuffer code
...
Origin commit data
------------------
Commit: b04b1d7f8c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
79931d6c88
fb_generic: open device O_CLOEXEC, better diagnostic output
...
Origin commit data
------------------
Commit: 8441a719cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
937b418f74
fb_generic: make paintLine virtual
...
Origin commit data
------------------
Commit: 1500716fcf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:17 +01:00
vanhofen
b6b6eb26bc
Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 44732516d3
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 12:45:17 +01:00
vanhofen
5a426655eb
mod_yparser.cpp: add missing defines to define-get function
...
Origin commit data
------------------
Commit: 77b1477b4c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
Origin message was:
------------------
- mod_yparser.cpp: add missing defines to define-get function
2017-02-09 09:13:55 +01:00
vanhofen
85046c3249
acinclude.m4: align to tuxbox code
...
Origin commit data
------------------
Commit: 96bc77775e
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
Origin message was:
------------------
- acinclude.m4: align to tuxbox code
2017-02-09 09:13:19 +01:00
Michael Liebmann
922fc5b74f
Merge branch 'master' into pu/fb-modules
...
Origin commit data
------------------
Commit: 6890e003ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 08:46:47 +01:00
vanhofen
49762424a6
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 08:35:14 +01:00
GetAway
340dbe3324
change to CURLOPT_CONNECTTIMEOUT_MS and ...
...
use a connect_timeout of 300ms for remote timer
Origin commit data
------------------
Commit: c1f788ac42
Author: GetAway <get-away@t-online.de >
Date: 2017-02-07 (Tue, 07 Feb 2017)
2017-02-09 08:33:48 +01:00
vanhofen
8f0d3e0a5f
helpbox: fix display of text after scroll; thx to DboxOldie
...
Origin commit data
------------------
Commit: 4b55d2597f
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
Origin message was:
------------------
- helpbox: fix display of text after scroll; thx to DboxOldie
2017-02-09 08:29:07 +01:00
GetAway
21345ecf59
make the webtv directory configurable
...
Origin commit data
------------------
Commit: a62d5b7c8e
Author: GetAway <get-away@t-online.de >
Date: 2017-02-07 (Tue, 07 Feb 2017)
2017-02-09 08:22:43 +01:00
vanhofen
f7b4d9e941
Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/driver/fb_accel_cs_hd1.cpp
src/driver/fb_accel_cs_hd2.cpp
Origin commit data
------------------
Commit: 1e5b102802
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:38:28 +01:00
vanhofen
53a4a8dd85
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 728959949b
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:35:37 +01:00
Michael Liebmann
534d1b315e
Merge branch 'master' into pu/fb-modules
...
Origin commit data
------------------
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:16:41 +01:00
Thilo Graf
44a70f0b23
fb_accel_cs_hdx_inc.h: remove unused includes
...
Origin commit data
------------------
Commit: 9ddb4fc9c3
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:16:07 +01:00
Thilo Graf
8296507bf5
fb_accel_cs_hdx: remove dub includes, add includes into common header file
...
Origin commit data
------------------
Commit: 8fe7504007
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:16:07 +01:00
Michael Liebmann
c6c4f88a06
fb_accel: Some renaming nevis => hd1 & apollo => hd2
...
Origin commit data
------------------
Commit: f94afc1593
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 13:32:46 +01:00
Michael Liebmann
adbb76744c
fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2
...
Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp
Origin commit data
------------------
Commit: a4afe1e8e0
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-08 (Wed, 08 Feb 2017)
Origin message was:
------------------
fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2
Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp
2017-02-08 12:52:26 +01:00
Michael Liebmann
af6d3fb79a
fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1
...
Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp
Origin commit data
------------------
Commit: 58bd8a4a63
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-08 (Wed, 08 Feb 2017)
Origin message was:
------------------
fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1
Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp
2017-02-08 12:52:25 +01:00
vanhofen
b2210d8a75
fix build; try to port our framebuffer changes (need fixes!)
...
Origin commit data
------------------
Commit: fa727d1bff
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
Origin message was:
------------------
- fix build; try to port our framebuffer changes (need fixes!)
2017-02-08 09:45:53 +01:00