Commit Graph

10794 Commits

Author SHA1 Message Date
vanhofen
aa805890c7 fix last merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19e994f0fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- fix last merge

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

------------------
This commit was generated by Migit
2017-03-06 23:11:30 +01:00
vanhofen
47ce01c2b5 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dfac4d01dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:43:51 +01:00
vanhofen
09e19facfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:40:18 +01:00
vanhofen
6d8078cf73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:07:52 +01:00
vanhofen
ca1ebd7eb2 configure.ac: remove duplicated code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3c3d3760c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- configure.ac: remove duplicated code

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
vanhofen
a60fcac65b move public libcoolstream-headers to hardware directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- move public libcoolstream-headers to hardware directory

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
vanhofen
c8efd4141c port hardware_caps from Neutrino-MP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
Thilo Graf
4494a8ba5e CTextBox: fix pass of SCROLL_FRAME_WIDTH
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c388bb71c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-06 21:11:08 +01:00
Jacek Jendrzej
a3a0da0277 src/gui/movieplayer.cpp some streams need more time pro frame
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92abe90d58
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-06 14:41:25 +01:00
vanhofen
cbe658d192 imdb: align timeouts; use neutrino defaults
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89a6db5416
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- imdb: align timeouts; use neutrino defaults

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

------------------
This commit was generated by Migit
2017-03-06 09:07:38 +01:00
vanhofen
6c8156c80c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e24708f93c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 20:44:04 +01:00
vanhofen
440f72d606 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13c7e927b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 20:43:50 +01:00
vanhofen
639d886bd1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3a1c04ab9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 20:43:33 +01:00
Michael Liebmann
d6f3c6ec0d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 77f74c5966
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 19:54:19 +01:00
Michael Liebmann
b548b66607 COsdHelpers: Remove no longer required function resetOsdResolution()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1dcce0ad3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 19:54:09 +01:00
Michael Liebmann
24176ae699 COsdHelpers: Add function setVideoSystem()
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa08347ef4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 19:54:09 +01:00
Michael Liebmann
3c3dde00b2 CFbAccelCSHD2::setMode: Fix value for screeninfo.yres_virtual
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53460e54da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 19:54:09 +01:00
Stefan Seyfried
b504d299fd msgbox: remove explicit handling of record events
these are handled in the last else clause anyway


Origin commit data
------------------
Branch: ni/coolstream
Commit: f80f69c232
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)



------------------
This commit was generated by Migit
2017-03-05 19:53:34 +01:00
Stefan Seyfried
c7de70d0c7 msgbox: remove duplicated code
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3ab1b91d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 19:53:34 +01:00
Stefan Seyfried
56ddedaa39 unbreak msgbox
the "if (msg)" was basically always true, killing all keys that were not
handled in this clause (e.g. it was not possible to switch the box from
standby if a plugin with output was running during standby)


Origin commit data
------------------
Branch: ni/coolstream
Commit: f9b7fca210
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)



------------------
This commit was generated by Migit
2017-03-05 19:53:34 +01:00
Jacek Jendrzej
589ffd92e5 try fix YT cache wirite to root
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3f69009af
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 17:06:22 +01:00
vanhofen
5e8ff407be Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 425d6d0035
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 15:47:58 +01:00
Jacek Jendrzej
66b32e5ddb src/gui/widget/msgbox.cpp init result
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5cf652763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 14:41:15 +01:00
Michael Liebmann
115b77bd58 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52cd29a207
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 13:53:34 +01:00
Jacek Jendrzej
f4b4a6a8aa src/zapit/src/zapit.cpp fix segfault without services.xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc188c66ba
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-05 13:48:40 +01:00
Stefan Seyfried
113edb58c6 videosettings: select VIDEOMENU_43MODE_OPTIONS at runtime
instead of hard coded hardware dependence, select panscan and display
AR options at run time via hw_caps.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c2f7e1b1c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)



------------------
This commit was generated by Migit
2017-03-04 20:36:56 +01:00
Stefan Seyfried
de0eb6e89d frontend: use hw_caps instead of BOXMODEL define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c0496be82
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 20:30:28 +01:00
Stefan Seyfried
b2c32ac24b hw_caps: add caps for 14:9 AR and broken tuner driver
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a7a202818
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 20:28:21 +01:00
Stefan Seyfried
2aa2f4ba65 msgbox: remove explicit handling of record events
these are handled in the last else clause anyway


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3bcdbb39ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)



