Commit Graph

104 Commits

Author SHA1 Message Date
vanhofen
4dc0113a94 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
------------------
Branch: ni/coolstream
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



------------------
This commit was generated by Migit
2017-09-14 16:23:15 +02:00
Michael Liebmann
c69ffa0305 system/helpers.cpp: Add cstr_replace()
- This is a faster C version of str_replace()


Origin commit data
------------------
Branch: ni/coolstream
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()


------------------
This commit was generated by Migit
2017-09-14 15:37:36 +02:00
vanhofen
d97a3de34d 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
------------------
Branch: ni/coolstream
Commit: 43c7e0ed09
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)



------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
47dcb723f0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14473245e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 08:29:51 +01:00
Michael Liebmann
be9e1e020b src/system/helpers.cpp: Add function readLink()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c182785e2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
vanhofen
5708ad998c 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
------------------
Branch: ni/coolstream
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 21:52:59 +01:00
Stefan Seyfried
5f0e41af6a system/helpers: disable GetWidth4FB_HW_ACC()
...will be removed later


Origin commit data
------------------
Branch: ni/coolstream
Commit: e1e2052edb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)



------------------
This commit was generated by Migit
2017-02-14 20:01:55 +01:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
70cbcb6bb5 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
------------------
Branch: ni/coolstream
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
vanhofen
760922196e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:30:01 +01:00
Stefan Seyfried
b6a9ec8038 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
------------------
Branch: ni/coolstream
Commit: 85bb568d02
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:27:45 +01:00
vanhofen
01acc7d9ae 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
------------------
Branch: ni/coolstream
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:22:47 +02:00
Jacek Jendrzej
f8ea2e5650 helpers: 201103L have to_string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80f7d0a299
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 13:41:23 +02:00
vanhofen
f23c56ed95 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 10:06:31 +02:00
Stefan Seyfried
f3c729bab3 system/helpers: allow to build with c++11 compilers
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae345d11d3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 09:55:32 +02:00
Stefan Seyfried
0ed93d8edb helpers.cpp: include fontrenderer.h
if Font class is used, the header should be included, too :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 645da64839
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 09:46:05 +02:00
vanhofen
425c598991 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a43baac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-06 15:41:28 +02:00
Michael Liebmann
d214c7736c 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
------------------
Branch: ni/coolstream
Commit: 6a9c08ae90
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)



------------------
This commit was generated by Migit
2016-09-06 11:32:41 +02:00
Michael Liebmann
b96a91a581 CFileHelpers::removeDir: Better error message
- No error when directory does not exist


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff9a71cd36
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-06 (Tue, 06 Sep 2016)



------------------
This commit was generated by Migit
2016-09-06 11:32:41 +02:00
vanhofen
77b08f221f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22e12bdfa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-05 (Mon, 05 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-05 23:53:07 +02:00
Michael Liebmann
0bfd3c22d6 lua_filehelpers.cpp: Add lua script function 'mkdir()'
- Set Lua api version to 1.52


Origin commit data
------------------
Branch: ni/coolstream
Commit: 906e9a2156
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)



------------------
This commit was generated by Migit
2016-09-05 23:46:01 +02:00
Michael Liebmann
ac62dcec55 lua_filehelpers.cpp: Add lua script function 'rmdir()'
- Set Lua api version to 1.51


Origin commit data
------------------
Branch: ni/coolstream
Commit: 631708f380
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)



------------------
This commit was generated by Migit
2016-09-05 23:46:01 +02:00
Michael Liebmann
daeab68ae7 Use DebugInfo functions in CFileHelpers::cp / lua cp
Origin commit data
------------------
Branch: ni/coolstream
Commit: de07369d68
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-05 23:46:01 +02:00
Michael Liebmann
09777711fe CFileHelpers: Add DebugInfo functions for displaying error messages..
..in lua script functions


Origin commit data
------------------
Branch: ni/coolstream
Commit: 83a902d524
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)



