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
Jacek Jendrzej
3905eb0fda fix some possible errors 
Origin commit data
------------------
Commit: d5d6c4de62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
 2014-11-06 14:40:44 +01:00
martii
f717d3598f experimental yt cache (currently no gui integration) 
Conflicts:
	src/gui/moviebrowser.cpp
	src/gui/movieinfo.cpp
	src/system/Makefile.am


Origin commit data
------------------
Commit: 70e5e66327
Author: martii <m4rtii@gmx.de>
Date: 2013-06-12 (Wed, 12 Jun 2013)
 2014-09-24 19:50:34 +04:00
martii
67ea8dd650 system/helpers: add mkdirhier(); gui/themes: use mkdirhier() 
Conflicts:
	src/system/helpers.h


Origin commit data
------------------
Commit: 431657e35d
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
 2014-09-12 15:59:21 +04:00
martii
bb0239bd4c gui/dboxinfo: localize (partially based on patch from Benny -- thanks!) 
Conflicts:
	src/gui/dboxinfo.cpp


Origin commit data
------------------
Commit: 742760dbd3
Author: martii <m4rtii@gmx.de>
Date: 2014-05-24 (Sat, 24 May 2014)
 2014-09-11 18:12:06 +04:00
[CST] Focus
34d2776109 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 
Origin commit data
------------------
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
 2014-09-05 17:49:11 +04:00
vanhofen
8b03b47027 helpers.cpp: add shortened strftime() function 
taken from martiis neutrino-mp


Origin commit data
------------------
Commit: 672257906e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-29 (Thu, 29 May 2014)

Origin message was:
------------------
- helpers.cpp: add shortened strftime() function

 taken from martiis neutrino-mp
 2014-05-29 22:26:30 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
[CST] Focus
845848c2b9 system/helpers.cpp: add split_config_string helper 
Origin commit data
------------------
Commit: bef1b79bed
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-23 (Wed, 23 Apr 2014)
 2014-04-23 17:44:16 +04:00
Michael Liebmann
75b3fe663e src/system/helpers.cpp - htmlEntityDecode(): Add various html codes 
Origin commit data
------------------
Commit: 409df1b809
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-03-02 (Sun, 02 Mar 2014)
 2014-03-03 20:20:57 +01:00
Stefan Seyfried
14d60eff3e my_popen: fix indentation 
Origin commit data
------------------
Commit: 04fd8c277c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)
 2014-03-01 21:17:56 +01:00
Michael Liebmann
77f8ef3aa3 src/system/helpers.cpp: Add htmlEntityDecode() for decode html string 
Origin commit data
------------------
Commit: 0028ad0d9b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-26 (Wed, 26 Feb 2014)
 2014-02-26 10:11:40 +01:00
Michael Liebmann
4e6195aabe src/system/helpers.cpp: Add str_replace() function 
Origin commit data
------------------
Commit: 21f7c930ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-26 (Wed, 26 Feb 2014)
 2014-02-26 10:11:40 +01:00
Stefan Seyfried
24ddec67ad my_popen: fix indentation 
Origin commit data
------------------
Commit: 76b0c36a28
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-02-23 17:24:19 +01:00
Stefan Seyfried
f9595188ff Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: f6d8c02313
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-19 (Wed, 19 Feb 2014)
 2014-02-19 11:29:29 +01:00
Jacek Jendrzej
ce577dface wakeup_hdd: -fix warning -add mode to open 
Origin commit data
------------------
Commit: f1c7e9002e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-18 (Tue, 18 Feb 2014)
 2014-02-18 14:59:11 +01:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
[CST] Focus
0cec69fb19 system/helpers.cpp: change wakeup_hdd function to use hdd_get_standby/hdd_flush 
Origin commit data
------------------
Commit: 10eb8869d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)
 2014-02-12 16:47:28 +04:00
[CST] Focus
3fcb1867b5 system/helpers.cpp: add code to get hdd standby/active status and flush hdd buffers 
Origin commit data
------------------
Commit: 097e05c083
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)
 2014-02-05 14:02:46 +04:00
Stefan Seyfried
473b274f4a Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)
 2014-01-27 21:00:18 +01:00
Michael Liebmann
f06a009b8e helpers.cpp: fix find_executable 
- function made the environment variable PATH broken


Origin commit data
------------------
Commit: 356feceb9c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
 2014-01-27 13:37:32 +01:00
Stefan Seyfried
8af3a15bae CFileHelpers::copyFile: remove duplicated code 
there is no reason I can imagine to distinguish between
large and small files


Origin commit data
------------------
Commit: 2c5e5c8a3f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)
 2014-01-27 11:58:49 +01:00
