Commit Graph

10610 Commits

Author SHA1 Message Date
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 13:40:40 +02:00
vanhofen
6310efb007 remove unused nkplay stuff
Origin commit data
------------------
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
2017-09-13 13:35:23 +02:00
vanhofen
9db42a7d2b drop easymenu
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-13 13:35:23 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
2017-09-08 21:21:32 +02:00
Jacek Jendrzej
5d1ed28722 pic max10<max_10@gmx.de> code from commit f480ad018c72d40a9d2d2fb4006cfca1c262234d
Origin commit data
------------------
Commit: 2d4f52ae62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
2017-08-29 16:35:32 +02:00
Jacek Jendrzej
d418a549da Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4700523643
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
2017-08-29 16:33:21 +02:00
Jacek Jendrzej
651099e559 remove my stupid init
Origin commit data
------------------
Commit: c5dc1b7770
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
2017-08-29 15:01:31 +02:00
Jacek Jendrzej
a23840bc0c Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 23797d29c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
2017-08-29 11:26:54 +02:00
Thilo Graf
d8caaaf758 CTimerList: adjust label width in footer dependent by count of buttons
Origin commit data
------------------
Commit: 3987c3a306
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
f36f3d25e6 CTimerList: paint header only if required
Avoid possible flicker effects.

TODO: fix clock background with enabled gradient on header repaint.


Origin commit data
------------------
Commit: 4dd12767f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
ab4bcc584a comments: fix copy paste errors
Origin commit data
------------------
Commit: 6e310a8157
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
b490817d1b cc_item_shapes.cpp/h: Add method to create draw boxes without explicit objects
Origin commit data
------------------
Commit: c743cb632b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
6112dbafcb Helpbox: add missing check for null pointer
Origin commit data
------------------
Commit: b5d33f10e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
7991e183c5 CComponentsHeader: add missing check for null pointer
Origin commit data
------------------
Commit: 5221769840
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
6b4e74972b CProgressBarCache: remove benchmark lines
Was only for debugging.


Origin commit data
------------------
Commit: d42389b167
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
4f19bd2aba CComponentsPicture: remove benchmark lines
Was only for debugging.


Origin commit data
------------------
Commit: f07a27825d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
4b4e48ecf3 CComponentsFooter: fix possible error with non-POD element type
affected is struct type 'button_label_cc'


Origin commit data
------------------
Commit: 16dac64ed2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
2e4b222438 CComponentsFooter: fix possible conversion warning
For platform compatibility. eg. with neutrino-pc on it is possible
that size_t is long unsigned ini, for others unsinged int


Origin commit data
------------------
Commit: 27995b19fa
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
fbb0fc68b0 cc_frm.cpp, cc_frm_button.cpp: remove unread stored variables
Origin commit data
------------------
Commit: fe6a24351b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
4e5f95d391 CComponentsFrmClock: fix wrong initialization of w_tmp
Origin commit data
------------------
Commit: 758081a0ac
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Jacek Jendrzej
c066cf6bf2 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 13:10:49 +02:00
Jacek Jendrzej
142d17c8b0 fix possible out of bound memory access
Origin commit data
------------------
Commit: 350a73ce08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 13:05:57 +02:00
Jacek Jendrzej
1e1d5ed137 null pointer check
Origin commit data
------------------
Commit: 527c0de33a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 13:03:34 +02:00
Jacek Jendrzej
d1c3f8a157 fxi possible buffer overflow
Origin commit data
------------------
Commit: e58e72635b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 13:00:24 +02:00
Jacek Jendrzej
96edd2f2c1 some inits and never read var
Origin commit data
------------------
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 12:58:26 +02:00
Jacek Jendrzej
973b9ebe54 some inits warnings
Origin commit data
------------------
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
2017-08-21 14:42:24 +02:00
Jacek Jendrzej
a887d8b2e9 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
2017-08-21 13:13:03 +02:00
vanhofen
cce5365b59 hw_caps: remove CFEManager-code; ...
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Commit: c307ed5b36
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- 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
d5966753c1 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 2d4130dab8.


