Commit Graph

12527 Commits

Author SHA1 Message Date
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
vanhofen
61a2b10f7e deutsch.locale: adjust EPGPlus.remind
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17ea8e7d63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind

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

------------------
This commit was generated by Migit
2017-09-30 13:18:12 +02:00
Stefan Seyfried
d6b2b1e368 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
------------------
Branch: ni/coolstream
Commit: ab3434e278
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-30 13:14:57 +02:00
vanhofen
d50e1b6cc0 deutsch.locale: adjust EPGPlus.remind
Origin commit data
------------------
Branch: ni/coolstream
Commit: 081ac08d86
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind

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

------------------
This commit was generated by Migit
2017-09-30 10:13:52 +02:00
vanhofen
6458ea748a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa61c39211
Author: vanhofen <vanhofen@gmx.de>
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 09:18:12 +02:00
Stefan Seyfried
ee8a577fef 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
------------------
Branch: ni/coolstream
Commit: fea586b311
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-30 08:19:29 +02:00
vanhofen
9f3ba8341f Revert "Revert "CMenuWidget: simplify menu_left_exit code, add missing break""
This reverts the revert commit 2c554b1ae7.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 39d31166c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)



------------------
This commit was generated by Migit
2017-09-30 08:10:56 +02:00
Stefan Seyfried
8bf6388531 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
------------------
Branch: ni/coolstream
Commit: 0e144e67ad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-29 20:37:37 +02:00
gixxpunk
5275b9fc28 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a15c23be7d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-29 15:25:21 +02:00
Jacek Jendrzej
43eeb40008 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-29 10:49:27 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
vanhofen
c75a12894f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-29 08:35:05 +02:00
vanhofen
369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-09-29 08:27:42 +02:00
vanhofen
d6bf987c5e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2c54a405b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-28 23:43:36 +02:00
vanhofen
97bc00bb1c hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ...
Origin commit data
------------------
Branch: ni/coolstream
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 ...

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

------------------
This commit was generated by Migit
2017-09-28 23:41:24 +02:00
vanhofen
1e1394fb56 several memleak fixes; Dziekuje.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f9cb1dc50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- several memleak fixes; Dziekuje.

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

------------------
This commit was generated by Migit
2017-09-28 15:23:38 +02:00
vanhofen
dcb2262e2f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfe2d81fc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-28 14:43:25 +02:00
Jacek Jendrzej
c9bdd532dc Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 452f155f04
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-28 14:14:20 +02:00
vanhofen
11ec707695 bouqueteditor: clear details in infobox if no channels available
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-09-28 14:12:32 +02:00
vanhofen
6162f07cb0 bouqueteditor: clear details in infobox if no channels available
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91baf27971
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

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

------------------
This commit was generated by Migit
2017-09-28 14:01:05 +02:00
Jacek Jendrzej
e4c46f69bf fix clang compil, use swap()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f26434550
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-28 13:43:51 +02:00
vanhofen
a037d9fd78 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28006917aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-27 14:31:32 +02:00
Jacek Jendrzej
093a970ca5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ae7765460
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-27 14:30:28 +02:00
vanhofen
85e3acf202 menue: only add hint_height to full_height, if we really have a hint
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58e05cfd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint

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

------------------
This commit was generated by Migit
2017-09-27 14:29:51 +02:00