mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,293 Commits 2 Branches 9 Tags
bff71552d8151742a1b32cfef5ce147a083741cb
Commit Graph

197 Commits

Author SHA1 Message Date
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 08:02:39 +01:00
Stefan Seyfried
8b4c30e093 replace framebuffer.h include with forward declaration 
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-07 17:23:42 +01:00
vanhofen
b0faca6cc0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:32:04 +01:00
vanhofen
ae640b35c1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:30:01 +01:00
Stefan Seyfried
d7d787a05c helpers: add run_pty() function 
This runs an external command inside a pty. Running inside a pty,
external commands using stdio(3) will disable stdout buffering when
running from a terminal, which is often desirable.


Origin commit data
------------------
Commit: 85bb568d02
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:27:45 +01:00
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02:00
vanhofen
ca02e09411 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 12:30:10 +02:00
vanhofen
3d37c18a62 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/osd_setup.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 12:22:47 +02:00
Jacek Jendrzej
afb74c79d8 helpers: 201103L have to_string 
Origin commit data
------------------
Commit: 80f7d0a299
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-24 (Mon, 24 Oct 2016)
 2016-10-24 13:41:23 +02:00
vanhofen
9eae77e776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)
 2016-10-24 10:06:31 +02:00
Stefan Seyfried
b8b787b42b system/helpers: allow to build with c++11 compilers 
Origin commit data
------------------
Commit: ae345d11d3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-24 09:55:32 +02:00
Stefan Seyfried
241bcea831 helpers.cpp: include fontrenderer.h 
if Font class is used, the header should be included, too :-)


Origin commit data
------------------
Commit: 645da64839
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-24 09:46:05 +02:00
Stefan Seyfried
e1f0169491 system/helpers: allow to build with c++11 compilers 
Origin commit data
------------------
Commit: 3684680cb2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 12:23:09 +02:00
Stefan Seyfried
59e3c9c3f4 helpers.cpp: include fontrenderer.h 
if Font class is used, the header should be included, too :-)


Origin commit data
------------------
Commit: 1d5cb34616
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 12:22:06 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
Michael Liebmann
9a8a094be9 CFileHelpers: Rework FileBuf handling 
FileBuf: Reserve memory only when it is needed (copyFile)
copyFile: Reserve for small files, only as much memory as is required


Origin commit data
------------------
Commit: 0a1cdb3d4e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-20 08:03:50 +02:00
Michael Liebmann
5adbe389b8 CFileHelpers::removeDir: Better error message 
- No error when directory does not exist


Origin commit data
------------------
Commit: 79b94cdfad
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-20 08:03:50 +02:00
vanhofen
57dd1c7712 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 3a43baac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:41:28 +02:00
vanhofen
c36373040d Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: fda1cda516
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:24:30 +02:00
Michael Liebmann
daf201ae37 CFileHelpers: Rework FileBuf handling 
FileBuf: Reserve memory only when it is needed (copyFile)
copyFile: Reserve for small files, only as much memory as is required


Origin commit data
------------------
Commit: 6a9c08ae90
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 11:32:41 +02:00
Michael Liebmann
640b0fca59 CFileHelpers::removeDir: Better error message 
- No error when directory does not exist


Origin commit data
------------------
Commit: ff9a71cd36
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 11:32:41 +02:00
vanhofen
b71499ce2e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 22e12bdfa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-05 (Mon, 05 Sep 2016)
 2016-09-05 23:53:07 +02:00
Michael Liebmann
389ef2d93c lua_filehelpers.cpp: Add lua script function 'mkdir()' 
- Set Lua api version to 1.52


Origin commit data
------------------
Commit: 906e9a2156
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)
 2016-09-05 23:46:01 +02:00
Michael Liebmann
a262f1c85a lua_filehelpers.cpp: Add lua script function 'rmdir()' 
- Set Lua api version to 1.51


Origin commit data
------------------
Commit: 631708f380
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)
 2016-09-05 23:46:01 +02:00
Michael Liebmann
0143837e94 Use DebugInfo functions in CFileHelpers::cp / lua cp 
Origin commit data
------------------
Commit: de07369d68
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)
 2016-09-05 23:46:01 +02:00
Michael Liebmann
9dc7398baa CFileHelpers: Add DebugInfo functions for displaying error messages.. 
..in lua script functions


Origin commit data
------------------
Commit: 83a902d524
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)
 2016-09-05 23:46:01 +02:00
