mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,670 Commits 2 Branches 9 Tags
a64b6ebcbbafaecc4da4bc00abb733b83139337f
Commit Graph

164 Commits

Author SHA1 Message Date
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
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
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
5cab4c3416 move FLAGDIR definition to global.h; ... 
... use CTouchFileNotifier to handle .hddpower flagfile


Origin commit data
------------------
Commit: 0cdacc196e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-25 (Wed, 25 May 2016)

Origin message was:
------------------
- move FLAGDIR definition to global.h; ...

... use CTouchFileNotifier to handle .hddpower flagfile
 2016-05-25 23:15:37 +02:00
vanhofen
88acd8beb3 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: d8170ad6cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)
 2016-05-21 21:47:22 +02:00
vanhofen
b4013d8f99 hdd_menu: add key confirmation to hdd-check result 
Origin commit data
------------------
Commit: 5b6421b8b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)

Origin message was:
------------------
- hdd_menu: add key confirmation to hdd-check result
 2016-05-21 21:42:27 +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
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
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ... 
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.
 2015-04-24 09:11:04 +02:00
Stefan Seyfried
98fe56c38b Merge remote-tracking branch 'test/cst-next' 
Origin commit data
------------------
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)
 2015-03-07 20:09:44 +01:00
vanhofen
8e7c58536f hdd_menu: resort filesystem struct, to get ext4 as default value 
Origin commit data
------------------
Commit: b07943807e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-02 (Mon, 02 Mar 2015)

Origin message was:
------------------
- hdd_menu: resort filesystem struct, to get ext4 as default value
 2015-03-02 12:28:28 +01:00
Stefan Seyfried
be57772407 remove useless sync() calls 
unless we had serious kernel bugs, those sync() calls
serve no useful purpose


Origin commit data
------------------
Commit: ae21edb141
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)
 2015-02-25 21:43:41 +01:00
Stefan Seyfried
48d97e8727 hdd_menu: fix device name on fdisk invocation 
Origin commit data
------------------
Commit: d1836f497c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-22 (Sun, 22 Feb 2015)
 2015-02-22 18:47:29 +01:00
Stefan Seyfried
2dbff76c62 hdd_menu: use realpath(3) instead of calling system("readlink") 
Origin commit data
------------------
Commit: f8066b5a3e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-10 14:11:20 +01:00
[CST] Focus
9d673f4af3 Revert "hdd_menu: only offer filesystems with kernel support" 
- breaks user-space fs like exfat

This reverts commit 6e6432ad22.


Origin commit data
------------------
Commit: 6d287e46f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-10 15:07:28 +03:00
[CST] Focus
3080f9cca0 Revert "hdd_menu: fix is_mounted for device links" 
- broken in case readlink do not support -f switch -> filesystem always 'mounted'

This reverts commit 0a1acb6995.


Origin commit data
------------------
Commit: 990e79aa6f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-10 15:05:05 +03:00
[CST] Focus
a6e566327f Revert "hdd_menu: do not handle the rootfs or fs without kernel support" 
This reverts commit 00ab65d5e2.


Origin commit data
------------------
Commit: 342180a28b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-10 15:04:52 +03:00
Stefan Seyfried
d99c4c0b4b hdd_menu: my_popen() needs waitpid to avoid zombies 
Origin commit data
------------------
Commit: d411f6d996
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
00ab65d5e2 hdd_menu: do not handle the rootfs or fs without kernel support 
Origin commit data
------------------
Commit: f7bb7a70cb
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
0a1acb6995 hdd_menu: fix is_mounted for device links 
It is possible to mount e.g. '/dev/disk/by-label/ext_drive', but
is_mounted did not handle this case. Fix that.


Origin commit data
------------------
Commit: 415e7351e1
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
a6a6c91e29 hdd_menu: also recognize recordingdir if it is a symlink 
...like "/media/by-label/foo/movies", no need to reset configuration
in that case


Origin commit data
------------------
Commit: 17395a7fed
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
6e6432ad22 hdd_menu: only offer filesystems with kernel support 
Origin commit data
------------------
Commit: 141872565e
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
e44fa6ac21 mdev_helper/hdd_menu: add udev support 
busybox/mdev fills the MDEV variable without /dev/ prefix,
udev fills DEVNAME with /dev/ prefix. Handle both variants.


Origin commit data
------------------
Commit: d04f7406a7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-02-09 13:47:32 +01:00
Stefan Seyfried
89b4537e54 hdd_menu: do not handle the rootfs or fs without kernel support 
Origin commit data
------------------
Commit: 4675f403a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 15:22:15 +01:00
Stefan Seyfried
e72a0044b9 hdd_menu: fix is_mounted for device links 
It is possible to mount e.g. '/dev/disk/by-label/ext_drive', but
is_mounted did not handle this case. Fix that.


Origin commit data
------------------
Commit: 33730236d6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 15:11:37 +01:00
Stefan Seyfried
5afd62fa80 hdd_menu: also recognize recordingdir if it is a symlink 
...like "/media/by-label/foo/movies", no need to reset configuration
in that case


Origin commit data
------------------
Commit: b3c82180a5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 13:07:51 +01:00
Stefan Seyfried
a2e6a4002c hdd_menu: only offer filesystems with kernel support 
Origin commit data
------------------
Commit: 619e2a0234
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 12:27:03 +01:00
Stefan Seyfried
fe8668a6e1 hdd_menu: my_popen() needs waitpid to avoid zombies 
Origin commit data
------------------
Commit: 67bd1738a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)
 2015-02-08 00:55:44 +01:00
