mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +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
Stefan Seyfried
07a1df57f1 remove obsolete embedded libtriple 
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
(forward ported neutrino-mp commit 2158fee441)


Origin commit data
------------------
Commit: 57078ed23d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 12:19:06 +02:00
Stefan Seyfried
f3e2089f41 fix Makefiles to include SIGC_CFLAGS 
now that the framebuffer class includes libsigc++, the path
to it must be known to all parts using framebuffer.h


Origin commit data
------------------
Commit: 7a9373c262
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:50:38 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
bf28c38024 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: b93d809116
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:30:48 +02:00
vanhofen
2510d548e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:23:51 +02:00
TangoCash
0801b9f3bc varius fixes 
Origin commit data
------------------
Commit: fb26f93d98
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 10:47:37 +02:00
TangoCash
5aaea95ee1 add multiple remote boxes 
Origin commit data
------------------
Commit: f354089763
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 10:47:37 +02:00
TangoCash
6b76a665f1 adding remote timer (experimental) 
switch record timers to remote box or back with "play"-key


Origin commit data
------------------
Commit: 716e9f4d9b
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 10:47:37 +02:00
martii
6836ea5d78 timerd: adjust recording timers to epg 
Origin commit data
------------------
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:04:48 +02:00
vanhofen
aebbf96829 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
------------------
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)
 2016-09-20 08:22:22 +02:00
martii
1390156250 [experimental] timerd: adjust recording timers to epg 
Origin commit data
------------------
Commit: fe2d351750
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)
 2016-09-15 00:48:06 +02:00
vanhofen
bc33663742 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
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
6192e893ab Fix merge conflicts 
Origin commit data
------------------
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-20 09:01:33 +02: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
vanhofen
2561ecf644 add/use //NI tags instead of /*NI*/; just cosmetic changes 
Origin commit data
------------------
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
 2016-07-31 21:04:37 +02:00
FlatTV
d10aeeaa74 Merge branch 'ni/cst-next' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/cst-next 
Origin commit data
------------------
Commit: cff7efddc4
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)
 2016-07-10 21:44:58 +02:00
FlatTV
bcc4103260 Ask user for storing overlapping CI timer from epg 
Origin commit data
------------------
Commit: 7543aa602c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)
 2016-07-10 21:44:30 +02:00
gixxpunk
bc1e7ce438 use default values for freetype fontcaches (needs testing!) 
Origin commit data
------------------
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!)
 2016-07-07 17:46:18 +02:00
gixxpunk
40036da08d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 8167e518ae
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-06-26 (Sun, 26 Jun 2016)
 2016-06-26 22:14:15 +02:00
Thilo Graf
178163e2da dvbsubtitle.cpp: fix wconversion compiler warnings 
Origin commit data
------------------
Commit: d9aab3ed81
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-16 (Sat, 16 Apr 2016)
 2016-06-26 15:32:35 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
1486711d16 some never read compil warning fixes 
Origin commit data
------------------
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)
 2016-04-24 17:18:37 +02:00
Jacek Jendrzej
e540c57ac0 lib/libdvbsub/tools.h unused 
Origin commit data
------------------
Commit: c804997045
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-16 (Sat, 16 Apr 2016)
 2016-04-16 18:07:16 +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
82ebe8bdd1 libcoolstream2/playback_cs.h: update header 
Origin commit data
------------------
Commit: 9bb3cdf3ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)
 2016-03-28 13:29:57 +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
vanhofen
87689bdf1e adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP 
Origin commit data
------------------
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
 2016-03-03 11:18:15 +01:00
[CST] Focus
e9e0aefec3 libdvbsub/dvbsub.cpp: fix pid reporting on resume 
Origin commit data
------------------
Commit: 5ec81142c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-02 (Tue, 02 Feb 2016)
 2016-02-03 18:29:50 +03:00
Michael Liebmann
52e28a66d3 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)
 2016-01-28 05:32:50 +01:00
Jacek Jendrzej
c0c7698658 jsoncpp.cpp: re-apply gcc version compil fix 
Origin commit data
------------------
Commit: 4a72274efb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
 2016-01-26 14:11:33 +01: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
Michael Liebmann
3ca5ce864c Revert 'Adapt neutrino-mp for CST hardware part #2' 
This reverts commit 1668e85cfd


Origin commit data
------------------
Commit: 3c4105a689
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
 2016-01-26 05:50:38 +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
Stefan Seyfried
830b755fa8 hardware_caps: more boxtypes, add boxarch 
Origin commit data
------------------
Commit: 71d4ec8339
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)
 2016-01-22 19:48:09 +01:00
Stefan Seyfried
f479246ae8 Merge remote-tracking branch 'n/cst-next' 
Origin commit data
------------------
Commit: 353b083620
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 19:10:10 +01:00
Michael Liebmann
6cf6d45f06 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: a2476a2dfd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 15:35:32 +01:00
gixxpunk
2b0719673a re-apply 05548822da 
Origin commit data
------------------
Commit: 43bf709669
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- re-apply 05548822da
 2016-01-16 15:25:30 +01:00
gixxpunk
4e89964840 jsoncpp: update to 0.10.5 
Origin commit data
------------------
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
 2016-01-16 15:25:30 +01:00
Stefan Seyfried
39dc8769cc Merge remote-tracking branch 'cst-next' 
Origin commit data
------------------
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 12:51:04 +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
1668e85cfd 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
------------------
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
 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
Michael Liebmann
3c98408295 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 07:22:31 +01:00
Stefan Seyfried
50df4dfbb0 replace __FILE__ with __file__ 
Origin commit data
------------------
Commit: 70b7f74362
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
df903525f5 port HWLIB_CFLAGS from neutrino-mp to neutrino-hd 
Origin commit data
------------------
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
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
05548822da jsoncpp: use own assert() macro which does not abort 
Origin commit data
------------------
Commit: 73b5303cfc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
9b3887e35f jsoncpp: use own assert() macro which does not abort 
Origin commit data
------------------
Commit: 80d65e33ed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 19:35:09 +01:00
Stefan Seyfried
50380667ec replace __FILE__ with __file__ 
Origin commit data
------------------
Commit: 25e6f0e820
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 19:34:31 +01:00
Stefan Seyfried
69a607474f 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
------------------
Commit: aab075bd70
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)
 2016-01-02 11:31:40 +01:00