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

400 Commits

Author SHA1 Message Date
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
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
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
vanhofen
25f833735d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 15:14:31 +01:00
Michael Liebmann
a26c4afdd5 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: eb0d7afa95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 06:39:24 +01:00
Stefan Seyfried
08e4d55f88 tuxtxt: remove dead code, unnecessary header includes 
Origin commit data
------------------
Commit: cdc9935b83
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
5709592f5d tuxtxt: remove old, unused input code 
Origin commit data
------------------
Commit: 291eaa0450
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
95d1629a50 tuxtxt: remove old framebuffer device code 
Origin commit data
------------------
Commit: b3a79a3a33
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
b94eb7dd30 tuxtxt: remove unused dmx variable 
Origin commit data
------------------
Commit: dfddc62d0c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
8c63d840c5 libtuxtxt: remove unused fd parameter from tuxtx_main() 
Origin commit data
------------------
Commit: 418819e261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
vanhofen
321a2f470f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 12:29:23 +01:00
Michael Liebmann
2821cf8d16 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: d76c9c536c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 00:11:48 +01:00
Michael Liebmann
8cad1eb1a8 tuxtxt: Use hw blitting with fbCopyArea() for cs hd2 
Origin commit data
------------------
Commit: b7110faaf6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-20 00:09:46 +01:00
vanhofen
298fdbfe36 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 21:52:59 +01:00
Michael Liebmann
b37a04311e tuxtxt: Fix display in 1280x720 mode 
Origin commit data
------------------
Commit: 979bac14f0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 20:24:41 +01:00
Stefan Seyfried
00e83ba596 tuxtxt: convert to int-pointer arithmetic, work with all framebuffers 
This converts the drawing code from byte-pointer to fb_pixel_t-pointer
arithmetic, making the calculations more obvious and probably more
efficient.
Additionally, the color tables are now generated in a way that it should
work regardless of the frame buffer color format. Allows to remove a few
hardware specific #ifdefs.


Origin commit data
------------------
Commit: c977c98217
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:38:03 +01:00
Michael Liebmann
47c93ee999 libtuxtxt: Transfer from neutrino-mp for better compatibility 
Origin commit data
------------------
Commit: 5612baaff7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:38:03 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:01:15 +01:00
Stefan Seyfried
8107c333eb set useful thread names for all spawned threads 
Origin commit data
------------------
Commit: 5188f721c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:55:36 +01:00
Stefan Seyfried
d9503201ca sectionsdclient: remove unused scanMode variable 
Origin commit data
------------------
Commit: 96f86f974e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
 2017-02-12 22:48:55 +01:00
vanhofen
02880bee17 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a0d262c596
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)
 2016-12-20 21:40:42 +01:00
Jacek Jendrzej
ef62628418 lib/libtuxtxt/tuxtxt_common.h fix out of bounds 
Origin commit data
------------------
Commit: 20268781e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-20 (Tue, 20 Dec 2016)
 2016-12-20 16:35:43 +01:00
vanhofen
721e348728 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 00:14:20 +01:00
TangoCash
ec132fe91b add option to read saved epg data frequently 
Origin commit data
------------------
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 19:24:08 +01:00
vanhofen
2a64edef4f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 23:43:57 +01:00
Stefan Seyfried
24d2ccfea6 make sure the private dvb headers are used on coolstream 
Origin commit data
------------------
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 20:30:14 +01:00
vanhofen
6cbee866fd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 11:41:02 +02:00
TangoCash
985775b93c add possibility to add Name,Url,Port, Username and Password if needed. 
Origin commit data
------------------
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)
 2016-10-28 22:20:27 +02:00
vanhofen
da3d97b77e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 21:57:00 +02:00
Stefan Seyfried
8e95fe17f3 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: 944a4e4ecd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-23 17:22:16 +02:00
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
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
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
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