Commit Graph

1533 Commits

Author SHA1 Message Date
Stefan Seyfried
f9a3dffb60 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
------------------
Branch: ni/coolstream
Commit: ed818c7c14
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-01-12 16:55:31 +01:00
Stefan Seyfried
525fd6261b 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
------------------
Branch: ni/coolstream
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-01-12 15:07:31 +01:00
Stefan Seyfried
402d13aa4d Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-12 14:41:44 +01:00
Michael Liebmann
3ec81384cc Disable infoclock when user menu activ
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c797ec3ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-12 (Sun, 12 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-12 10:48:06 +01:00
Stefan Seyfried
003773490b Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-05 18:31:31 +01:00
vanhofen
0803fba991 usermenu: cleanup from unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: e529bd011b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-02 (Thu, 02 Jan 2014)

Origin message was:
------------------
- usermenu: cleanup from unused code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-02 22:57:01 +01:00
martii
fa3f04726a gui/dboxinfo: move cpu load calculation to dedicated thread ...
... that keeps history; show load graph


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fff156164
Author: martii <m4rtii@gmx.de>
Date: 2013-12-30 (Mon, 30 Dec 2013)



------------------
This commit was generated by Migit
2013-12-30 01:51:20 +01:00
vanhofen
2598ee53f1 Revert "gui/dboxinfo: move cpu load calculation to dedicated thread ..."
This reverts commit eb80914234.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fbe179a1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-30 (Mon, 30 Dec 2013)



------------------
This commit was generated by Migit
2013-12-30 01:51:08 +01:00
vanhofen
eb80914234 gui/dboxinfo: move cpu load calculation to dedicated thread ...
... that keeps history; show load graph


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce18925333
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-30 (Mon, 30 Dec 2013)



------------------
This commit was generated by Migit
2013-12-30 01:34:07 +01:00
Stefan Seyfried
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
vanhofen
af18c89c3d channellist: channellogos can be disabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fb63a20d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-28 (Sat, 28 Dec 2013)

Origin message was:
------------------
- channellist: channellogos can be disabled

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-28 23:39:51 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
Michael Liebmann
c05da8eb4e CInfoClock: menu item for setting color of the digit added
Origin commit data
------------------
Branch: ni/coolstream
Commit: 025295b6b4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-25 18:32:01 +01:00
martii
e558ba8025 system/settings: store epg times in integers
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: b45511b196
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
martii
f870b2d240 system/settings: use integers for shutdown_count/_min
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d125301ede
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
martii
7ebfe9959d convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
Michael Liebmann
dc003a9bac CInfoClock: Fix segfault at 'standby mode after boot'
- Initialize InfoClock before standby mode


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3266287253
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-23 (Mon, 23 Dec 2013)



------------------
This commit was generated by Migit
2013-12-23 23:28:52 +01:00
Stefan Seyfried
6fae9a0db4 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)



------------------
This commit was generated by Migit
2013-12-22 21:25:05 +01:00
martii
cd83c1117e 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2013-12-22 21:13:45 +01:00
martii
e50b416964 gui/keybind_setup: use CMenuOptionNumberChooser instead of CStringInput
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc61c83103
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-22 16:36:13 +01:00
martii
9f0b5e7d76 gui/pictureviewer_setup, gui/audioplayer_setup: use CMenuOptionNumberChooser instead of CStringInput
Origin commit data
------------------
Branch: ni/coolstream
Commit: da0142eb0d
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-22 16:36:13 +01:00
martii
242c52b53a zap back to previous channel id when recording from standby mode has finished [experimental, untested]
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11b8541f4e
Author: martii <m4rtii@gmx.de>
Date: 2013-12-21 (Sat, 21 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-22 16:36:13 +01:00
[CST] Focus
39c4a502b5 neutrino.cpp: pause sectionsd after set its current channel to 0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e1df7bc39
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-21 (Sat, 21 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-21 14:07:44 +04:00
[CST] Focus
8e99f18448 neutrino.cpp: start epg scan after leaving menu, if epg scan option changed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85b25750d5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-20 16:43:37 +04:00
Michael Liebmann
fa3e02ce6c CInfoClock: Remove clock off via exit button
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc1b94deb9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-11 15:55:14 +01:00
vanhofen
c64f2fc2ce 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
------------------
Branch: ni/coolstream
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)


------------------
This commit was generated by Migit
2013-12-10 02:38:43 +01:00
Stefan Seyfried
3687d358b3 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
------------------
Branch: ni/coolstream
Commit: bbd0a5e27a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)



