vanhofen
|
adcb6172d9
|
streaminfo: fix compile for coolstream; add dummies to libcs-headers
Origin commit data
------------------
Commit: ff04c8ce97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)
Origin message was:
------------------
- streaminfo: fix compile for coolstream; add dummies to libcs-headers
|
2017-11-07 07:49:49 +01:00 |
|
vanhofen
|
d99f701c0b
|
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
acinclude.m4
data/locale/deutsch.locale
data/locale/english.locale
src/driver/lcdd.h
src/driver/rcinput.cpp
src/driver/rcinput.h
src/driver/screenshot.cpp
src/driver/screenshot.h
src/driver/simple_display.cpp
src/driver/vfd.cpp
src/gui/audio_select.cpp
src/gui/infoviewer_bb.cpp
src/gui/movieplayer.cpp
src/gui/movieplayer.h
src/zapit/include/zapit/capmt.h
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
|
2017-11-03 00:09:05 +01:00 |
|
vanhofen
|
284138fbc5
|
audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.
Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>
Origin commit data
------------------
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.
Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>
|
2017-10-29 18:32:30 +01:00 |
|
vanhofen
|
f8d931aad8
|
add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
|
2017-10-29 18:31:30 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|