Commit Graph

9885 Commits

Author SHA1 Message Date
Stefan Seyfried
00b109d321 msgbox: deobfuscate assignment of default result value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cef61bd8e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 19:10:06 +01:00
Michael Liebmann
b63ce09ff8 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87cb1b514a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

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


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

------------------
This commit was generated by Migit
2017-03-10 15:37:03 +01:00
vanhofen
938e4c22f8 controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0203de264f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION

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

------------------
This commit was generated by Migit
2017-03-10 15:36:13 +01:00
vanhofen
29a00a81ae remove obsolete ifdef's
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4aecc9f1b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- remove obsolete ifdef's

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

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


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

------------------
This commit was generated by Migit
2017-03-10 15:21:17 +01:00
vanhofen
07da62e157 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


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



------------------
This commit was generated by Migit
2017-03-10 15:10:04 +01:00
vanhofen
283c5857f5 hardware_caps: just changes in comments
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff6046bb56
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: just changes in comments

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
734e15b5ff neutrinoyparser: use hw_caps in func_get_boxtype() ...
... and func_get_boxmodel()


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

Origin message was:
------------------
- neutrinoyparser: use hw_caps in func_get_boxtype() ...

... and func_get_boxmodel()


------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
aa974ec7f8 controlapi: use hw_caps in HWInfoCGI()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b902648b08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: use hw_caps in HWInfoCGI()

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
bafdb8ba90 controlapi: /control/info => return right name
Origin commit data
------------------
Branch: ni/coolstream
Commit: e092059f32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return right name

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
76ef7b2aef hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24b159f84c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
c3a4e426ca hardware_caps: use define instead of value; better readability
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cca1e02c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: use define instead of value; better readability

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
096ef211b2 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()"
This reverts commit 5b9c48fbf1
because libcoolstream now is updated


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



------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
Michael Liebmann
98da577319 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e09df1d91
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 14:50:04 +01:00
Michael Liebmann
063adf347d hd2/libcoolstream/*.h: Update for new libcoolstream functions
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - Add CS_CHIP_NEVIS definitions


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab6ca5b606
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 14:35:32 +01:00
Michael Liebmann
e0afe07ae2 hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - cs_get_chip_type() (dummy function for compatibility with hd2)
 - Add CS_CHIP_xxx definitions


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7eecd09eca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 14:35:32 +01:00
vanhofen
0c2a383673 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4836e50d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

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


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

------------------
This commit was generated by Migit
2017-03-10 00:31:02 +01:00
Michael Liebmann
68a2255560 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: fee5cd0175
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 17:34:42 +01:00
Michael Liebmann
5b9c48fbf1 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5cdaff282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 17:34:25 +01:00
Michael Liebmann
acedcfb372 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94492c4271
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 15:17:25 +01:00
vanhofen
1e5b33195b Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 100ac0fb96
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 13:44:05 +01:00
vanhofen
8e2360a18a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ed2244c39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 13:43:47 +01:00
vanhofen
ff3043a1fa hardware_caps: add latest coolstream models
Origin commit data
------------------
Branch: ni/coolstream
Commit: b546ed517e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)

Origin message was:
------------------
- hardware_caps: add latest coolstream models

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

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


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

------------------
This commit was generated by Migit
2017-03-09 10:08:13 +01:00
Michael Liebmann
ef3d478f81 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a531d4304
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 12:35:39 +01:00
Michael Liebmann
3d5b84fb78 Add src/compatibility.h to include software-dependency macros
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87b7260c48
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 12:35:20 +01:00
Michael Liebmann
d5b808b0b9 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad59776d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 00:35:16 +01:00
Michael Liebmann
5891499504 Fix malloc_stats() call for newer uClibc-ng versions
Origin commit data
------------------
Branch: ni/coolstream
Commit: b58aa9ad6f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 00:34:48 +01:00
Jacek Jendrzej
4c19475bd1 make neutrino compatible with new ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 15:00:17 +01:00
vanhofen
73014e6c83 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2017-03-06 23:54:02 +01:00
vanhofen
f3fe4a116f allow to force given osd resolution in "videosystem = auto" mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode

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

------------------
This commit was generated by Migit
2017-03-06 23:50:15 +01:00
Michael Liebmann
78a2c71634 Fix osd mode switch in videosystem auto mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bb9fc6687
Author: Michael Liebmann <tuxcode.bbg@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 23:50:15 +01:00
vanhofen
038c20d9b4 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.h


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



------------------
This commit was generated by Migit
2017-03-06 23:26:32 +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
Michael Liebmann
875905608d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@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 22:06:38 +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
a41f318adc CMovieBrowser/cYTFeedParser: implement signals from CProgressSignals
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c6a47ee3a
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:26:26 +01:00
Thilo Graf
562dbec77c CProgressWindow/CProgressSignals: add prepared signals
Required for inhertance of signals used with CProgressWindow.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f511ebd1a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 21:26:26 +01:00
Thilo Graf
8b8723a297 CMovieBrowser: remove wrong progress value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 26a0f31923
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:26:26 +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
4e013de774 subpagetable is unsigned
Origin commit data
------------------
Branch: ni/coolstream
Commit: e10cb00613
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
 subpagetable is unsigned

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

------------------
This commit was generated by Migit
2017-03-06 15:50:06 +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
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