------------------
This commit was generated by Migit
2013-12-07 23:14:08 +01:00
Stefan Seyfried
2c48d93e05 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-07 18:28:56 +01:00
Michael Liebmann
4f8a15a4be neutrino: disable infoclock while eventlist is displayed via usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: cbfd097060
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-01 (Sun, 01 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-01 16:39:35 +01:00
Stefan Seyfried
ea50f5f7bc Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
2013-11-30 20:17:31 +01:00
Stefan Seyfried
2b6a033d8e Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies""
This reverts commit 65cbab0307.

No Idea why this was reverted, so revert again :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf8ec4d89e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
2013-11-30 18:26:47 +01:00
[CST] Focus
0f48adcd6a neutrino.cpp: fix crash if DISABLE_SECTIONSD defined for testing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f318a9d0f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-29 17:27:10 +04:00
[CST] Focus
eca03a89b2 gui/movieplayer.cpp, neutrino.cpp: fix inactivity timer -
do not stop playback to show cancel timer question


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2ae51ae84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)



------------------
This commit was generated by Migit
2013-11-29 17:27:09 +04:00
Michael Liebmann
bfb4babf6b CInfoClock: Use dynamic font for display
Origin commit data
------------------
Branch: ni/coolstream
Commit: 435d25c0ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-28 16:07:49 +01:00
Jacek Jendrzej
8ada33708f CEventFinderMenu -add epg search history
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f387ae87f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-26 16:23:24 +01:00
vanhofen
9cbf88eab9 neutrino: disable infoclock while epgview and eventlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: dcffcfdb07
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-25 (Mon, 25 Nov 2013)

Origin message was:
------------------
- neutrino: disable infoclock while epgview and eventlist

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-25 13:11:08 +01:00
Michael Liebmann
a6137cadce InfoClock: Fix display clock in movie browser, file browser etc.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7466d6f19c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-22 10:01:35 +01:00
Thilo Graf
885cbcbc40 CInfoClock: rework infocklock
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8b61684df
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-12 (Tue, 12 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-20 09:38:37 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
52ff7cfcb9 Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 14:04:15 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
[CST] Focus
e9c2d66a7e driver/scanepg.cpp, neutrino.cpp: fix for standby epg scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a120da68d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-11 14:07:03 +04:00
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +01:00
martii
f43b9f7e12 global.h: Use forward-declarations to reduce number of dependencies
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)



------------------
This commit was generated by Migit
2013-11-09 17:03:03 +01:00
[CST] Focus
3b2717e12a neutrino.cpp: add window width/height settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1eb658fc21
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-07 17:23:40 +04:00
[CST] Focus
5123ca405f as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Branch: ni/coolstream
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)



------------------
This commit was generated by Migit
2013-10-25 13:03:26 +04:00
Stefan Seyfried
971d575b78 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
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
[CST] Focus
c7be117284 neutrino.cpp: call CEpgScan::handleMsg() in standart way,
fixes memleak for events with data


Origin commit data
------------------
Branch: ni/coolstream
Commit: a109474d61
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)



------------------
This commit was generated by Migit
2013-10-17 19:14:02 +04:00
vanhofen
55b7980362 remove '+'; fix 3eccf03
Origin commit data
------------------
Branch: ni/coolstream
Commit: 211823e9fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-16 (Wed, 16 Oct 2013)

Origin message was:
------------------
- remove '+'; fix 3eccf03

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-16 10:46:36 +02:00
vanhofen
3eccf03688 sleeptimer: add possibilty to preset with a fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e550e9e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-16 (Wed, 16 Oct 2013)

Origin message was:
------------------
- sleeptimer: add possibilty to preset with a fixed value

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-16 10:37:23 +02:00