Stefan Seyfried
8062f3509f mdev_helper/hdd_menu: add udev support 
busybox/mdev fills the MDEV variable without /dev/ prefix,
udev fills DEVNAME with /dev/ prefix. Handle both variants.


Origin commit data
------------------
Commit: 48d3e45eb7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-02-07 21:38:33 +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
martii
69f917f16d drop explicit CMenuForwarder icon assignments 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
 2014-09-15 11:44:08 +04:00
[CST] Focus
727027345c gui/hdd_menu.cpp: prevent divide by zero 
Origin commit data
------------------
Commit: 9b697fb52b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)
 2014-09-12 11:35:58 +04:00
[CST] Focus
2d45ae2c35 gui/hdd_menu.cpp: ask to set recording path after mount (hotplug or format) 
Origin commit data
------------------
Commit: 05558331f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-30 (Fri, 30 May 2014)
 2014-05-30 14:57:17 +04:00
Jacek Jendrzej
3e5f28fefa src/gui/hdd_menu.cpp: remove '\n' for all msg 
Origin commit data
------------------
Commit: 8acad336ba
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-05-10 (Sat, 10 May 2014)

Origin message was:
------------------
src/gui/hdd_menu.cpp: remove '\n' for all msg
 2014-05-10 19:25:59 +02:00
[CST] Focus
cfcf86f38f gui/hdd_menu.cpp: add question to set record directory to formatted drive; 
mark partition used for recording with icon, disable umount


Origin commit data
------------------
Commit: bbcd7330a8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-01 (Thu, 01 May 2014)
 2014-05-01 19:03:09 +04:00
[CST] Focus
630f60bbce gui/hdd_menu.cpp: add question and show format menu, if plugged device not mounted 
Origin commit data
------------------
Commit: 55167990b5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
 2014-04-30 17:15:25 +04:00
[CST] Focus
47630508ee gui/hdd_menu.cpp: add mount point mkdir, if mdev not used 
Origin commit data
------------------
Commit: ea9e950fd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-29 (Tue, 29 Apr 2014)
 2014-04-29 13:44:50 +04: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
0b24eecd2e gui/hdd_menu.cpp: convert to singleton; 
add basic notify about device hotplug/remove


Origin commit data
------------------
Commit: 6be2b32cd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-23 (Wed, 23 Apr 2014)
 2014-04-23 17:44:24 +04:00
[CST] Focus
f97cbd209b gui/hdd_menu.cpp: fix menu, if format canceled; 
add xfs tools;
change progress messages to commands executed

Conflicts:
	src/gui/hdd_menu.cpp


Origin commit data
------------------
Commit: 9257d21c9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-15 (Tue, 15 Apr 2014)
 2014-04-16 18:12:50 +04:00
Jacek Jendrzej
beb6dab48b compil fix withot mdev 
Origin commit data
------------------
Commit: b58e9b612c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-15 (Tue, 15 Apr 2014)
 2014-04-15 15:57:20 +02:00
[CST] Focus
3406e2b5ef gui/hdd_menu.cpp: rework HDD menu, add device mount/umount, 
add support for mmc and DVD/BD devices, make easy to add other filesystems mkfs/fsck,
parts based on code (C) martii


Origin commit data
------------------
Commit: 37fb9ddc87
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-14 (Mon, 14 Apr 2014)
 2014-04-14 14:19:09 +04:00
vanhofen
9d4345bed8 hdd_menu: fix hdd_sleep 'off' 
Origin commit data
------------------
Commit: ea89eae41e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- hdd_menu: fix hdd_sleep 'off'
 2014-03-06 09:59:18 +01:00
Stefan Seyfried
99781688bb hdd_menu: better error message 
...when trying to check unsupported file system type


Origin commit data
------------------
Commit: 64a61f5aa2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-03-01 21:17:11 +01:00
Stefan Seyfried
37eb35403c hdd_menu: improve error resilience in getFmtType() 
Origin commit data
------------------
Commit: a25bc90d7b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)
 2014-03-01 21:16:29 +01:00
Stefan Seyfried
2643ecf237 hdd_menu: improve error resilience in getFmtType() 
Origin commit data
------------------
Commit: 2f09cf0a2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-02-23 17:58:06 +01:00
Stefan Seyfried
3e72d09d5f hdd_menu: better error message 
...when trying to check unsupported file system type


Origin commit data
------------------
Commit: 0daee84364
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-02-23 17:57:02 +01:00
Stefan Seyfried
6f0f56cb4b hdd_menu: don't hardcode tool paths 
use find_executable() instead of hardcoding the paths to
mkfs, fsck and blkid


Origin commit data
------------------
Commit: 961ba97e9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-02-23 17:26:13 +01:00
Stefan Seyfried
f853d06d3b Merge remote-tracking branch 'check/next-cc' 
broken, needs buildfixing


Origin commit data
------------------
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-02-23 15:17:48 +01:00
Michael Liebmann
230c7e7770 hddmenu: Support ext4 for formating disk 
- Support ext4 for formating disk (require /sbin/mkfs.ext4)
- Support ext4 for check disk (require /sbin/fsck.ext4 or /sbin/e2fsck)
- Display disk format in menu (require /sbin/blkid)
- 'ext4' and 'display disk format' disabled when required files not present


Origin commit data
------------------
Commit: 7c5d29a687
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 00:02:46 +01:00