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
14,696 Commits 2 Branches 9 Tags
42cef709611d07c62b803c795b757fd62c978688
Commit Graph

180 Commits

Author SHA1 Message Date
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
Michael Liebmann
e006bec857 helpers.cpp: Fix sscanf format string in getJFFS2MountPoint (THX Jacek) 
Origin commit data
------------------
Commit: 1d992a6d13
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-11-07 (Sat, 07 Nov 2015)
 2015-11-07 10:56:55 +01:00
[CST] Bas
ad6e938a09 CFileHelpers::createDir: Fix return value 
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Commit: 0180d59111
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2015-10-18 (Sun, 18 Oct 2015)
 2015-10-18 21:39:54 +02:00
Michael Liebmann
bb98d815e2 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
------------------
Commit: 885f13f6b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-22 (Tue, 22 Sep 2015)
 2015-09-22 13:41:14 +02:00
Jacek Jendrzej
61eada7a16 fix Werror=format 
Origin commit data
------------------
Commit: a34b32043a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-22 (Sat, 22 Aug 2015)
 2015-08-22 15:27:47 +02:00
Jacek Jendrzej
328d3ceaf6 for debug filesystem 
Origin commit data
------------------
Commit: c06e5b1407
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-21 (Fri, 21 Aug 2015)
 2015-08-21 22:04:04 +02:00
Thilo Graf
5977418188 CFileHelpers: rework methode getDirSize(), makes it work recursively 
Origin commit data
------------------
Commit: a185ad34d4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-03-29 22:40:12 +02:00
Thilo Graf
65900171d0 CFileHelpers: add function getDirSize() 
Origin commit data
------------------
Commit: 1b095e725e
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-03-29 22:40:12 +02:00
Thilo Graf
91b7a8b590 system/helpers.cpp: add return value for mySleep() 
Origin commit data
------------------
Commit: c9dd6fac39
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)
 2015-03-29 22:40:09 +02:00
Thilo Graf
a1768cc6bd system/helpers.cpp: getNowTimeStr(), use thread save localtime version 
Origin commit data
------------------
Commit: 3538077821
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)
 2015-03-29 22:40:09 +02:00
Thilo Graf
67055afda8 system/helpers.cpp: add more possible exexutable paths 
Origin commit data
------------------
Commit: 6fc8d1bb9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-24 (Mon, 24 Nov 2014)
 2015-03-29 22:39:57 +02:00
Thilo Graf
39524dc80c system/helpers: remove mkdirhier(); gui/themes: use createDir() 
This is a partial revert of
picked commit 67ea8dd650.
There were two methods, createDir() and mkdirhier() for the same purpose.
We don't need it twice.
btw: existing function createDir() fixed


Origin commit data
------------------
Commit: 1dcfc52a33
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-28 (Fri, 28 Nov 2014)
 2015-03-29 22:39:48 +02:00
Stefan Seyfried
8a9e640b18 helpers: add "backtick" function for shell-like command 
Origin commit data
------------------
Commit: f607fe5fbe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-09 13:47:32 +01:00
Stefan Seyfried
b3d4ca270a helpers: add "backtick" function for shell-like command 
Origin commit data
------------------
Commit: ce382cc2cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 13:05:53 +01:00
Stefan Seyfried
77aec57555 picview/png, my_popen: fix -Wclobbered warnings 
Origin commit data
------------------
Commit: fe5a6ec111
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-02-04 12:35:51 +01:00
Stefan Seyfried
5386735721 picview/png, my_popen: fix -Wclobbered warnings 
Origin commit data
------------------
Commit: 283a6c30eb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 19:30:23 +01:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00