Commit Graph

730 Commits

Author SHA1 Message Date
TangoCash
1f467ce4f2 varius fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb26f93d98
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
TangoCash
5de9f564aa add multiple remote boxes
Origin commit data
------------------
Branch: ni/coolstream
Commit: f354089763
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
TangoCash
3d3605983f adding remote timer (experimental)
switch record timers to remote box or back with "play"-key


Origin commit data
------------------
Branch: ni/coolstream
Commit: 716e9f4d9b
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
martii
5967b5f2c3 timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
vanhofen
1eae0a97f3 Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)



------------------
This commit was generated by Migit
2016-09-20 08:22:22 +02:00
martii
2b6a4a3718 [experimental] timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe2d351750
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-15 00:48:06 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
a19fe6bed0 Fix merge conflicts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-20 09:01:33 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
1d14f8630a add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes

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

------------------
This commit was generated by Migit
2016-07-31 21:04:37 +02:00
FlatTV
c4bbe2a4fb Merge branch 'ni/cst-next' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: cff7efddc4
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-10 21:44:58 +02:00
FlatTV
8c47e9a1fd Ask user for storing overlapping CI timer from epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7543aa602c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-10 21:44:30 +02:00
gixxpunk
2e09d77141 use default values for freetype fontcaches (needs testing!)
Origin commit data
------------------
Branch: ni/coolstream
Commit: e6fafadcea
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-07-07 (Thu, 07 Jul 2016)

Origin message was:
------------------
- use default values for freetype fontcaches (needs testing!)

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

------------------
This commit was generated by Migit
2016-07-07 17:46:18 +02:00
gixxpunk
a376190b02 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8167e518ae
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-06-26 (Sun, 26 Jun 2016)


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

------------------
This commit was generated by Migit
2016-06-26 22:14:15 +02:00
Thilo Graf
f78bcc297f dvbsubtitle.cpp: fix wconversion compiler warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9aab3ed81
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-16 (Sat, 16 Apr 2016)


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

------------------
This commit was generated by Migit
2016-06-26 15:32:35 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Jacek Jendrzej
bd516dedb4 lib/libdvbsub/tools.h unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: c804997045
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-16 (Sat, 16 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-16 18:07:16 +02:00
[CST] Focus
53f9bd83a5 lib/libcoolstream2/cs_api.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16cbac13fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-04-14 (Thu, 14 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-14 17:28:32 +03:00
[CST] Focus
df98594b5b libcoolstream2/playback_cs.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bb3cdf3ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-28 13:29:57 +03:00
[CST] Focus
23fc75ed1a libcoolstream2/playback_cs.h: update header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 427936c874
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-25 19:04:32 +03:00
vanhofen
7615e8eac0 adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19154192db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP

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

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
[CST] Focus
68b470815e libdvbsub/dvbsub.cpp: fix pid reporting on resume
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ec81142c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-02 (Tue, 02 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-03 18:29:50 +03:00
Michael Liebmann
cad1407f90 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-28 05:32:50 +01:00
Jacek Jendrzej
94712b9e14 jsoncpp.cpp: re-apply gcc version compil fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a72274efb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 14:11:33 +01:00
Michael Liebmann
aebe47f293 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 06:55:54 +01:00
Michael Liebmann
9a540a713a Revert 'Adapt neutrino-mp for CST hardware part #2'
This reverts commit 517b71f613


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c4105a689
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)



------------------
This commit was generated by Migit
2016-01-26 05:50:38 +01:00
[CST] Focus
17232ec523 gui/movieplayer.cpp: pass subtitles charset to playback instance
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-25 18:16:16 +03:00
Michael Liebmann
b7d36e8aec libcoolstream: Add boxarch to hw_caps
Origin commit data
------------------
Branch: ni/coolstream
Commit: 514d6344a6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-25 13:53:39 +01:00
Stefan Seyfried
2480799caf hardware_caps: more boxtypes, add boxarch
Origin commit data
------------------
Branch: ni/coolstream
Commit: 71d4ec8339
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-22 19:48:09 +01:00
Stefan Seyfried
9717fa8424 Merge remote-tracking branch 'n/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 353b083620
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-17 19:10:10 +01:00
Michael Liebmann
6408b43517 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2476a2dfd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 15:35:32 +01:00
gixxpunk
33e0848e69 re-apply 717ed7e87c
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bf709669
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- re-apply 717ed7e87c

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

------------------
This commit was generated by Migit
2016-01-16 15:25:30 +01:00
gixxpunk
2c3370e9f3 jsoncpp: update to 0.10.5
Origin commit data
------------------
Branch: ni/coolstream
Commit: d74d85d1db
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- jsoncpp: update to 0.10.5

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

------------------
This commit was generated by Migit
2016-01-16 15:25:30 +01:00
Stefan Seyfried
28ab173560 Merge remote-tracking branch 'cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 12:51:04 +01:00
Michael Liebmann
bf7e117cef Adapt neutrino-mp for CST hardware part #3
- Adapt and extend hw_caps for cst hardware


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe9a2c19e4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)



------------------
This commit was generated by Migit
2016-01-16 07:26:04 +01:00
Michael Liebmann
517b71f613 Adapt neutrino-mp for CST hardware part #2
- libtuxtxt: Add extra directory libtuxtxt_mp for neutrino-mp
 - Workaround, tuxtxt neutrino-hd incompatible to
 framebuffer_ng from neutrino-mp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d18316676
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 #2

 - libtuxtxt: Add extra directory libtuxtxt_mp for neutrino-mp
 - Workaround, tuxtxt neutrino-hd incompatible to
  framebuffer_ng from neutrino-mp


------------------
This commit was generated by Migit
2016-01-16 07:26:04 +01:00
Michael Liebmann
8db42dd287 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
------------------
Branch: ni/coolstream
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)


------------------
This commit was generated by Migit
2016-01-16 07:26:04 +01:00
Michael Liebmann
af2ffd931b Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 07:22:31 +01:00
Stefan Seyfried
040f68984e replace __FILE__ with __file__
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70b7f74362
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
1364beedc3 port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79d800f955
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)

Origin message was:
------------------
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

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

------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
717ed7e87c jsoncpp: use own assert() macro which does not abort
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73b5303cfc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
8abb5e9687 jsoncpp: use own assert() macro which does not abort
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80d65e33ed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-10 19:35:09 +01:00
Stefan Seyfried
f7957205ea replace __FILE__ with __file__
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e6f0e820
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-10 19:34:31 +01:00
Stefan Seyfried
ac98b53f05 tuxtxt: fix rare crash / memory corruption
cache manipulation outside locks is evil, and the variables have been
initialized in tuxtxt_init earlier anyway


Origin commit data
------------------
Branch: ni/coolstream
Commit: aab075bd70
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)



------------------
This commit was generated by Migit
2016-01-02 11:31:40 +01:00
Stefan Seyfried
5b0debf29a Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-15 17:29:18 +01:00
Jacek Jendrzej
aea126e2e2 fix compil use good oprator
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b7b43f028
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-15 17:03:14 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Stefan Seyfried
ba7d39c293 fix build with newer openSUSE ffmpeg packages
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebe46eec84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-13 13:12:11 +01:00
[CST] Focus
9c37915784 lib/libcoolstream/playback_cs.h, lib/libcoolstream2/playback_cs.h: update
Origin commit data
------------------
Branch: ni/coolstream
Commit: 294ed15de6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)


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

------------------
This commit was generated by Migit
2015-11-06 17:23:15 +03:00