Commit Graph

12900 Commits

Author SHA1 Message Date
vanhofen
f6314ca7c3 neutrino: don't scroll standby/resume text on frontdisplay
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27a16a6f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- neutrino: don't scroll standby/resume text on frontdisplay

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

------------------
This commit was generated by Migit
2017-10-12 00:43:56 +02:00
vanhofen
b9d01bef9a add UHD icons to infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: d367c33842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
TangoCash
4ed39f4feb armbox: fix dimming vfd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 789159e13a
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
TangoCash
09251461c7 armbox: show grafical volume in vfd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07cc235989
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
TangoCash
c8d34a62c3 fix time in vfd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32a7338aae
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
TangoCash
ecafd3840c fix some keys
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f420cdeea
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
TangoCash
13f61e42ea fix resolution icon in infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2faaec888
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
TangoCash
a1ffd4bba0 update webif
Origin commit data
------------------
Branch: ni/coolstream
Commit: d329663148
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-12 00:36:45 +02:00
gixxpunk
440a301827 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6de24c7b7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-11 21:35:55 +02:00
vanhofen
9f046777a0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32414b6a48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-11 (Wed, 11 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-11 20:58:45 +02:00
Jacek Jendrzej
2379818d0c src/gui/upnpbrowser.cpp clear framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47b247472c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-09 17:23:11 +02:00
Jacek Jendrzej
eb6af5c0f9 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16968f9bde
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-09 16:40:11 +02:00
Jacek Jendrzej
50ab515db9 upnpbrowser : fix memleaks
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d81594f12
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-09 16:39:24 +02:00
Jacek Jendrzej
17e4271b00 upnpbrowser : fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3233254c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-09 12:37:35 +02:00
Jacek Jendrzej
eba89b1004 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2661fa4287
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 18:03:01 +02:00
Thilo Graf
6457192afd CUpnpBrowserGui: fix possible compile errot
error: suggest parentheses around ‘&&’ within ‘||’ [-Werror=parentheses]


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbe21aade7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)



------------------
This commit was generated by Migit
2017-10-08 17:48:32 +02:00
Thilo Graf
d83169a67e CTimerList: fix behavior of hide() for remotebox sub menus
After hide() the the background was not fully restored or
was partially damaged the corners beside the header.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d9b7c1360
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)

Origin message was:
------------------
CTimerList: fix behavior of hide() for remotebox sub menus

After hide() the the background was not fully restored or
was partially damaged the corners beside the header.


------------------
This commit was generated by Migit
2017-10-08 17:48:32 +02:00
Thilo Graf
1d2d437547 CTimerList: increase width of remote menu
eg: With oversized font sizes the buttons inside footer are squeezed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b28013da1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)

Origin message was:
------------------
CTimerList: increase width of remote menu

eg: With oversized font sizes the buttons inside footer are squeezed.


------------------
This commit was generated by Migit
2017-10-08 17:48:32 +02:00
Thilo Graf
39191df6e0 CMenuWidget: small clean ups
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ad5ce65e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 17:48:32 +02:00
Jacek Jendrzej
8e0791afea Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3010cd24d7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 16:50:46 +02:00
Jacek Jendrzej
4720ee5d7e fix video folderplay
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea0cd48d18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 16:49:23 +02:00
Jacek Jendrzej
236f997529 src/gui/upnpbrowser.cpp clear framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f1d736781
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-07 (Sat, 07 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 16:49:23 +02:00
Jacek Jendrzej
f41b3ef617 src/gui/upnpbrowser.cpp kill infobox and timebox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a0bcf0dc5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-07 (Sat, 07 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 16:49:23 +02:00
Jacek Jendrzej
05e9551034 src/gui/test_menu.cpp fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74f02a16f5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-07 (Sat, 07 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 16:49:23 +02:00
vanhofen
bf2319a7cc hdd-menu: hide mmcblk devices from hdd-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41646df5e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)

Origin message was:
------------------
- hdd-menu: hide mmcblk devices from hdd-menu

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

------------------
This commit was generated by Migit
2017-10-07 20:52:38 +02:00
vanhofen
e2ec1ddc3b imageinfo-ni: fix crash on ARM_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d0c3fca7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)

Origin message was:
------------------
- imageinfo-ni: fix crash on ARM_HARDWARE

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

------------------
This commit was generated by Migit
2017-10-07 12:15:49 +02:00
TangoCash
fffe6751aa small zapit fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a857cc625
Author: TangoCash <eric@loxat.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-07 12:13:02 +02:00
vanhofen
39f90ef9e7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b6f2568ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-07 10:52:18 +02:00
vanhofen
6893c77389 channelist: fix lcd4l-handling; ...
- lcd4l-setup: re-add missing item to control g_settings.lcd4l_skin_radio


Origin commit data
------------------
Branch: ni/coolstream
Commit: 689986b459
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)

Origin message was:
------------------
- channelist: fix lcd4l-handling; ...

- lcd4l-setup: re-add missing item to control g_settings.lcd4l_skin_radio


------------------
This commit was generated by Migit
2017-10-07 10:50:52 +02:00
TangoCash
f8279b3fab fix gstreamer playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3aa3995156
Author: TangoCash <eric@loxat.de>
Date: 2017-10-06 (Fri, 06 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-06 22:29:41 +02:00
vanhofen
ccb0d0598a Revert "adding 4k video settings for armbox"
This reverts commit d442d4c35f.
Was applied two times by mistake.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a95badc394
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)



------------------
This commit was generated by Migit
2017-10-05 13:26:10 +02:00
TangoCash
8974dc309e fix select osd resolution
Origin commit data
------------------
Branch: ni/coolstream
Commit: 898aadf72d
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-05 12:52:53 +02:00
TangoCash
d442d4c35f adding 4k video settings for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d11c2a1e5
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-05 12:52:53 +02:00
TangoCash
9aa9f8432a adding 4k video settings for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b2bb3f3ca
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-05 12:52:53 +02:00
TangoCash
c04649c451 start implementing hardware acceleration for armbox
you have to compile neutrino with "--enable-reschange" to use FullHD-OSD


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9cc0e702d8
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)



------------------
This commit was generated by Migit
2017-10-05 12:52:53 +02:00
vanhofen
a84d642cff add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09ae4c3a51
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

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

------------------
This commit was generated by Migit
2017-10-05 12:52:53 +02:00
vanhofen
a3487eb052 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e8fde7b21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 23:56:34 +02:00
vanhofen
14f45c39b2 fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: df6bc99337
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)

Origin message was:
------------------
- fix build

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

------------------
This commit was generated by Migit
2017-10-02 23:55:51 +02:00
vanhofen
30b9dbb0b8 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c965d2408d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:24:39 +02:00
vanhofen
0a0c8a13bf Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:21:37 +02:00
vanhofen
463700033b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:19:49 +02:00
Jacek Jendrzej
0145e87bef fix compil after merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ba69b43ec
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 14:23:17 +02:00
Jacek Jendrzej
a91765a685 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 13:56:25 +02:00
Stefan Seyfried
586a1b5a49 helpers/readFile: limit memory allocations
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f39081708
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
vanhofen
6e4cd9f08c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe645c6114
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-01 23:33:28 +02:00
Stefan Seyfried
fbc05fdf7f helpers/readFile: limit memory allocations
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21f04057bd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-01 14:38:52 +02:00
Stefan Seyfried
fb13a5533d remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa240a9457
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-01 14:12:55 +02:00
Stefan Seyfried
df2178a9c0 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 189a4c62d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-01 13:08:15 +02:00
Jacek Jendrzej
f5fc50139e Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08dc0d7561
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-30 13:22:29 +02:00