Commit Graph

12551 Commits

Author SHA1 Message Date
vanhofen
18bbbbabfe audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.


Origin commit data
------------------
Commit: e264e6334b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.
2017-10-12 08:52:32 +02:00
vanhofen
a20b55bb75 neutrino: don't scroll standby/resume text on frontdisplay
Origin commit data
------------------
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
2017-10-12 00:43:56 +02:00
vanhofen
8045ab1dd5 add UHD icons to infoviewer
Origin commit data
------------------
Commit: d367c33842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer
2017-10-12 00:36:45 +02:00
TangoCash
503a8ebbec armbox: fix dimming vfd
Origin commit data
------------------
Commit: 789159e13a
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
TangoCash
dd711fdfad armbox: show grafical volume in vfd
Origin commit data
------------------
Commit: 07cc235989
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
TangoCash
576735795e fix time in vfd
Origin commit data
------------------
Commit: 32a7338aae
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
TangoCash
8d89f95aae fix some keys
Origin commit data
------------------
Commit: 8f420cdeea
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
TangoCash
8ab431151d fix resolution icon in infoviewer
Origin commit data
------------------
Commit: d2faaec888
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
TangoCash
9d0691f1ef update webif
Origin commit data
------------------
Commit: d329663148
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
gixxpunk
c2a44aa4d8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a6de24c7b7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)
2017-10-11 21:35:55 +02:00
vanhofen
659076d4e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Commit: 32414b6a48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-11 (Wed, 11 Oct 2017)
2017-10-11 20:58:45 +02:00
Jacek Jendrzej
2f8ff62802 src/gui/upnpbrowser.cpp clear framebuffer
Origin commit data
------------------
Commit: 47b247472c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)
2017-10-09 17:23:11 +02:00
Jacek Jendrzej
1c28e16adb Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 16968f9bde
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)
2017-10-09 16:40:11 +02:00
Jacek Jendrzej
f3812c8637 upnpbrowser : fix memleaks
Origin commit data
------------------
Commit: 6d81594f12
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)
2017-10-09 16:39:24 +02:00
Jacek Jendrzej
a2d10f6cb0 upnpbrowser : fix memleak
Origin commit data
------------------
Commit: d3233254c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-09 (Mon, 09 Oct 2017)
2017-10-09 12:37:35 +02:00
Jacek Jendrzej
df4543b5e5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2661fa4287
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)
2017-10-08 18:03:01 +02:00
Thilo Graf
1d5474a66d CUpnpBrowserGui: fix possible compile errot
error: suggest parentheses around ‘&&’ within ‘||’ [-Werror=parentheses]


Origin commit data
------------------
Commit: cbe21aade7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)
2017-10-08 17:48:32 +02:00
Thilo Graf
d5b66e14c8 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
------------------
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.
2017-10-08 17:48:32 +02:00
Thilo Graf
cc07da60f5 CTimerList: increase width of remote menu
eg: With oversized font sizes the buttons inside footer are squeezed.


