Commit Graph

195 Commits

Author SHA1 Message Date
Stefan Seyfried
02571e6695 add menu option to delete 'removed channels'
Origin commit data
------------------
Commit: 1c58f5f093
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-14 12:46:10 +02:00
Stefan Seyfried
d3531638eb neutrino: fix most hardcoded paths
Origin commit data
------------------
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 02:01:52 +01:00
[CST] Focus
a3aba8fba3 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:57 +04:00
Stefan Seyfried
9c0fbe8943 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-05 11:58:49 +01:00
Stefan Seyfried
811e75380e helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.


Origin commit data
------------------
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-03 19:18:13 +01:00
[CST] Focus
fefca6f427 system/setting_helpers.cpp: fix unused warning on apollo
Origin commit data
------------------
Commit: ced8b191b1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 17:53:56 +04:00
[CST] Focus
bd43e4ecc8 system/setting_helpers.cpp: use CONFIGDIR to remove xml/conf files
Origin commit data
------------------
Commit: 4b10e2e7c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:48:00 +04:00
[CST] Focus
d73595385a system/setting_helpers.cpp: dont use IOC_CONTROL_PWM_SPEED on apollo
Origin commit data
------------------
Commit: 093eae2ebc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
2013-01-16 15:52:06 +04:00
[CST] Focus
d3a71db0b1 merge public git changes
Origin commit data
------------------
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
2013-01-09 19:30:07 +04:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
2012-12-30 21:35:20 +01:00
[CST] Focus
78df5464c5 system/setting_helpers.cpp: fix timezone change
Origin commit data
------------------
Commit: 20c25334cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-27 (Thu, 27 Dec 2012)
2012-12-27 12:15:37 +04:00
Michael Liebmann
7332aea363 Fix include path for moved header files
Origin commit data
------------------
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
* Fix include path for moved header files
2012-12-13 18:09:09 +01:00
Stefan Seyfried
8baeccb8a1 Merge branch 'uncool/dvbsi++'
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
2012-11-23 18:45:22 +01:00
Jacek Jendrzej
e922c4975b src/system/setting_helpers.cpp: use my_system instead of system
Origin commit data
------------------
Commit: 89ee8f7a5e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
2012-11-22 13:27:51 +01:00
Stefan Seyfried
b6d5d661b1 add dummy CFanControlNotifier::setSpeed() to fix build
Origin commit data
------------------
Commit: e7b93ab4b2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 10:47:04 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a'
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 10:45:33 +01:00
[CST] Focus
107b973944 system/setting_helpers.cpp: add static CFanControlNotifier::setSpeed,
to call it direct


Origin commit data
------------------
Commit: c7dd7ccc78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 14:18:56 +04:00
[CST] Focus
341d9dcf3c system/setting_helpers.cpp: add static CColorSetupNotifier::setPalette(),
to call it direct


Origin commit data
------------------
Commit: a1bd6d404b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 13:46:32 +04:00
[CST] Focus
accae00a95 system/setting_helpers.cpp: comment CVolume/CInfoClock Init in CColorSetupNotifier::changeNotify:
is it really needed to re-init them on palette change ?


Origin commit data
------------------
Commit: f78be0f96d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 13:10:15 +04:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.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/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
Jacek Jendrzej
694d2b5de6 Neutrino: rework COnOffNotifier and use it if possible, ported from tuxbox cvs
Origin commit data
------------------
Commit: 7b06b3fd38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
2012-10-11 14:11:05 +02:00
Jacek Jendrzej
2ce35cb6ce move safe_mkdir & check_dir to system-helpers
Origin commit data
------------------
Commit: dfa3231469
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:34:53 +02:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Stefan Seyfried
ebfeb22729 check_dir: fix typo in warning message
Origin commit data
------------------
Commit: d7d00c7ddf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-24 (Sun, 24 Jun 2012)
2012-06-27 21:18:19 +02:00
[CST] Focus
b023d1b6a0 system/setting_helpers.cpp: fix notifiers, most must not repaint menu
Origin commit data
------------------
Commit: d04fe6e94c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
2012-05-31 18:57:44 +04:00
[CST] Focus
ff58308020 system/setting_helpers.cpp: fix CAudioSetupNotifier - also called for pref. DD; no need to repaint menu
Origin commit data
------------------
Commit: bd561e7844
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
2012-05-31 17:20:12 +04:00
[CST] Focus
e7bc0d6f32 system/setting_helpers.cpp: cleanup unused code
Origin commit data
------------------
Commit: 4fd04645b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
2012-05-31 17:12:23 +04:00
[CST] Focus
693b64afcb system/setting_helpers.cpp: workaround for factory reset, clear sat list
Origin commit data
------------------
Commit: 5c85eced31
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-22 (Tue, 22 May 2012)
2012-05-22 11:47:35 +04:00
[CST] Focus
817209b251 system/setting_helpers.cpp: remove unused CLedControlNotifier
Origin commit data
------------------
Commit: 78ac46c1b2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)
2012-05-07 16:00:04 +04:00
Stefan Seyfried
bfeffbac64 neutrino: improve timezone handling
* only offer timezones which are actually installed in the system
* symlink the timezone file to /etc/localtime instead of copying


