mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,929 Commits 2 Branches 9 Tags
2691bb1543cdd71caf7942df0a5076534d4c9ed6
Commit Graph

33 Commits

Author SHA1 Message Date
vanhofen
2691bb1543 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: ddbd537865
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 15:53:10 +01:00
vanhofen
60b2661b16 imageinfo_ni: remove obsolete include of daemonc/remotecontrol.h 
Origin commit data
------------------
Commit: 05f695b2e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: remove obsolete include of daemonc/remotecontrol.h
 2017-03-19 01:59:13 +01:00
vanhofen
c570c70958 imageinfo_ni: simplify max_bit handling 
Conflicts:
	src/gui/imageinfo_ni.cpp


Origin commit data
------------------
Commit: a333845440
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: simplify max_bit handling

Conflicts:
	src/gui/imageinfo_ni.cpp
 2017-03-04 00:37:20 +01:00
vanhofen
31d0c2aa84 imageinfo_ni: simplify max_bit handling 
Origin commit data
------------------
Commit: d04afd80ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: simplify max_bit handling
 2017-03-03 23:59:53 +01:00
vanhofen
b24c659002 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/imageinfo_ni.cpp


Origin commit data
------------------
Commit: 6af1f3d5bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 23:37:44 +01:00
vanhofen
0aac919b94 imageinfo_ni: small offset corrections and cleanups 
Origin commit data
------------------
Commit: 47b98e5879
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: small offset corrections and cleanups
 2017-03-03 23:33:41 +01:00
vanhofen
331ac05e51 imageinfo_ni: cleanup info_items struct; ... 
remove obsolete videoDecoder calls


Origin commit data
------------------
Commit: 6039c66423
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: cleanup info_items struct; ...

remove obsolete videoDecoder calls
 2017-03-03 19:00:40 +01:00
vanhofen
42c56bbdaa imageinfo_ni: use OFFSET-defines; auto-calc info_items struct 
Origin commit data
------------------
Commit: c75624cdad
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: use OFFSET-defines; auto-calc info_items struct
 2017-03-03 19:00:40 +01:00
vanhofen
35be383b8a imageinfo_ni: avoid multiple cs_get_revision() calls; ... 
fix small typo


Origin commit data
------------------
Commit: 1100110913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: avoid multiple cs_get_revision() calls; ...

fix small typo
 2017-03-03 19:00:39 +01:00
vanhofen
b079d0307e Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 86bedc2a3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 15:52:12 +01:00
vanhofen
44cb896f1f imageinfo_ni: add yWeb version 
Origin commit data
------------------
Commit: 227f5cbfff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: add yWeb version
 2017-03-03 15:39:42 +01:00
vanhofen
5a751edef7 imageinfo_ni: add Lua-API version 
Origin commit data
------------------
Commit: 49783579a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: add Lua-API version
 2017-03-03 15:39:42 +01:00
vanhofen
ba302de46b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +01:00
vanhofen
e97d93f824 NI-code: Rename hardware defined macros for coolstream stb 
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
 2017-02-12 21:57:06 +01:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 16:45:30 +02:00
vanhofen
d905e7250f imageinfo_ni: align fade code to other fade code 
Origin commit data
------------------
Commit: 25147a0828
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)

Origin message was:
------------------
- imageinfo_ni: align fade code to other fade code
 2016-10-06 21:25:49 +02:00
vanhofen
09ea245a58 imageinfo_ni: adapt changes from 65c4cfec97 
Origin commit data
------------------
Commit: 2c35f36097
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- imageinfo_ni: adapt changes from 65c4cfec97
 2016-10-01 13:09:37 +02:00
vanhofen
dc49f53122 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Commit: e2dfa1c952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)
 2016-09-30 00:12:45 +02:00
vanhofen
7f1e2312a6 imageinfo_ni: allow fade in/out 
Origin commit data
------------------
Commit: ba563ea939
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)