Origin commit data
------------------
Commit: 8c8ae9595c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
2017-08-21 12:53:05 +02:00
Jacek Jendrzej
f9a565da5d part from c2095e1759
Origin commit data
------------------
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
2017-08-21 10:57:18 +02:00
Stefan Seyfried
32b8b3b54f Revert "- hardware_caps: fix has_fan and add detection of Neo Twin"
This reverts commit ee911957d4.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Commit: e2db590797
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-21 10:17:05 +02:00
Stefan Seyfried
a339396ace rcinput: add two more keys in the ugly azbox translate() table
Origin commit data
------------------
Commit: d0a21abd9f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-21 10:17:05 +02:00
Stefan Seyfried
10138d6c5c zapit: trivial azbox compile fix
Origin commit data
------------------
Commit: fd4a3516e5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-21 10:17:05 +02:00
Stefan Seyfried
c21993da74 rcinput: fix getKeyName for RC_none case
Origin commit data
------------------
Commit: 4978ed7675
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-21 10:17:05 +02:00
Stefan Seyfried
cfaaa7a48b CKeyChooserItemNoKey: fix type cast
Origin commit data
------------------
Commit: a1a5965017
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-21 10:17:05 +02:00
Stefan Seyfried
0a436947bc fb_accel_sti: reorder blit_mutex locking
This seems to help spurious deadlocks in the STI framebuffer blit code.
Not 100% sure why, butthis helps, but I have not seen lockups with this.


Origin commit data
------------------
Commit: 223d1d709f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-19 (Sat, 19 Aug 2017)
2017-08-21 10:17:05 +02:00
Stefan Seyfried
aa617fd70a coolstream: disable uncoolinit build
it does not build right now for undefined fb_pixel_t, and it is unused
anyway after a workaround in zapit code has been introduced


Origin commit data
------------------
Commit: ee031801e4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)
2017-08-21 10:17:05 +02:00
Jacek Jendrzej
da5998afc1 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 2d4130dab8.


Origin commit data
------------------
Commit: 491e51beeb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
2017-08-21 10:03:52 +02:00
Jacek Jendrzej
6824f87be8 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)
2017-08-14 16:26:49 +02:00
vanhofen
5ce4d5eb25 upnpbrowser: fix mode_ts for videos; was switched back to mode_upnp by stopAudio()
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6659dbb6f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)

Origin message was:
------------------
- upnpbrowser: fix mode_ts for videos; was switched back to mode_upnp by stopAudio()

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-08-12 14:05:23 +02:00
vanhofen
d36efaeac5 Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit 552e7c8777.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 944ad7cb63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 14:05:17 +02:00
Thilo Graf
bb3910fc95 Revert "infoviewer.cpp: handle timeout of mode upnp like mode ts"
This reverts commit 673305f913.


Origin commit data
------------------
Commit: 40fee47523
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 11:27:55 +02:00
Jacek Jendrzej
ee0fb81ab4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 61f1c51d50
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 10:02:55 +02:00
Thilo Graf
630c1bb880 CComponentsScrollBar: try to fix handling with very much segment count
In some cases, eg. with very much pages in channellist, the effort
to handle with all count of scrollbar segments was too much. Result: long
waiting times during page scrolling and slider was not visible. This
should be fixed now.


Origin commit data
------------------
Commit: 71f5779a40
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)
2017-08-11 22:35:07 +02:00
GetAway
673305f913 infoviewer.cpp: handle timeout of mode upnp like mode ts
Signed-off-by: Thilo Graf <dbt@novatux.de>

Infobar timeout in the upnp mode is fixed to 6 sec.
Because it's acting about streams, so we should use the same timeout
such as with playing a movie file.


Origin commit data
------------------
Commit: 0225b043db
Author: GetAway <get-away@t-online.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)
2017-08-11 20:14:49 +02:00
Thilo Graf
f23adc7007 CComponentsScrollBar: use matching type names
Origin commit data
------------------
Commit: b863f874b0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 21:36:26 +02:00
Thilo Graf
f0bf4342a2 CComponentsScrollBar: fix possible build error with -Werror=sign-compare
Origin commit data
------------------
Commit: 431cfadcc2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 20:29:22 +02:00
Thilo Graf
9481b6cdc5 CComponentsScrollBar: fix possible too small type size
Possible segment count could be more than 265.
Was a remnant from scrollbar test phase.


Origin commit data
------------------
Commit: 379d1ffa76
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 19:13:36 +02:00
Jacek Jendrzej
d0445b35ec Fix merge-error; add missing add_gxa_sync_marker() function
Origin commit data
------------------
Commit: 0b781da031
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 11:36:14 +02:00
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
2017-08-08 20:06:40 +02:00