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
50ad12c582
neutrino.cpp: pause sectionsd on shutdown before saving epg,
...
stop epgscan to restore live channel id in case shutdown started from standby mode,
fix hdd wakeup on record announce
Origin commit data
------------------
Commit: a9e3666b0a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-02-12 (Wed, 12 Feb 2014)
2014-02-12 16:47:29 +04:00
Michael Liebmann
308c8ce00a
yWeb: Synchronize volume/audiomute settings yWeb => GUI
...
Origin commit data
------------------
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-02-12 (Wed, 12 Feb 2014)
2014-02-12 06:02:27 +01:00
Jacek Jendrzej
b91133af92
epgview.cpp: -add adzap
...
Origin commit data
------------------
Commit: 3818875a80
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-02-04 (Tue, 04 Feb 2014)
2014-02-04 19:32:47 +01:00
Stefan Seyfried
ea063c5755
Merge remote-tracking branch 'broken/next-cc'
...
Origin commit data
------------------
Commit: 65437a60a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-28 (Tue, 28 Jan 2014)
2014-01-28 13:22:00 +01:00
[CST] Focus
1a35df7164
neutrino.cpp: add zapTo(), reuse common code for zap without wait
...
Origin commit data
------------------
Commit: 02cb09ce7e
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-01-28 (Tue, 28 Jan 2014)
2014-01-28 16:12:30 +04:00
Michael Liebmann
406b287a29
Fix display volumebar when channellist is visible
...
Origin commit data
------------------
Commit: 65859318d0
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-28 (Tue, 28 Jan 2014)
2014-01-28 12:59:17 +01:00
Jacek Jendrzej
5b91bb9e46
webif standby -add option CEC standby off (dont use TV off)
...
Origin commit data
------------------
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-01-28 (Tue, 28 Jan 2014)
2014-01-28 10:30:29 +01: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
Jacek Jendrzej
ac3ee0cf9b
add webif option dont use CEC with standbyoff
...
Origin commit data
------------------
Commit: 4be0273083
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-01-26 (Sun, 26 Jan 2014)
Origin message was:
------------------
-add webif option dont use CEC with standbyoff
2014-01-26 22:24:17 +01:00
Stefan Seyfried
a112e8fb49
Merge remote-tracking branch 'check/next-cc'
...
compiles, nothing else.
Conflicts:
configure.ac
src/Makefile.am
src/gui/Makefile.am
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan_setup.cpp
src/gui/start_wizard.cpp
src/gui/test_menu.cpp
src/gui/user_menue.cpp
src/gui/widget/hintboxext.cpp
src/gui/widget/menue.cpp
src/gui/widget/messagebox.cpp
src/gui/widget/stringinput.cpp
Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20
adapt ShowMsg handling from martii's neutrino-mp
...
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-01-22 (Wed, 22 Jan 2014)
Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
2014-01-22 12:37:21 +01:00
vanhofen
8a02f4f089
adapt ShowHint handling from martii's neutrino-mp
...
Origin commit data
------------------
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-01-22 (Wed, 22 Jan 2014)
Origin message was:
------------------
- adapt ShowHint handling from martii's neutrino-mp
2014-01-22 12:11:52 +01:00
Michael Liebmann
3e96126769
SNeutrinoSettings: convert more char[...] configuration values to std::string
...
Origin commit data
------------------
Commit: 004aa84e32
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-18 (Sat, 18 Jan 2014)
2014-01-19 20:57:37 +01:00
Michael Liebmann
1918153c0a
Preparing the menu classes for Lua Part #2
...
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-16 (Thu, 16 Jan 2014)
Origin message was:
------------------
Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
2014-01-19 20:57:37 +01:00
Stefan Seyfried
13ac3b81eb
Merge remote-tracking branch 'check/next-cc'
...
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-19 (Sun, 19 Jan 2014)
2014-01-19 13:37:24 +01:00
[CST] Focus
f4ab14af0f
neutrino.cpp: add g_settings.lcd_scroll option;
...
move rcK and umount on shutdown later to fix deep-standby clock in case of /var partition (thanks Thomas)
Origin commit data
------------------
Commit: b1f21b47ca
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-01-17 (Fri, 17 Jan 2014)
2014-01-17 14:20:26 +04:00
Stefan Seyfried
607f56ae80
reduce direct dependencies on timerdclient.h
...
Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.
Origin commit data
------------------
Commit: 1d0a23dbf3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-13 (Mon, 13 Jan 2014)
2014-01-13 21:01:26 +01:00
Stefan Seyfried
1eb4a45475
timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
...
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
Origin commit data
------------------
Commit: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 20:57:40 +01:00
Michael Liebmann
b77c9d3244
Supplement to commit b3ef258294
...
Origin commit data
------------------
Commit: c61d062124
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-13 (Mon, 13 Jan 2014)
2014-01-13 20:07:43 +01:00
Michael Liebmann
b3ef258294
CRecordInstance: Turns message when recording start/end on or off
...
Origin commit data
------------------
Commit: ae2a01a37a
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-13 (Mon, 13 Jan 2014)
2014-01-13 19:42:46 +01:00
Stefan Seyfried
a7b2bd7faf
reduce direct dependencies on timerdclient.h
...
Include timerdtypes.h instead of timerdclient.h where feasible,
add direct instead of indirect includes of timerdclient.h where
necessary. This reduces the number of files which depend on
timerdclient.h from 134 to 16.
Add/update copyright notices in the affected files.
Origin commit data
------------------
Commit: ed818c7c14
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 16:55:31 +01:00
Stefan Seyfried
e48a154e06
timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
...
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
Origin commit data
------------------
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 15:07:31 +01:00
Stefan Seyfried
ddeef54bcf
Merge remote-tracking branch 'check/next-cc'
...
Origin commit data
------------------
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 14:41:44 +01:00
Michael Liebmann
e2b605c5a9
Disable infoclock when user menu activ
...
Origin commit data
------------------
Commit: 4c797ec3ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 10:48:06 +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
vanhofen
973479845c
usermenu: cleanup from unused code
...
Origin commit data
------------------
Commit: e529bd011b
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-01-02 (Thu, 02 Jan 2014)
Origin message was:
------------------
- usermenu: cleanup from unused code
2014-01-02 22:57:01 +01:00
martii
7e9d41f23d
gui/dboxinfo: move cpu load calculation to dedicated thread ...
...
... that keeps history; show load graph
Origin commit data
------------------
Commit: 6fff156164
Author: martii <m4rtii@gmx.de >
Date: 2013-12-30 (Mon, 30 Dec 2013)
2013-12-30 01:51:20 +01:00
vanhofen
bdc4c1b124
Revert "gui/dboxinfo: move cpu load calculation to dedicated thread ..."
...
This reverts commit 9ce61523af
.
Origin commit data
------------------
Commit: 7fbe179a1f
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-12-30 (Mon, 30 Dec 2013)
2013-12-30 01:51:08 +01:00
vanhofen
9ce61523af
gui/dboxinfo: move cpu load calculation to dedicated thread ...
...
... that keeps history; show load graph
Origin commit data
------------------
Commit: ce18925333
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-12-30 (Mon, 30 Dec 2013)
2013-12-30 01:34:07 +01:00
Stefan Seyfried
3aaf6770ea
Merge remote-tracking branch 'check/next-cc'
...
Origin commit data
------------------
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-29 (Sun, 29 Dec 2013)
2013-12-29 22:12:09 +01:00
vanhofen
afaa1a5180
channellist: channellogos can be disabled
...
Origin commit data
------------------
Commit: 9fb63a20d9
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-12-28 (Sat, 28 Dec 2013)
Origin message was:
------------------
- channellist: channellogos can be disabled
2013-12-28 23:39:51 +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
Michael Liebmann
ab6a7d929a
CInfoClock: menu item for setting color of the digit added
...
Origin commit data
------------------
Commit: 025295b6b4
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 18:32:01 +01:00
martii
ff17a1ce05
system/settings: store epg times in integers
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
Origin commit data
------------------
Commit: b45511b196
Author: martii <m4rtii@gmx.de >
Date: 2013-12-24 (Tue, 24 Dec 2013)
2013-12-25 12:08:14 +01:00
martii
cc2a63f1ad
system/settings: use integers for shutdown_count/_min
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
Origin commit data
------------------
Commit: d125301ede
Author: martii <m4rtii@gmx.de >
Date: 2013-12-24 (Tue, 24 Dec 2013)
2013-12-25 12:08:14 +01:00
martii
ce44d1641a
convert most char[...] configuration values to std::string
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de >
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-12-25 12:08:14 +01:00
Michael Liebmann
d22afd5964
CInfoClock: Fix segfault at 'standby mode after boot'
...
- Initialize InfoClock before standby mode
Origin commit data
------------------
Commit: 3266287253
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-12-23 (Mon, 23 Dec 2013)
2013-12-23 23:28:52 +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
martii
5e5d19c036
gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...
...
... instead of CStringInput to enter numbers
* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier
Origin commit data
------------------
Commit: 697b1a75b3
Author: martii <m4rtii@gmx.de >
Date: 2013-12-22 (Sun, 22 Dec 2013)
Origin message was:
------------------
gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...
... instead of CStringInput to enter numbers
* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier
2013-12-22 21:13:45 +01:00
martii
3291eee8fd
gui/keybind_setup: use CMenuOptionNumberChooser instead of CStringInput
...
Origin commit data
------------------
Commit: dc61c83103
Author: martii <m4rtii@gmx.de >
Date: 2013-12-22 (Sun, 22 Dec 2013)
2013-12-22 16:36:13 +01:00
martii
1ad07c0854
gui/pictureviewer_setup, gui/audioplayer_setup: use CMenuOptionNumberChooser instead of CStringInput
...
Origin commit data
------------------
Commit: da0142eb0d
Author: martii <m4rtii@gmx.de >
Date: 2013-12-22 (Sun, 22 Dec 2013)
2013-12-22 16:36:13 +01:00
martii
c69564aaf9
zap back to previous channel id when recording from standby mode has finished [experimental, untested]
...
Origin commit data
------------------
Commit: 11b8541f4e
Author: martii <m4rtii@gmx.de >
Date: 2013-12-21 (Sat, 21 Dec 2013)
2013-12-22 16:36:13 +01:00
[CST] Focus
70a256297b
neutrino.cpp: pause sectionsd after set its current channel to 0
...
Origin commit data
------------------
Commit: 1e1df7bc39
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-12-21 (Sat, 21 Dec 2013)
2013-12-21 14:07:44 +04:00
[CST] Focus
e108d49e6f
neutrino.cpp: start epg scan after leaving menu, if epg scan option changed
...
Origin commit data
------------------
Commit: 85b25750d5
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-12-19 (Thu, 19 Dec 2013)
2013-12-20 16:43:37 +04:00
Michael Liebmann
eb87345106
CInfoClock: Remove clock off via exit button
...
Origin commit data
------------------
Commit: bc1b94deb9
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-12-11 (Wed, 11 Dec 2013)
2013-12-11 15:55:14 +01:00
vanhofen
60e34434fd
infoclock: add some features
...
* add shadow to infoclock
* rename some locals
* change default height of clock
* add option to switch bachground on/off (default off)
* add option to switch seconds on/off (default on)
Origin commit data
------------------
Commit: e97e33532b
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-12-10 (Tue, 10 Dec 2013)
Origin message was:
------------------
- infoclock: add some features
* add shadow to infoclock
* rename some locals
* change default height of clock
* add option to switch bachground on/off (default off)
* add option to switch seconds on/off (default on)
2013-12-10 02:38:43 +01:00
Stefan Seyfried
e6cc1e1ecf
coolstream: align shutdown handling with other archs
...
instead of just running rcK (which might not exist) and then
switching off the box hard, exit with proper exit code and
let a helper binary shut off the box with wakeup timer in a
shutdown script.
Origin commit data
------------------
Commit: bbd0a5e27a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-07 (Sat, 07 Dec 2013)
2013-12-07 23:14:08 +01:00
Stefan Seyfried
ffcb0147ac
Merge remote-tracking branch 'check/next-cc'
...
Origin commit data
------------------
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-07 (Sat, 07 Dec 2013)
2013-12-07 18:28:56 +01:00
Michael Liebmann
2db5b8cad2
neutrino: disable infoclock while eventlist is displayed via usermenu
...
Origin commit data
------------------
Commit: cbfd097060
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-12-01 (Sun, 01 Dec 2013)
2013-12-01 16:39:35 +01:00