Stefan Seyfried
50fe384389 CFileHelpers: remove 'doCopyFlag' -- it's always true anyway 
Origin commit data
------------------
Commit: 7625d7782c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)
 2014-01-27 11:33:55 +01:00
Stefan Seyfried
133e7a8522 helpers: add a function to find an executable in $PATH 
Origin commit data
------------------
Commit: e37e425674
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 21:43:08 +01:00
Stefan Seyfried
59b18c3d00 helpers: add a function to find an executable in $PATH 
Origin commit data
------------------
Commit: 1867f687b8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 16:09:48 +01:00
Stefan Seyfried
16942ab183 Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 18:31:31 +01:00
Jacek Jendrzej
25d9e507a0 move toEpoch to helpers.cpp, use strptime 
Origin commit data
------------------
Commit: 52741fb1e4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)
 2014-01-04 20:48:13 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
martii
936cdc41dc more char* -> std::string conversions 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 2cee6929d6
Author: martii <m4rtii@gmx.de>
Date: 2013-06-27 (Thu, 27 Jun 2013)
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
Jacek Jendrzej
cbebe671ac use mySleep in CComponentsFrmClock::initClockThread( 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: ececd844fa
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
 2013-12-15 17:40:32 +01:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 20:17:31 +01:00
vanhofen
ba6a667595 helpers.cpp: port safe_mkdir() from martii 
Origin commit data
------------------
Commit: 57267a28aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-22 (Fri, 22 Nov 2013)

Origin message was:
------------------
- helpers.cpp: port safe_mkdir() from martii
 2013-11-22 12:35:20 +01:00
vanhofen
5efc09d8dc helpers.cpp: simplify check_dir(); ported from martii 
Origin commit data
------------------
Commit: 44cddc05d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-22 (Fri, 22 Nov 2013)

Origin message was:
------------------
- helpers.cpp: simplify check_dir(); ported from martii
 2013-11-22 12:10:26 +01:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
Michael Liebmann
cb7221a3d5 Fix compiler warnings (-Wconversion) 
Origin commit data
------------------
Commit: b645b644b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
 2013-10-10 01:58:37 +02:00
Michael Liebmann
2c767d14d1 src/system/helpers.cpp: Replace wrong data types in get_fs_usage() 
- Change from 'long' to 'uint64_t'
- src/Makefile.am: Add -D_FILE_OFFSET_BITS=64 to AM_CPPFLAGS


Origin commit data
------------------
Commit: 36f3579df6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
 2013-10-10 01:58:37 +02:00
Jacek Jendrzej
7588017b3d CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir 
Origin commit data
------------------
Commit: 6f07cbe3dd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)

Origin message was:
------------------
CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir
 2013-10-08 10:10:10 +02:00
Stefan Seyfried
73c2c16129 system/helpers: add missing include 
Origin commit data
------------------
Commit: 0c939250c2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 20:09:54 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
Michael Liebmann
cecc09af75 helpers.cpp: Add getFileName(), getFileExt(), getNowTimeStr() 
Origin commit data
------------------
Commit: 5d77f01b5d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
 2013-08-08 14:09:47 +02:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
Michael Liebmann
4b6eba3a10 src/system/helpers.cpp: Add getBaseName() and getPathName() 
Origin commit data
------------------
Commit: 767ff03d98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)
 2013-07-03 07:30:09 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Jacek Jendrzej
ad8f946572 CFileHelpers::copyFile - prevent possible compile error 
Origin commit data
------------------
Commit: 476b896972
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-20 (Mon, 20 May 2013)

Origin message was:
------------------
CFileHelpers::copyFile - prevent possible compile error
 2013-05-20 12:07:04 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Jacek Jendrzej
d2ddf2bdc3 src/system/helpers.cpp:-add file_size function 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 947a277a49
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
 2013-04-24 21:35:25 +02:00
Stefan Seyfried
d6d9bf4d84 my_system: cleanup and propagate exitstatus 
Origin commit data
------------------
Commit: aa411cff93
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-04-01 15:42:46 +04:00
Stefan Seyfried
05940c467e helpers: silence compiler warning 
Origin commit data
------------------
Commit: db802eb60a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-03-24 19:26:50 +01:00
Stefan Seyfried
242399690f my_system: cleanup and propagate exitstatus 
Origin commit data
------------------
Commit: e1df8ebafd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-03-24 11:38:09 +01:00
Stefan Seyfried
44d491cc7f my_system: return errno, silence trivial error message 
Origin commit data
------------------
Commit: 94cb301612
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
 2013-03-12 16:31:56 +04:00