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,888 Commits 2 Branches 9 Tags
ba2cc578d7b9dfb618b757cc8abf0feb451ad9e8
Commit Graph

209 Commits

Author SHA1 Message Date
Michael Liebmann
8641bcd5ee helpers.cpp: Add new functions 
- readFile()
 - parseJsonFromFile()
 - parseJsonFromString()

 parseJsonFromString() and parseJsonFromFile() use Json::CharReader
 instead of the obsolete function Json::Reader


Origin commit data
------------------
Commit: 05d8ed4105
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)

Origin message was:
------------------
helpers.cpp: Add new functions

 - readFile()
 - parseJsonFromFile()
 - parseJsonFromString()

 parseJsonFromString() and parseJsonFromFile() use Json::CharReader
 instead of the obsolete function Json::Reader
 2017-09-19 23:20:39 +02:00
vanhofen
d0dc31ae8d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/update_settings.cpp


Origin commit data
------------------
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 16:30:58 +02:00
vanhofen
fb0a25d759 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 16:23:15 +02:00
Michael Liebmann
2889d6a454 system/helpers.cpp: Add cstr_replace() 
- This is a faster C version of str_replace()


Origin commit data
------------------
Commit: 020936acbe
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
system/helpers.cpp: Add cstr_replace()

 - This is a faster C version of str_replace()
 2017-09-14 15:37:36 +02:00
vanhofen
37bbd787dd helpers.chh/h: add some helper functions 
Partial cherry pick from:
https://bitbucket.org/neutrino-images/ni-neutrino-hd

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 43c7e0ed09
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)
 2017-09-14 12:14:41 +02:00
vanhofen
b72b12a375 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/neutrino.cpp


Origin commit data
------------------
Commit: 134e499be0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:33:33 +01:00
vanhofen
8ea61f3383 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: 14473245e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:29:51 +01:00
Michael Liebmann
1ea4c44450 src/system/helpers.cpp: Add function readLink() 
Origin commit data
------------------
Commit: 0c182785e2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 06:24:48 +01:00
vanhofen
25046a4627 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 22:54:00 +01:00
vanhofen
298fdbfe36 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 21:52:59 +01:00
Stefan Seyfried
fb65402fa0 system/helpers: disable GetWidth4FB_HW_ACC() 
...will be removed later


Origin commit data
------------------
Commit: e1e2052edb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
 2017-02-14 20:01:55 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
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