Origin commit data
------------------
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.
2017-10-08 17:48:32 +02:00
Thilo Graf
e650c02ba8 CMenuWidget: small clean ups
Origin commit data
------------------
Commit: 4ad5ce65e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)
2017-10-08 17:48:32 +02:00
Jacek Jendrzej
d299bb89a0 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 3010cd24d7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)
2017-10-08 16:50:46 +02:00
Jacek Jendrzej
85df730d64 fix video folderplay
Origin commit data
------------------
Commit: ea0cd48d18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)
2017-10-08 16:49:23 +02:00
Jacek Jendrzej
fe14e966ca src/gui/upnpbrowser.cpp clear framebuffer
Origin commit data
------------------
Commit: 7f1d736781
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-07 (Sat, 07 Oct 2017)
2017-10-08 16:49:23 +02:00
Jacek Jendrzej
f3786a44f7 src/gui/upnpbrowser.cpp kill infobox and timebox
Origin commit data
------------------
Commit: 9a0bcf0dc5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-07 (Sat, 07 Oct 2017)
2017-10-08 16:49:23 +02:00
Jacek Jendrzej
17484d3983 src/gui/test_menu.cpp fix memleak
Origin commit data
------------------
Commit: 74f02a16f5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-07 (Sat, 07 Oct 2017)
2017-10-08 16:49:23 +02:00
vanhofen
9d5ad038f5 hdd-menu: hide mmcblk devices from hdd-menu
Origin commit data
------------------
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
2017-10-07 20:52:38 +02:00
vanhofen
134255cd48 imageinfo-ni: fix crash on ARM_HARDWARE
Origin commit data
------------------
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
2017-10-07 12:15:49 +02:00
TangoCash
a59845b271 small zapit fix
Origin commit data
------------------
Commit: 4a857cc625
Author: TangoCash <eric@loxat.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)
2017-10-07 12:13:02 +02:00
vanhofen
248ce462c2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 8b6f2568ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)
2017-10-07 10:52:18 +02:00
vanhofen
581ca06b84 channelist: fix lcd4l-handling; ...
- lcd4l-setup: re-add missing item to control g_settings.lcd4l_skin_radio


Origin commit data
------------------
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
2017-10-07 10:50:52 +02:00
TangoCash
877145289f fix gstreamer playback
Origin commit data
------------------
Commit: 3aa3995156
Author: TangoCash <eric@loxat.de>
Date: 2017-10-06 (Fri, 06 Oct 2017)
2017-10-06 22:29:41 +02:00
vanhofen
5a4a60e979 Revert "adding 4k video settings for armbox"
This reverts commit 2e19a1eb69.
Was applied two times by mistake.


Origin commit data
------------------
Commit: a95badc394
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
2017-10-05 13:26:10 +02:00
TangoCash
4e221b3849 fix select osd resolution
Origin commit data
------------------
Commit: 898aadf72d
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
2017-10-05 12:52:53 +02:00
TangoCash
2e19a1eb69 adding 4k video settings for armbox
Origin commit data
------------------
Commit: 3d11c2a1e5
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
2017-10-05 12:52:53 +02:00
TangoCash
b575ff847f adding 4k video settings for armbox
Origin commit data
------------------
Commit: 3b2bb3f3ca
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
2017-10-05 12:52:53 +02:00
TangoCash
ae2405aea6 start implementing hardware acceleration for armbox
you have to compile neutrino with "--enable-reschange" to use FullHD-OSD


Origin commit data
------------------
Commit: 9cc0e702d8
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
2017-10-05 12:52:53 +02:00
vanhofen
7fcd8dea4c add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
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
2017-10-05 12:52:53 +02:00
vanhofen
384333992b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 1e8fde7b21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:56:34 +02:00
vanhofen
5cd7e219d8 fix build
Origin commit data
------------------
Commit: df6bc99337
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)

Origin message was:
------------------
- fix build
2017-10-02 23:55:51 +02:00
vanhofen
a41a628385 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
------------------
Commit: c965d2408d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:24:39 +02:00
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 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
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:19:49 +02:00
Jacek Jendrzej
c42d23b8e8 fix compil after merge
Origin commit data
------------------
Commit: 5ba69b43ec
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 14:23:17 +02:00
Jacek Jendrzej
f4c51e829b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 13:56:25 +02:00
Stefan Seyfried
80df05e950 helpers/readFile: limit memory allocations
Origin commit data
------------------
Commit: 2f39081708
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-02 13:43:57 +02:00
Stefan Seyfried
c9d4fdd9cc 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
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-02 13:43:57 +02:00
vanhofen
6c4264a4cd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: fe645c6114
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-01 23:33:28 +02:00
Stefan Seyfried
eff7a174b2 helpers/readFile: limit memory allocations
Origin commit data
------------------
Commit: 21f04057bd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-01 14:38:52 +02:00
Stefan Seyfried
73cfd63885 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
------------------
Commit: aa240a9457
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-01 14:12:55 +02:00
Stefan Seyfried
831e9865f9 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 189a4c62d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-01 13:08:15 +02:00