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

34 Commits

Author SHA1 Message Date
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
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
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
[CST] Focus
fbc7d1f66e lib/libcoolstream2/cs_api.h: update header 
Origin commit data
------------------
Commit: 16cbac13fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-04-14 (Thu, 14 Apr 2016)
 2016-04-14 17:28:32 +03:00
[CST] Focus
9403e63831 libcoolstream2/playback_cs.h: update header 
Origin commit data
------------------
Commit: 427936c874
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)
 2016-03-25 19:04:32 +03:00
Michael Liebmann
86fd5344a6 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
 2016-01-26 06:55:54 +01:00
[CST] Focus
5748c6f963 gui/movieplayer.cpp: pass subtitles charset to playback instance 
Origin commit data
------------------
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
 2016-01-25 18:16:16 +03:00
Michael Liebmann
5d1176266a libcoolstream: Add boxarch to hw_caps 
Origin commit data
------------------
Commit: 514d6344a6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
 2016-01-25 13:53:39 +01:00
Michael Liebmann
48e4e8cba8 Adapt neutrino-mp for CST hardware part #3 
- Adapt and extend hw_caps for cst hardware


Origin commit data
------------------
Commit: fe9a2c19e4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)
 2016-01-16 07:26:04 +01:00
Michael Liebmann
710cbf3190 Adapt neutrino-mp for CST hardware part #1 
- Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
 (no frontend found, segfault)


Origin commit data
------------------
Commit: 403d02ec2b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)

Origin message was:
------------------
Adapt neutrino-mp for CST hardware part #1

 - Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
  (no frontend found, segfault)
 2016-01-16 07:26:04 +01:00
[CST] Focus
e41bc0e19d lib/libcoolstream/playback_cs.h, lib/libcoolstream2/playback_cs.h: update 
Origin commit data
------------------
Commit: 294ed15de6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)
 2015-11-06 17:23:15 +03:00
[CST] Bas
464109caa0 lib/libcoolstream2/cnxtfb.h: only define FBIO_WAITFORVSYNC if it's not defined yet by kernel headers. 
Origin commit data
------------------
Commit: f4f6110947
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2015-02-16 (Mon, 16 Feb 2015)
 2015-02-22 17:23:06 +03:00
Jacek Jendrzej
44a7c3703c some enum warrnings compil fixes 
Origin commit data
------------------
Commit: 051fb7c008
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
 2015-02-15 22:16:47 +01:00
[CST] Bas
8f536ee896 neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me. 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
 2014-10-22 16:14:05 +04:00
[CST] Bas
056cf828b6 lib/libcoolstream2/video_cs.h: add 23.97hz and 29.97hz modes in api 
Origin commit data
------------------
Commit: f47c157db2
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
 2014-04-16 18:11:43 +04:00
[CST] Focus
d1b5580039 lib/libcoolstream2/dmx_cs.h: update apollo header 
Origin commit data
------------------
Commit: 88a622a0ad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-31 (Mon, 31 Mar 2014)
 2014-04-02 17:32:20 +04:00
[CST] Focus
67e1601421 libcoolstream2: sync headers 
Origin commit data
------------------
Commit: 71b550b04b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 20:01:14 +04:00
[CST] Focus
82875770e8 libcoolstream2/playback_cs.h: update apollo header 
Origin commit data
------------------
Commit: d2c5fc8604
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 20:01:14 +04:00
[CST] Focus
40c3a69eaa mmi.h, cam_menu.cpp fix spelling error 
Origin commit data
------------------
Commit: cfe6facea4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
 2014-01-22 12:27:07 +04:00
[CST] Focus
6a53722d5e playback_cs.h: add MAX_PLAYBACK_PIDS define 
Origin commit data
------------------
Commit: 13fb2bc67a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-26 (Thu, 26 Dec 2013)
 2013-12-26 15:23:52 +04:00
[CST] Bas
bf90c6221f libcoolstream2/ca_cs.h: add SetTS() method and related type. 
Origin commit data
------------------
Commit: fce161b70b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
 2013-12-24 18:31:10 +04:00
[CST] Focus
c3e5cfc5ec lib/libcoolstream2: apollo headers update 
Origin commit data
------------------
Commit: fb6dea6e2d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-15 (Fri, 15 Nov 2013)
 2013-11-15 15:55:36 +04:00
[CST] Focus
ea4a788826 lib/libcoolstream2/cnxtfb.h: header update, no u8 type used 
Origin commit data
------------------
Commit: 4130c04d16
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 13:21:20 +04:00
[CST] Focus
ca5a568e49 lib/libcoolstream2/playback_cs.h: update apollo header 
Origin commit data
------------------
Commit: 3498577460
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
 2013-09-03 18:23:20 +04:00
Michael Liebmann
f2e050b425 Fix file include in apollo libcoolstream headers 
Origin commit data
------------------
Commit: 381d25bdcd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-17 (Sat, 17 Aug 2013)
 2013-08-17 20:56:26 +02:00
[CST] Focus
75ff071743 revert apollo libcoolstream headers to release lib version 
Origin commit data
------------------
Commit: 7a41572563
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
 2013-08-06 15:16:48 +04:00
[CST] Focus
1100a5fc23 lib/libcoolstream2: headers update 
Origin commit data
------------------
Commit: c337d26f99
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
 2013-07-18 14:52:00 +04:00
[CST] Focus
5bc3c6a5fe sync apollo libcs headers 
Origin commit data
------------------
Commit: e0898de5ca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 16:34:48 +04:00
[CST] Focus
4eb05e0409 libcoolstream2/playback_cs.h: sync header 
Origin commit data
------------------
Commit: a780c07815
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)
 2013-04-30 12:48:24 +04:00
[CST] Focus
532eb9be4e lib/libcoolstream2/video_cs.h: add 1080p 50/60 modes 
Origin commit data
------------------
Commit: 50fe74f9c1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-28 (Thu, 28 Mar 2013)
 2013-03-28 15:41:01 +04:00
[CST] Focus
729d75819e libcoolstream2/dmx_cs.h: update header 
Origin commit data
------------------
Commit: 81cf9c7afc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
 2013-02-13 14:09:47 +04:00
[CST] Focus
c9907de31c lib/libcoolstream2: sync control headers 
Origin commit data
------------------
Commit: ca3ac51881
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-18 (Fri, 18 Jan 2013)
 2013-01-18 16:53:40 +04:00
[CST] Focus
cdfd17715e lib/libcoolstream2/video_cs.h: update apollo header 
Origin commit data
------------------
Commit: 60b5c40d14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
 2013-01-16 16:35:38 +04:00
[CST] Focus
32a07c2189 lib/libcoolstream2: directory for apollo headers 
Origin commit data
------------------
Commit: 58c1650b72
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 13:59:17 +04:00