Commit Graph

12527 Commits

Author SHA1 Message Date
Stefan Seyfried
922a987a64 subchannel_select: ensure buffer does not overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67f6b28b7d
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-23 23:43:59 +02:00
Stefan Seyfried
956ebe7fcc audioplayer: fix buffer overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 602ea1b7a7
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-23 23:41:58 +02:00
Stefan Seyfried
b6b4d82d0b moviebrowser: fix format-string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3a3df40bc
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-23 23:40:54 +02:00
Stefan Seyfried
b8dea5f289 zapit: properly initialize arrays in scanbat and scansdt
Origin commit data
------------------
Branch: ni/coolstream
Commit: 849755df82
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-23 23:40:09 +02:00
Stefan Seyfried
f85927d423 CMenuWidget: simplify menu_left_exit code, add missing break
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f4907f251
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-23 21:40:53 +02:00
Stefan Seyfried
fc75d19a4d zapit: suppress one more implicit-fallthrough warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 62e9648636
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-23 21:39:56 +02:00
Stefan Seyfried
267ba4b9f4 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: 99ff4857ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-23 21:35:01 +02:00
Stefan Seyfried
19da7a493f Revert "fb_accel_sti: next try of catching the strange locking issue"
This reverts commit 59814b0731.
Not a locking problem, but a wrap issue with time_monotonic_ms()


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



------------------
This commit was generated by Migit
2017-09-23 19:16:20 +02:00
Stefan Seyfried
06ecde5c7e moviplayer: suppress unused variable warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 597b40664f
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-23 18:14:22 +02:00
Stefan Seyfried
ef49a6c57b neutrinoyparser: fix invalid logic in func_unmount_get_list
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5cef9a2aa
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-23 18:13:44 +02:00
Stefan Seyfried
f181732f4d pictureviewer: fix build with gcc7
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d70e17dc5
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-23 18:13:03 +02:00
Stefan Seyfried
9fd8627bc8 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: a497a2b86c
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-23 18:11:47 +02:00
Stefan Seyfried
3ee6bc66b6 add LUA_CFLAGS everywhere widget/menue.h is used
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78532e7e21
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-23 17:33:34 +02:00
Stefan Seyfried
97ba018af4 Merge remote-tracking branch 'tuxbox/master'
needs buildfixes


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



------------------
This commit was generated by Migit
2017-09-23 17:01:42 +02:00
gixxpunk
12c211e79e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef7cf04dd7
Author: gixxpunk <thomas.harfmann@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 19:54:02 +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
vanhofen
d9ef178129 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5e829a1d4
Author: vanhofen <vanhofen@gmx.de>
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 10:37:09 +02:00
vanhofen
ba0e2370de Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-09-21 10:36:43 +02:00
vanhofen
3aa6bf25d9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b7afc5b38
Author: vanhofen <vanhofen@gmx.de>
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 10:33:00 +02:00
vanhofen
dd377dff8f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/widget/menue.cpp
	src/system/settings.h


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



------------------
This commit was generated by Migit
2017-09-21 10:32:33 +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
gixxpunk
23417d8cef remove outdated cross-configure scripts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 23544c1ed8
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- remove outdated cross-configure scripts

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

------------------
This commit was generated by Migit
2017-09-20 20:23:17 +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
vanhofen
daf4480f61 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d58a3b1c9
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


------------------
This commit was generated by Migit
2017-09-20 13:46:31 +02:00
vanhofen
89d636b189 fix compiler warnings in several console outputs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b2e03d348
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- fix compiler warnings in several console outputs

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

------------------
This commit was generated by Migit
2017-09-20 11:53:02 +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
vanhofen
cb2c859b5e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08231c17bf
Author: vanhofen <vanhofen@gmx.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 21:31:46 +02:00
gixxpunk
757f054720 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89de096d1e
Author: gixxpunk <thomas.harfmann@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 20:35:30 +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
gixxpunk
34c98e23c4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@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:37:22 +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
vanhofen
c75f7b3525 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3b1505600
Author: vanhofen <vanhofen@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-18 22:57:05 +02:00
vanhofen
0412a5aa23 menue: use getItemColors() to get item colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 477ece6ece
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-18 22:53:27 +02:00
vanhofen
83be9c1fe3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@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-18 21:53:44 +02:00
gixxpunk
570ba4305b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@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 16:31:55 +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