Commit Graph

10852 Commits

Author SHA1 Message Date
Stefan Seyfried
6979a29c94 change time_monotonic_ms() from time_t to int64_t
time_monotonic_ms values did wrap every ~24 days, leading to problems
in code that did not cope with that. Instead of fixing all places where
relative comparisons with time_monotonic_ms() are made, just use a
bigger datatype. Convert all users to the new type.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dad062eff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-26 11:37:19 +02:00
Stefan Seyfried
ef32e19175 moviplayer: suppress unused variable warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7f429019d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-26 11:29:19 +02:00
Thilo Graf
42a5d7599c cc_detailsline.cpp: fix possible unintended reduced height of bottom marker
Decrement value removed.

Height of bottom marker was decreased on every new repaint if no new
height was assigned. Was to see in bouqueteditor while scrolling with bouqets or
channel select window.

comes in with 19d0c6e98e


Origin commit data
------------------
Branch: ni/coolstream
Commit: dca7e10179
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)



------------------
This commit was generated by Migit
2017-09-24 22:27:46 +02:00
Jacek Jendrzej
2a51f0edc4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17afd5c87a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-21 18:47:32 +02:00
Jacek Jendrzej
c0dabfdccd fix stack buffer underflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdd23e0ece
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-21 18:46:21 +02:00
Jacek Jendrzej
de3301769b fix use stack after scope
Origin commit data
------------------
Branch: ni/coolstream
Commit: d61b9745bc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-21 18:45:47 +02:00
vanhofen
8563a7bb9b code alignments to master branch
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbb726e191
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)

Origin message was:
------------------
- code alignments to master branch

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-21 11:41:59 +02:00
Michael Liebmann
106e64707d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-21 09:07:15 +02:00
Michael Liebmann
6e8b743e1e jsoncpp: update to current version 1.8.3
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f6e78974b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-21 09:06:32 +02:00
vanhofen
bdbe2f5ab8 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines

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


------------------
This commit was generated by Migit
2017-09-20 21:29:53 +02:00
Thilo Graf
0a8ce310be CComponentsFrmClock: Using less chars for time string.
Current count of chars could be not enough in some cases.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecdc1acb9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)



------------------
This commit was generated by Migit
2017-09-20 21:29:53 +02:00
Jacek Jendrzej
e570980cbc Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 45fa2fcf4b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-20 18:10:05 +02:00
Jacek Jendrzej
049633bc07 src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken
Origin commit data
------------------
Branch: ni/coolstream
Commit: e308407b22
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-20 18:07:05 +02:00
Michael Liebmann
41747046e5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 600d215aaf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 23:21:21 +02:00
Michael Liebmann
54b43f7745 Use parseJsonFromString() for parsing json data in
- CMoviePlayerGui::luaGetUrl()
 - CTimerList::RemoteBoxChanExists()
 - CTimerList::RemoteBoxTimerList()
 - CTimerList::paintItem()
 - cTmdb::GetMovieDetails()
 - cYTFeedParser::parseFeedJSON()
 - cYTFeedParser::parseFeedDetailsJSON()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25ae929523
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)

Origin message was:
------------------
Use parseJsonFromString() for parsing json data in

  - CMoviePlayerGui::luaGetUrl()
  - CTimerList::RemoteBoxChanExists()
  - CTimerList::RemoteBoxTimerList()
  - CTimerList::paintItem()
  - cTmdb::GetMovieDetails()
  - cYTFeedParser::parseFeedJSON()
  - cYTFeedParser::parseFeedDetailsJSON()


------------------
This commit was generated by Migit
2017-09-19 23:20:39 +02:00
Michael Liebmann
fa80597608 helpers.cpp: Add new functions
- readFile()
 - parseJsonFromFile()
 - parseJsonFromString()

 parseJsonFromString() and parseJsonFromFile() use Json::CharReader
 instead of the obsolete function Json::Reader


Origin commit data
------------------
Branch: ni/coolstream
Commit: 05d8ed4105
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)

Origin message was:
------------------
helpers.cpp: Add new functions

 - readFile()
 - parseJsonFromFile()
 - parseJsonFromString()

 parseJsonFromString() and parseJsonFromFile() use Json::CharReader
 instead of the obsolete function Json::Reader


