mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,532 Commits 2 Branches 9 Tags
74e1459db124f176bed1e86b15c581cfd0cb529c
Commit Graph

12532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jacek Jendrzej
419a1fe9af Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 08dc0d7561
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)
 2017-09-30 13:22:29 +02:00
vanhofen
ffcc694393 deutsch.locale: adjust EPGPlus.remind 
Origin commit data
------------------
Commit: 17ea8e7d63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
 2017-09-30 13:18:12 +02:00
Stefan Seyfried
c4e6ecdf63 CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: ab3434e278
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-30 13:14:57 +02:00
vanhofen
efe62f6905 deutsch.locale: adjust EPGPlus.remind 
Origin commit data
------------------
Commit: 081ac08d86
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
 2017-09-30 10:13:52 +02:00
vanhofen
0a7d0a149a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: aa61c39211
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)
 2017-09-30 09:18:12 +02:00
Stefan Seyfried
57e71ff625 CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: fea586b311
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-30 08:19:29 +02:00
vanhofen
b4363c5dc4 Revert "Revert "CMenuWidget: simplify menu_left_exit code, add missing break"" 
This reverts the revert commit ab4decf40e.


Origin commit data
------------------
Commit: 39d31166c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)
 2017-09-30 08:10:56 +02:00
Stefan Seyfried
603430617b CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: 0e144e67ad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 20:37:37 +02:00
gixxpunk
7744c61ce9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a15c23be7d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 15:25:21 +02:00
Jacek Jendrzej
384b18ad8e Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 10:49:27 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 10:34:23 +02:00
vanhofen
9351a0bf31 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 08:35:05 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 08:27:42 +02:00
vanhofen
d639455da5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d2c54a405b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 23:43:36 +02:00
vanhofen
cce794bbac hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ... 
Origin commit data
------------------
Commit: 54606af779
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ...
 2017-09-28 23:41:24 +02:00
vanhofen
c1535b5567 several memleak fixes; Dziekuje. 
Origin commit data
------------------
Commit: 0f9cb1dc50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- several memleak fixes; Dziekuje.
 2017-09-28 15:23:38 +02:00
vanhofen
cce7d1b424 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: bfe2d81fc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 14:43:25 +02:00
Jacek Jendrzej
2417d86939 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 452f155f04
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 14:14:20 +02:00
vanhofen
c1f30d17dd bouqueteditor: clear details in infobox if no channels available 
Origin commit data
------------------
Commit: 386c2b4d09
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- bouqueteditor: clear details in infobox if no channels available
 2017-09-28 14:12:32 +02:00