mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
16,110 Commits 2 Branches 9 Tags
caef1eb2bc6f7a2db8afcc85d0f96b22733cbc57
Commit Graph

785 Commits

Author SHA1 Message Date
vanhofen
8000115d81 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: f12bec56c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 12:45:42 +02:00
vanhofen
3b59835dce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ef5217fd6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 11:35:23 +02:00
vanhofen
cb47862c9c jsoncpp: update to current version 1.8.0; align Makefile.am 
Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
Commit: 760a64fc6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0; align Makefile.am

Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp
 2017-03-28 11:22:41 +02:00
vanhofen
c271e77e9d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
 2017-03-26 23:25:43 +02:00
vanhofen
95c6d6c593 Merge branch 'master' into pu/mp 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: b1ba85c8c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)
 2017-03-22 12:16:01 +01:00
vanhofen
8f2d4a3492 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d65fa461d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)
 2017-03-22 09:56:16 +01:00
Michael Liebmann
ed885284f8 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 0cac85205b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)
 2017-03-22 01:24:03 +01:00
Michael Liebmann
6823fd44d3 hd[1|2]/libcoolstream: Update headers for new libcoolstream functions 
libcoolstream-mt.so version 3.2.0 required

 Functions:
 - updateOsdScreenInfo()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - fbCopy()
 - fbFill()
 - cs_set_extra_debug()


Origin commit data
------------------
Commit: 9bc2d9b95e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
hd[1|2]/libcoolstream: Update headers for new libcoolstream functions

 libcoolstream-mt.so version 3.2.0 required

 Functions:
  - updateOsdScreenInfo()
  - GetVideoSystem()
  - GetVideoSystemFormatName()
  - fbCopy()
  - fbFill()
  - cs_set_extra_debug()
 2017-03-22 01:23:45 +01:00
Stefan Seyfried
71939b829a Merge remote-tracking branch 'tuxbox/master' 
probably needs some additional tweaks


Origin commit data
------------------
Commit: d4efbc0c9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)
 2017-03-21 06:50:08 +01:00
vanhofen
8bd314111c Merge branch 'master' into pu/mp 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: b12624d1fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 01:31:51 +01:00
Michael Liebmann
bed9f96a65 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2ca9d9c4f9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 08:38:15 +01:00
vanhofen
d9fc0a4a98 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:07:17 +01:00
vanhofen
20722a62cb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8a75efa81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:05:31 +01:00
vanhofen
ee911957d4 hardware_caps: fix has_fan and add detection of Neo Twin 
Origin commit data
------------------
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin
 2017-03-19 01:04:48 +01:00
vanhofen
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 16:14:33 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
da360bea16 tuxtxt.cpp: align to tuxbox-neutrino 
Origin commit data
------------------
Commit: f599f3aa98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)

Origin message was:
------------------
- tuxtxt.cpp: align to tuxbox-neutrino
 2017-03-11 12:50:36 +01:00
Michael Liebmann
bd2ffd04f3 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 87cb1b514a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:38:15 +01:00
vanhofen
b90bc955c3 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 114392256c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:21:17 +01:00
vanhofen
a8db520beb 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
------------------
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:10:04 +01:00
vanhofen
e96b2f0178 hardware_caps: just changes in comments 
Origin commit data
------------------
Commit: ff6046bb56
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: just changes in comments
 2017-03-10 15:07:52 +01:00
vanhofen
4ccc9cbdaf hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines 
Origin commit data
------------------
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
 2017-03-10 15:07:52 +01:00
vanhofen
2fd434895b hardware_caps: use define instead of value; better readability 
Origin commit data
------------------
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
 2017-03-10 15:07:52 +01:00
vanhofen
86c64163c7 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()" 
This reverts commit ec191c5a38
because libcoolstream now is updated


Origin commit data
------------------
Commit: 83de4ba055
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:07:52 +01:00
Michael Liebmann
90c7bffdeb Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 5e09df1d91
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:50:04 +01:00
Michael Liebmann
cd4922c0c2 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
------------------
Commit: ab6ca5b606
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
Michael Liebmann
5b136d4c55 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
------------------
Commit: 7eecd09eca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
vanhofen
38dd0be012 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8fb706226a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 00:31:02 +01:00
Michael Liebmann
fffa20b430 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: fee5cd0175
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 17:34:42 +01:00
Michael Liebmann
ec191c5a38 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type() 
Origin commit data
------------------
Commit: f5cdaff282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 17:34:25 +01:00
Michael Liebmann
42c7b9035d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 94492c4271
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 15:17:25 +01:00
vanhofen
afe0a772a9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4ed2244c39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 13:43:47 +01:00
vanhofen
17fd0362e1 hardware_caps: add latest coolstream models 
Origin commit data
------------------
Commit: b546ed517e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)

Origin message was:
------------------
- hardware_caps: add latest coolstream models
 2017-03-09 12:51:44 +01:00
vanhofen
77be049b29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 10:08:13 +01:00
Michael Liebmann
dc44b76596 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 7ad59776d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 00:35:16 +01:00
Stefan Seyfried
6d86f585cb Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
7364e139ad make neutrino compatible with new ffmpeg 
Origin commit data
------------------
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 15:00:17 +01:00
vanhofen
b5ce0f99fb 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
------------------
Commit: 73ea6fddcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 23:26:32 +01:00
vanhofen
3a863c91f0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:40:18 +01:00
vanhofen
fdda0de766 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:07:52 +01:00
Michael Liebmann
eb3e1116ac Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:06:38 +01:00
vanhofen
97391211a4 move public libcoolstream-headers to hardware directory 
Origin commit data
------------------
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
 2017-03-06 21:49:32 +01:00
vanhofen
459cf4d8ea port hardware_caps from Neutrino-MP 
Origin commit data
------------------
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP
 2017-03-06 21:49:32 +01:00
Jacek Jendrzej
ade02e6dbb subpagetable is unsigned 
Origin commit data
------------------
Commit: e10cb00613
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
 subpagetable is unsigned
 2017-03-06 15:50:06 +01:00
Stefan Seyfried
ee422ef114 hw_caps: add caps for 14:9 AR and broken tuner driver 
Origin commit data
------------------
Commit: 3a7a202818
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 20:28:21 +01:00
vanhofen
68e2832f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 16:55:39 +01:00
vanhofen
f5d9d25957 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:36:23 +01:00
Michael Liebmann
84759d6c05 osd resolution: Use COsdHelpers::changeOsdResolution() to adjust... 
...OSD resolution after switching video format


Origin commit data
------------------
Commit: ff11dd44ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:04:09 +01:00
Stefan Seyfried
9960939337 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:44:53 +01:00
vanhofen
59b2a3b072 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 15:14:59 +01:00