This needs more fine tuning wrt scan setup etc, but should work for now.
Conflicts:
data/Makefile.am
data/locale/english.locale
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/neutrino.cpp
src/zapit/include/zapit/getservices.h
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f4c1b986c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b85c0daf7a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-25 (Tue, 25 Feb 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2663387195
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-18 (Fri, 18 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
driver/rcinput: drop unused gettimeofday code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7826ab0fca
Author: martii <m4rtii@gmx.de>
Date: 2014-02-25 (Tue, 25 Feb 2014)
------------------
This commit was generated by Migit
stop epgscan to restore live channel id in case shutdown started from standby mode,
fix hdd wakeup on record announce
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9e3666b0a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3818875a80
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02cb09ce7e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65859318d0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
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
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
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
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
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
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 004aa84e32
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
Origin commit data
------------------
Branch: ni/coolstream
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
------------------
This commit was generated by Migit
move rcK and umount on shutdown later to fix deep-standby clock in case of /var partition (thanks Thomas)
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1f21b47ca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-17 (Fri, 17 Jan 2014)
------------------
This commit was generated by Migit
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: 1d0a23dbf3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-13 (Mon, 13 Jan 2014)
------------------
This commit was generated by Migit
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: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c61d062124
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-13 (Mon, 13 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae2a01a37a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-13 (Mon, 13 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
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
... 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
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
... 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
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
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
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
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
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
- 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
... 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