------------------
This commit was generated by Migit
2017-09-19 23:20:39 +02:00
Thilo Graf
8296b29529 CKeyChooserItem: add missing 'timeoutbar' while waiting for pressed key
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e17b73df6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 19:41:42 +02:00
Jacek Jendrzej
1923c574db Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef0154a89b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 18:16:14 +02:00
vanhofen
257d3f3cfb menue: use getItemColors() to get item colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57a17472a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 18:10:56 +02:00
Jacek Jendrzej
5ac3effc02 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74be1f7b5b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 16:24:38 +02:00
max_10
7f09367d74 mediaplayer: fixes form Duckbox git
Origin commit data
------------------
Branch: ni/coolstream
Commit: af3a61cb96
Author: max_10 <max_10@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 15:12:53 +02:00
Jacek Jendrzej
e1c127cb18 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 756f464a3f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 12:40:58 +02:00
Jacek Jendrzej
dca157cc8f fix start clock supplement to aecad369c1
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1f820aa44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-19 12:40:02 +02:00
Jacek Jendrzej
c615da9fd2 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2dd24f8c21
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-18 15:55:41 +02:00
Jacek Jendrzej
fac44e3ba4 osd_setup.cpp fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82a0cdeb68
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-18 14:57:11 +02:00
Jacek Jendrzej
c79807fc3a fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 511d953a18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-18 14:11:34 +02:00
Jacek Jendrzej
a225129631 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a23737a626
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-18 10:53:42 +02:00
Jacek Jendrzej
3fe7617f20 fix mem leak
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7942c9987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-18 08:56:02 +02:00
Thilo Graf
3d8f8e6732 CKeyChooserItem: fix possible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a48398bb4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-17 22:24:44 +02:00
Thilo Graf
d508812c48 CHintBox: fix possible unintended cut of text
Last line size was not considered.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 87b53a8597
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)



------------------
This commit was generated by Migit
2017-09-17 21:50:59 +02:00
Thilo Graf
7b1f217192 CPersonalizeGui: fix visualize of passive and active locked items
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c0d0b06d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-17 13:52:54 +02:00
Thilo Graf
94fe4513e1 CMenuItem: add members set/get info icon inside menu items
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0660dc66c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-17 13:52:43 +02:00
Jacek Jendrzej
8a451b3cdf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea89db1ec2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-16 13:26:53 +02:00
Jacek Jendrzej
af4f69402f remove unused locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-16 12:53:03 +02:00
vanhofen
d6a0db586f keychooser: just small renamings for a better view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cc8978f4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: just small renamings for a better view

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-16 11:29:46 +02:00
Thilo Graf
981adbbf78 CColorChooser: fix possible artefacts on screen after closed window
Window was painted with shadow but hide() method didn't know about this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 38f80a5ca6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)



------------------
This commit was generated by Migit
2017-09-15 22:23:01 +02:00
Jacek Jendrzej
37b9f2611e readd fontmenu scaling hint
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3732eb851a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-15 21:27:36 +02:00
Jacek Jendrzej
06ce66bbd8 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-15 20:44:49 +02:00
vanhofen
7fda7b7b5a icons: rename slider icons to more logical names
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd539af1f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-15 20:18:26 +02:00
vanhofen
3f1a3ed531 rename SLIDER defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: d873aef1e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-15 20:17:48 +02:00
vanhofen
19e717043e icons: new slider icons with material colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb22f29d3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-15 20:17:07 +02:00
vanhofen
f5bdb499cb menu: rework slider; ...
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a748de445
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- menu: rework slider; ...

* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-15 20:16:13 +02:00
vanhofen
9dffc0a4da colorchooser: rework tis gui-element; ...
* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 442f1adff0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- colorchooser: rework tis gui-element; ...

* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-15 20:15:25 +02:00
vanhofen
c27de33335 keychooser: use CMenuDForwarder instead of CMenuForwarder
Origin commit data
------------------
Branch: ni/coolstream
Commit: 10d236fd16
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: use CMenuDForwarder instead of CMenuForwarder

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-15 16:40:14 +02:00
vanhofen
db665c0704 keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5370086103
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-15 16:34:23 +02:00
Michael Liebmann
c230e44bc9 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdfccc2f22
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-14 15:37:58 +02:00
Michael Liebmann
c69ffa0305 system/helpers.cpp: Add cstr_replace()
- This is a faster C version of str_replace()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 020936acbe
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
system/helpers.cpp: Add cstr_replace()

 - This is a faster C version of str_replace()


------------------
This commit was generated by Migit
2017-09-14 15:37:36 +02:00
Jacek Jendrzej
e250ac7837 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-14 13:54:04 +02:00
Jacek Jendrzej
8e9b2a2b63 remove unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97442240f8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-14 13:29:47 +02:00
Thilo Graf
5426b516a8 update version to 3.5.1
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd99913d9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-14 12:16:17 +02:00