Origin commit data
------------------
Commit: f130d20b64
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-29 (Thu, 29 Mar 2012)
2012-04-17 19:33:57 +02:00
Stefan Seyfried
e503abd6dc neutrino: fix input device repeat setting for pre 2.6.17 kernels
Origin commit data
------------------
Commit: 146c46da8e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-25 (Sun, 25 Mar 2012)
2012-04-17 19:33:57 +02:00
Stefan Seyfried
cf20e81c89 neutrino: set input device repeat on spark/tripledragon
Origin commit data
------------------
Commit: 9221807a7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-19 (Mon, 19 Mar 2012)
2012-04-17 19:33:56 +02:00
Stefan Seyfried
f1ce5285f0 various assorted build fixes / hacks
Origin commit data
------------------
Commit: 5e86416ccb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-02-01 (Mon, 01 Feb 2010)
2012-04-17 19:33:44 +02:00
[CST] Focus
a48f76b4b9 fix conflicts
Origin commit data
------------------
Commit: b9bc799cf1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)
2012-03-20 11:14:05 +04:00
[CST] Focus
3f73ee9fa7 fix conflicts
Origin commit data
------------------
Commit: d39b174c75
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)
2012-03-20 11:07:28 +04:00
Michael Liebmann
04f20ee14b neutrino: GUI Painting of Vol. Mute and Clock (Part3)
- Use new class for volumebar
- Numeric display added for volumebar (switchable)
- Display of volumebar, mute icon and info clock optimized (top right)
- Volumebar better scalable

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2153 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 6a5ffc315f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-03-18 (Sun, 18 Mar 2012)

Origin message was:
------------------
* neutrino: GUI Painting of Vol. Mute and Clock (Part3)

- Use new class for volumebar
- Numeric display added for volumebar (switchable)
- Display of volumebar, mute icon and info clock optimized (top right)
- Volumebar better scalable

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2153 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-18 18:46:48 +00:00
[CST] Focus
a003c734db Merge branch 'master', remote-tracking branch 'origin' into dvbsi++
Origin commit data
------------------
Commit: f3d2895847
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)
2012-03-02 19:31:49 +04:00
[CST] Focus
1d20a0f73a Merge branch 'master' into multituner
Origin commit data
------------------
Commit: 2ecc60cf71
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)
2012-03-02 18:59:50 +04:00
[CST] Focus
03e216429c audio: change change DD over hdmi options to:
off, auto (old ON, if supported by device) and force

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2135 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 84afbc9a66
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)
2012-03-02 14:39:51 +00:00
[CST] Focus
1a797d3138 daemonc/remotecontrol.cpp: use time_monotonic_ms for zap_completion_timeout
Origin commit data
------------------
Commit: b0f20009be
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-27 (Mon, 27 Feb 2012)
2012-02-27 19:28:01 +04:00
[CST] Focus
27629492d2 setting_helpers: cleanup unused code
Origin commit data
------------------
Commit: 40ec967468
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)
2012-01-13 14:49:04 +04:00
Jacek Jendrzej
3f23d33112 check_dir: add ramfs for software update dir
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2008 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 58c265c35e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-12-27 (Tue, 27 Dec 2011)
2011-12-27 17:50:43 +00:00
[CST] Focus
8a3e4e1f25 Remove rfmod code and unused settings
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2002 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 5743a6dd29
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-25 (Sun, 25 Dec 2011)
2011-12-25 12:37:16 +00:00
[CST] Focus
53c48ebfc5 Remove unused CRecordingNotifier
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1916 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 660a4f4e45
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)
2011-11-26 11:55:39 +00:00
[CST] Focus
385e644233 Remove CAPIDChangeExec
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1914 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: b6fc86a88d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)
2011-11-26 10:34:01 +00:00
[CST] Focus
4b74bf71ca Fix missing vfd params reset
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1906 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 851b67daa5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-25 (Fri, 25 Nov 2011)
2011-11-25 16:12:50 +00:00
[CST] Focus
b87aa36144 Fix missing colors reset
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1905 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: fd9b0cca9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-25 (Fri, 25 Nov 2011)
2011-11-25 15:19:14 +00:00
[CST] Focus
8d36dc5ebb Stop using loadColors, loadSetup should load same default colors; Clear FB on settings reset - if font/size/preset different, there was artifatcs
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1904 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8db902c9f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-25 (Fri, 25 Nov 2011)
2011-11-25 15:07:29 +00:00
[CST] Focus
55b365090b Remove unused code
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1897 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 09cb77617e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-25 (Fri, 25 Nov 2011)
2011-11-25 13:33:42 +00:00