------------------
This commit was generated by Migit
2016-09-05 23:46:01 +02:00
Michael Liebmann
d8e156217f helpers.cpp: Add cp() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5198a13282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-03 (Sat, 03 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-05 23:46:01 +02:00
Michael Liebmann
d6304e8ef7 CFileHelpers::copyFile: Rewrite mode handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64b5d36c52
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-03 (Sat, 03 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-05 23:46:01 +02:00
Michael Liebmann
0d3818862d helpers.cpp: Add itoa() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 38470a8a80
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-03 (Sat, 03 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-05 23:46:01 +02:00
vanhofen
d96b127ca1 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1484a7fa94
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-13 (Sat, 13 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-13 22:25:18 +02:00
Michael Liebmann
8ef5e4b610 Fix commit c3a7bcfd5b
- Use indexes for font parameter in formatDeleteMsg() & cutString()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d5edc29e6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-13 (Sat, 13 Aug 2016)



------------------
This commit was generated by Migit
2016-08-13 16:01:00 +02:00
vanhofen
cd61b5ac07 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: c574728833
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-12 (Fri, 12 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-12 20:53:49 +02:00
Michael Liebmann
c3a7bcfd5b src/system/helpers.cpp: Add cutString() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 71674d0f8a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-12 (Fri, 12 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-12 19:22:48 +02:00
vanhofen
f3917256af helpers: rename get_path() to proper check_var()
Origin commit data
------------------
Branch: ni/coolstream
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()

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

------------------
This commit was generated by Migit
2016-08-11 14:14:12 +02:00
vanhofen
ec73df296a use CFileHelpers::copyFile instead of own function; cleanup helpers
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-08-11 13:52:49 +02:00
vanhofen
4c7c03e2c3 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca22349f35
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-11 12:33:51 +02:00
vanhofen
9a918ab785 movieinfo: more cleanup; use htmlEntityDecode from helpers.cpp
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-08-11 12:32:00 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Michael Liebmann
41784d58c7 src/system/helpers.cpp: Add function Lang2ISO639_1()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53ef02ad2f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-04 14:15:50 +01:00
Michael Liebmann
dbc216d4ae helpers.cpp: Add function SetWith4FB_HW_ACC()
align for hw blit on apollo/kronos hw


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2016-01-26 09:51:48 +01:00
Jacek Jendrzej
8ccea0a934 fix compil fix change 64 to 32
Origin commit data
------------------
Branch: ni/coolstream
Commit: 322b58a598
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-27 (Sun, 27 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-27 13:58:32 +01:00
Jacek Jendrzej
86cc4a8fb9 some gcc5 compil fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddb3c15d4b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-26 17:03:42 +01:00
Michael Liebmann
b59fb9cda4 helpers.cpp: Fix sscanf format string in getJFFS2MountPoint (THX Jacek)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d992a6d13
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-11-07 (Sat, 07 Nov 2015)


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

------------------
This commit was generated by Migit
2015-11-07 10:56:55 +01:00
[CST] Bas
55acf87eac CFileHelpers::createDir: Fix return value
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0180d59111
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)



------------------
This commit was generated by Migit
2015-10-18 21:39:54 +02:00
Michael Liebmann
26e82ad0cf Apollo/Kronos: Display backup options for 'var' and 'root1'...
...only if are mounted.

- Using /proc/mounts to find correct mountpoint for backup


Origin commit data
------------------
Branch: ni/coolstream
Commit: 885f13f6b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-22 (Tue, 22 Sep 2015)



------------------
This commit was generated by Migit
2015-09-22 13:41:14 +02:00
Jacek Jendrzej
367e9f3b6e fix Werror=format
Origin commit data
------------------
Branch: ni/coolstream
Commit: a34b32043a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-22 (Sat, 22 Aug 2015)


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

------------------
This commit was generated by Migit
2015-08-22 15:27:47 +02:00
Jacek Jendrzej
b0e25e796f for debug filesystem
Origin commit data
------------------
Branch: ni/coolstream
Commit: c06e5b1407
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-21 (Fri, 21 Aug 2015)


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

------------------
This commit was generated by Migit
2015-08-21 22:04:04 +02:00
Thilo Graf
819cbeea7d CFileHelpers: rework methode getDirSize(), makes it work recursively
Origin commit data
------------------
Branch: ni/coolstream
Commit: a185ad34d4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:12 +02:00
Thilo Graf
60cec1c1f6 CFileHelpers: add function getDirSize()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b095e725e
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:12 +02:00
Thilo Graf
8031b9fce0 system/helpers.cpp: add return value for mySleep()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9dd6fac39
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:09 +02:00
Thilo Graf
1cc532eea3 system/helpers.cpp: getNowTimeStr(), use thread save localtime version
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3538077821
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:09 +02:00
Thilo Graf
6d07c52a86 system/helpers.cpp: add more possible exexutable paths
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fc8d1bb9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-24 (Mon, 24 Nov 2014)


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

------------------
This commit was generated by Migit
2015-03-29 22:39:57 +02:00