Michael Liebmann
f1b6e6a335 helpers.cpp: Add cp() function 
Origin commit data
------------------
Commit: 5198a13282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-03 (Sat, 03 Sep 2016)
 2016-09-05 23:46:01 +02:00
Michael Liebmann
c4d4a3abf6 CFileHelpers::copyFile: Rewrite mode handling 
Origin commit data
------------------
Commit: 64b5d36c52
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-03 (Sat, 03 Sep 2016)
 2016-09-05 23:46:01 +02:00
Michael Liebmann
cba27701a9 helpers.cpp: Add itoa() function 
Origin commit data
------------------
Commit: 38470a8a80
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-03 (Sat, 03 Sep 2016)
 2016-09-05 23:46:01 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
6192e893ab Fix merge conflicts 
Origin commit data
------------------
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-20 09:01:33 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
c50c335863 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 1484a7fa94
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-13 (Sat, 13 Aug 2016)
 2016-08-13 22:25:18 +02:00
Michael Liebmann
894e9cfa29 Fix commit 65891222ab 
- Use indexes for font parameter in formatDeleteMsg() & cutString()


Origin commit data
------------------
Commit: 0d5edc29e6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-13 (Sat, 13 Aug 2016)
 2016-08-13 16:01:00 +02:00
vanhofen
5427e02add Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: c574728833
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-12 (Fri, 12 Aug 2016)
 2016-08-12 20:53:49 +02:00
Michael Liebmann
65891222ab src/system/helpers.cpp: Add cutString() function 
Origin commit data
------------------
Commit: 71674d0f8a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-12 (Fri, 12 Aug 2016)
 2016-08-12 19:22:48 +02:00
vanhofen
586b2344d9 helpers: rename get_path() to proper check_var() 
Origin commit data
------------------
Commit: 48a7068c93
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- helpers: rename get_path() to proper check_var()
 2016-08-11 14:14:12 +02:00
vanhofen
31a80d2f93 use CFileHelpers::copyFile instead of own function; cleanup helpers 
Origin commit data
------------------
Commit: 6d01d59b53
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- use CFileHelpers::copyFile instead of own function; cleanup helpers
 2016-08-11 13:52:49 +02:00
vanhofen
2547a7640c Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: ca22349f35
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)
 2016-08-11 12:33:51 +02:00
vanhofen
3aed41316b movieinfo: more cleanup; use htmlEntityDecode from helpers.cpp 
Origin commit data
------------------
Commit: 22fcc8fe4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- movieinfo: more cleanup; use htmlEntityDecode from helpers.cpp
 2016-08-11 12:32:00 +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
Michael Liebmann
19dcbe2c5e src/system/helpers.cpp: Add function Lang2ISO639_1() 
Origin commit data
------------------
Commit: 53ef02ad2f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)
 2016-03-04 14:15:50 +01:00
Michael Liebmann
e3acf602b2 framebuffer_ng: use hardware accel for blitBox2FB() 
Origin commit data
------------------
Commit: 605eb0c831
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)
 2016-01-28 14:15:49 +01:00
Michael Liebmann
52e28a66d3 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)
 2016-01-28 05:32:50 +01:00
Michael Liebmann
3f8b67f627 helpers.cpp: Add function SetWith4FB_HW_ACC() 
align for hw blit on apollo/kronos hw


Origin commit data
------------------
Commit: 2c23f339d3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)

Origin message was:
------------------
helpers.cpp: Add function SetWith4FB_HW_ACC()

 align for hw blit on apollo/kronos hw
 2016-01-26 09:51:48 +01:00
Stefan Seyfried
e5e27e39e1 helpers: fix printf type warning 
There is no portable way to do this without a cast, and since
64bit filesystem magic numbers exist, cast to an at least 64bit
sized type (unsigned long long).


Origin commit data
------------------
Commit: be8db2598f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
 2015-12-28 16:21:58 +01:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
 2015-12-28 16:15:14 +01:00
Jacek Jendrzej
ba37f4015e fix compil fix change 64 to 32 
Origin commit data
------------------
Commit: 322b58a598
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-27 (Sun, 27 Dec 2015)
 2015-12-27 13:58:32 +01:00
Jacek Jendrzej
74678238cf some gcc5 compil fixes 
Origin commit data
------------------
Commit: ddb3c15d4b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)
 2015-12-26 17:03:42 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00