Origin message was:
------------------
- imageinfo_ni: allow fade in/out
 2016-09-29 23:53:26 +02:00
vanhofen
ee27180c94 imageinfo_ni: smoother view when no .version file is found 
Origin commit data
------------------
Commit: 74b5e4acec
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 Sep 2016)

Origin message was:
------------------
- imageinfo_ni: smoother view when no .version file is found
 2016-09-25 01:41:16 +02:00
vanhofen
0153f2f6ee imageinfo_ni: smoother view when no .version file is found 
Origin commit data
------------------
Commit: 66bc6f5512
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 Sep 2016)

Origin message was:
------------------
- imageinfo_ni: smoother view when no .version file is found
 2016-09-25 01:36:49 +02:00
Michael Liebmann
6a97ddf347 imageinfo_ni: Fix memory error 
Reported from AddressSanitizer (heap-use-after-free)


Origin commit data
------------------
Commit: 517e5e7cee
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-24 (Sat, 24 Sep 2016)

Origin message was:
------------------
imageinfo_ni: Fix memory error

 Reported from AddressSanitizer (heap-use-after-free)
 2016-09-25 00:23:45 +02:00
Michael Liebmann
1e086a72d9 imageinfo_ni: Make interface and network speed configurable 
Required for generic hardware


Origin commit data
------------------
Commit: 938cde230d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-24 (Sat, 24 Sep 2016)

Origin message was:
------------------
imageinfo_ni: Make interface and network speed configurable

 Required for generic hardware
 2016-09-25 00:02:42 +02:00
Michael Liebmann
90c2a54f2b imageinfo_ni: Disable paint_DF_Info() 
Required for generic hardware


Origin commit data
------------------
Commit: cb2d840a03
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-24 (Sat, 24 Sep 2016)

Origin message was:
------------------
imageinfo_ni: Disable paint_DF_Info()

 Required for generic hardware
 2016-09-25 00:02:42 +02:00
Michael Liebmann
bc3657b573 imageinfo_ni: Fix memory error 
Reported from AddressSanitizer (heap-use-after-free)


Origin commit data
------------------
Commit: bdce1520d6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-24 (Sat, 24 Sep 2016)

Origin message was:
------------------
imageinfo_ni: Fix memory error

 Reported from AddressSanitizer (heap-use-after-free)
 2016-09-25 00:02:42 +02:00
vanhofen
da7869df22 imageinfo_ni: fix generic build 
Origin commit data
------------------
Commit: 7fd056da17
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-23 (Fri, 23 Sep 2016)

Origin message was:
------------------
- imageinfo_ni: fix generic build
 2016-09-23 19:15:59 +02:00
vanhofen
509d918b3e adapt listModeKey() function to our code 
Origin commit data
------------------
Commit: 9c2cb63adb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- adapt listModeKey() function to our code
 2016-09-09 10:46:12 +02:00
vanhofen
1736faef2b imageinfo_ni: remove unused code around astrasat logo 
Origin commit data
------------------
Commit: 2eb86b4d7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- imageinfo_ni: remove unused code around astrasat logo
 2016-08-26 23:46:41 +02:00
vanhofen
7c2bcd3f0e imageinfo_ni: remove remote-commit info 
Origin commit data
------------------
Commit: 5dd55a6d58
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- imageinfo_ni: remove remote-commit info
 2016-08-26 23:45:33 +02:00
Michael Liebmann
5ee03e8537 CImageInfoNI: Fix display imagesize for root1 sysfs on HD2 hardware 
Origin commit data
------------------
Commit: 66b0cca509
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-23 (Tue, 23 Aug 2016)
 2016-08-23 22:20:11 +02:00
Michael Liebmann
ec7f1939e7 CImageInfoNI::paint_NET_Info: Fix max_bit for hd2 hardware 
Origin commit data
------------------
Commit: 2dbf038eba
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-23 (Tue, 23 Aug 2016)
 2016-08-23 22:20:11 +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