------------------
This commit was generated by Migit
2017-03-04 19:56:41 +01:00
Stefan Seyfried
383fe398b3 msgbox: remove duplicated code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 71361684d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:55:59 +01:00
Stefan Seyfried
eb0b4eb36c unbreak msgbox
the "if (msg)" was basically always true, killing all keys that were not
handled in this clause (e.g. it was not possible to switch the box from
standby if a plugin with output was running during standby)


Origin commit data
------------------
Branch: ni/coolstream
Commit: e1b50ee304
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)



------------------
This commit was generated by Migit
2017-03-04 19:49:48 +01:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00
vanhofen
d8115973e8 imageinfo_ni: simplify max_bit handling
Conflicts:
	src/gui/imageinfo_ni.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a333845440
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: simplify max_bit handling

Conflicts:
	src/gui/imageinfo_ni.cpp


------------------
This commit was generated by Migit
2017-03-04 00:37:20 +01:00
vanhofen
35cd67346e imageinfo_ni: simplify max_bit handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: d04afd80ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: simplify max_bit handling

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

------------------
This commit was generated by Migit
2017-03-03 23:59:53 +01:00
vanhofen
88d934ed81 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/imageinfo_ni.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6af1f3d5bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)



------------------
This commit was generated by Migit
2017-03-03 23:37:44 +01:00
vanhofen
df7c99fcc7 imageinfo_ni: small offset corrections and cleanups
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47b98e5879
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: small offset corrections and cleanups

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

------------------
This commit was generated by Migit
2017-03-03 23:33:41 +01:00
vanhofen
f1241ccd6d imageinfo_ni: cleanup info_items struct; ...
remove obsolete videoDecoder calls


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6039c66423
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: cleanup info_items struct; ...

remove obsolete videoDecoder calls


------------------
This commit was generated by Migit
2017-03-03 19:00:40 +01:00
vanhofen
1aa6a499bf imageinfo_ni: use OFFSET-defines; auto-calc info_items struct
Origin commit data
------------------
Branch: ni/coolstream
Commit: c75624cdad
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: use OFFSET-defines; auto-calc info_items struct

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

------------------
This commit was generated by Migit
2017-03-03 19:00:40 +01:00
vanhofen
39dea4035a imageinfo_ni: avoid multiple cs_get_revision() calls; ...
fix small typo


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1100110913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: avoid multiple cs_get_revision() calls; ...

fix small typo


------------------
This commit was generated by Migit
2017-03-03 19:00:39 +01:00
vanhofen
7381d3d0c2 fix build; g_PluginList => g_Plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a1833f00c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- fix build; g_PluginList => g_Plugins

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

------------------
This commit was generated by Migit
2017-03-03 15:57:56 +01:00
vanhofen
46c2296388 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86bedc2a3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 15:52:12 +01:00
vanhofen
8c4fdeb73a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5de81c184
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 15:51:51 +01:00
vanhofen
e6dc131f1b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: cca2c6ba74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 15:51:27 +01:00
vanhofen
393fd9d9bb imageinfo: remove obsolete define
Origin commit data
------------------
Branch: ni/coolstream
Commit: b283128d0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo: remove obsolete define

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

------------------
This commit was generated by Migit
2017-03-03 15:50:47 +01:00
vanhofen
a8416659c9 imageinfo: change handling of yWeb version; use own CConfigFile
Origin commit data
------------------
Branch: ni/coolstream
Commit: 629f91e229
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo: change handling of yWeb version; use own CConfigFile

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

------------------
This commit was generated by Migit
2017-03-03 15:48:31 +01:00
vanhofen
4f035ece4b imageinfo_ni: add yWeb version
Origin commit data
------------------
Branch: ni/coolstream
Commit: 227f5cbfff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: add yWeb version

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

------------------
This commit was generated by Migit
2017-03-03 15:39:42 +01:00
vanhofen
34182e384c imageinfo_ni: add Lua-API version
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49783579a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: add Lua-API version

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

------------------
This commit was generated by Migit
2017-03-03 15:39:42 +01:00
Michael Liebmann
b2479d14c3 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 487b69b1d4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 14:41:57 +01:00
Michael Liebmann
48c57758ca CScanTs::handleMsg: Fix handling left/right keys during channel search
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9242679a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 14:41:26 +01:00
vanhofen
3d3e8163b8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 10:38:14 +01:00