Commit Graph

760 Commits

Author SHA1 Message Date
[CST] Focus
ddc00bba81 Merge branch 'pip' into next
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:45:41 +04:00
[CST] Focus
e15f1c4c72 Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:39:34 +04:00
[CST] Focus
7bde08b702 neutrino.cpp: save/load pip key - default is 'help' button, stop PiP on pip key
Origin commit data
------------------
Commit: f5c162522b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:20:23 +04:00
[CST] Focus
80fc03f242 neutrino.cpp: save/load pip settings, group apollo-specific settings
Origin commit data
------------------
Commit: 876b697a14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)
2013-02-26 17:18:05 +04:00
Stefan Seyfried
80a87017f3 neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2013-02-21 15:47:18 +01:00
[CST] Focus
7371c5154d Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
2013-02-13 15:34:41 +04:00
Jacek Jendrzej
00dfd32794 add progressbar opt to infobar
Origin commit data
------------------
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
2013-02-12 18:03:50 +01:00
[CST] Focus
6d836b0395 neutrino.cpp, settings.h: for apollo, add brightness/contrast/saturation
Origin commit data
------------------
Commit: 58c9c9f884
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
2013-02-12 13:08:33 +04:00
[CST] Focus
00dba32ece merge dvbsi++
Origin commit data
------------------
Commit: 46657a1c6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
2013-02-11 13:29:09 +04:00
[CST] Focus
887aedb9da neutrino.cpp: change led defaults for trinity
Origin commit data
------------------
Commit: 0fd4d4f439
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
2013-02-11 13:12:49 +04:00
vanhofen
b474116b2c neutrino.cpp: remove double determination of g_info.delivery_system
Origin commit data
------------------
Commit: c4f8bf17a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- neutrino.cpp: remove double determination of g_info.delivery_system
2013-02-10 22:00:22 +01:00
vanhofen
9da986e456 channellist: make miniTV switchable
Origin commit data
------------------
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable
2013-02-04 22:25:15 +01:00
[CST] Focus
75d5db52e4 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: bcd02435dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 17:40:19 +04:00
TangoCash
eedc2330d9 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 19:17:52 +01:00
[CST] Focus
eeb539e8e9 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 5776c67825
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:42:19 +04:00
vanhofen
1b297bb909 neutrino.cpp: fix wrong configfile in loadKeys()
Origin commit data
------------------
Commit: 1320462626
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)

Origin message was:
------------------
- neutrino.cpp: fix wrong configfile in loadKeys()
2013-01-29 13:13:55 +01:00
[CST] Focus
83a2a9b5b1 neutrino.cpp: get bouquets with filtering;
move HD bouquet to 'all' to use sorting on it


Origin commit data
------------------
Commit: d591e90395
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 14:44:45 +04:00
[CST] Focus
6899948e15 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 0ea1a39e0a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
2013-01-16 16:36:07 +04:00
Jacek Jendrzej
9beffc55bd neutrino-tell-the-user-if-no-frontend-is-found1.patch from neutrino-mp
Origin commit data
------------------
Commit: d0ea4ad62e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-13 (Sun, 13 Jan 2013)
2013-01-13 21:52:37 +01:00
Jacek Jendrzej
2e7148b779 src/neutrino.cpp: revert
Origin commit data
------------------
Commit: be0eb77373
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-13 (Sun, 13 Jan 2013)
2013-01-13 21:45:08 +01:00
[CST] Focus
ce585a93f3 neutrino.cpp: ifdef for new analog modes
Origin commit data
------------------
Commit: a746945c2d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 15:15:07 +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
[CST] Focus
40dadf170d neutrino.cpp: temporary disable hw standby
Origin commit data
------------------
Commit: 01209180b0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
2013-01-09 16:11:38 +04:00
Jacek Jendrzej
9638bb154b neutrino: fix segfault if not found frontend
Origin commit data
------------------
Commit: 0806c47c73
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-20 (Thu, 20 Dec 2012)
2012-12-20 20:13:44 +01: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
Jacek Jendrzej
0e7e197e3b supplement to 798febccb6, simplification
Origin commit data
------------------
Commit: 59fa692bd0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)
2012-12-08 16:28:53 +01:00
Jacek Jendrzej
798febccb6 add provider name to infobar , no gui option
Origin commit data
------------------
Commit: 7bebdf91e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)
2012-12-08 11:15:40 +01:00
[CST] Bas
375e3056b3 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
2012-12-07 14:39:05 +08:00
[CST] Focus
3174e1c9ef neutrino.cpp: fix subchannel up/down processing:
if key_subchannel_up/down is set to different than left/right keys,
and mode_left_right_key_tv == SNeutrinoSettings::VOLUME, CVolume::setVolume called,
but not process other keys, and post msg again -> loop forever.
- process mode_left_right_key_tv modes only if subchannel up/down == left/right


Origin commit data
------------------
Commit: d5cd463e17
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
2012-12-04 14:52:03 +04:00
[CST] Focus
b286bb9745 neutrino.cpp: revert mount at startup to system -
fs can be not only ext3 but different


Origin commit data
------------------
Commit: c77138f260
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
2012-12-04 13:58:41 +04:00
[CST] Bas
ad90c35c7c neutrino: set new cpu clock after returning from standby.
Origin commit data
------------------
Commit: 8940ba4e7d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
2012-12-04 00:31:36 +08:00
[CST] Bas
2da2954b72 neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time).
Origin commit data
------------------
Commit: b018c08cce
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
2012-12-04 00:28:34 +08:00
Jacek Jendrzej
522fe2b92c src/neutrino.cpp: add cancel message to RC_standby_on and RC_power_off (THX Gaucho316)
Origin commit data
------------------
Commit: 0f8c9bbef1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
2012-11-16 13:36:12 +01:00
[CST] Focus
9e29fa2e25 neutrino.cpp: comment saveSetup in signal handler - this can damage config file,
try to protect against broken config - check screen_End* and load load defaults


Origin commit data
------------------
Commit: b478212140
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
2012-11-15 19:12:13 +04:00
[CST] Bas
747783c85f Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
2012-11-13 12:51:18 +08:00
[CST] Bas
6b796de797 neutrino: destruct cpufreq if it was instantiated.
Origin commit data
------------------
Commit: be3c098cb8
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
2012-11-13 12:42:20 +08:00
Jacek Jendrzej
0d98f2806b src/gui/channellist.cpp:-add sort by channel number
Origin commit data
------------------
Commit: c47aebdb64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)
2012-11-09 17:32:15 +01:00
Jacek Jendrzej
4009f90f6a src/neutrino.cpp: see the appropriate message depending on settings
Origin commit data
------------------
Commit: fdb1fa6352
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)
2012-11-09 15:31:26 +01:00
Jacek Jendrzej
2cabd81f3f src/neutrino.cpp:use LOCALE_SLEEPTIMERBOX_ANNOUNCE , supplement to 1b2eb75373
Origin commit data
------------------
Commit: b56c863953
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)
2012-11-09 15:05:34 +01:00
Jacek Jendrzej
1b2eb75373 src/neutrino.cpp:-add ask MESSAGEBOX for INACTIVITY SLEEPTIMER
Origin commit data
------------------
Commit: 282560875b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)
2012-11-09 14:50:55 +01:00
Jacek Jendrzej
411fb6a506 Merge branch 'dvbsi++' of ssh://coolstreamtech.de/cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: de5004bd86
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
2012-11-08 16:19:47 +01:00
[CST] Focus
0124c6ce3d neutrino.cpp: update for new streamts code,
keep stream running in soft-standby


Origin commit data
------------------
Commit: e5a2b0336c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
2012-11-08 19:13:22 +04:00
Jacek Jendrzej
4c735e8e66 neutrino: -add save epg on stadbyOn/Off option
Origin commit data
------------------
Commit: a47c6593dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
2012-11-08 13:35:00 +01:00
Jacek Jendrzej
a55a081538 src/neutrino.cpp: -add lockStandbyCall
Origin commit data
------------------
Commit: 299e20387d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
2012-11-08 12:24:23 +01:00
Thilo Graf
b962280021 user_menu: personalize also yellow and green buttons
Origin commit data
------------------
Commit: 12e778773b
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-28 (Tue, 28 Aug 2012)

Origin message was:
------------------
*user_menu: personalize also yellow and green buttons
2012-11-05 21:26:19 +01:00
Jacek Jendrzej
85de1950f0 src/neutrino.cpp:timeshiftDir : fix autodelete
Origin commit data
------------------
Commit: 618fa78a5a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 21:50:43 +01:00
[CST] Focus
12302a4651 neutrino.cpp: delete missed colorSetupNotifier reference
Origin commit data
------------------
Commit: b48e74557b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 18:49:47 +04:00
[CST] Focus
13132db466 neutrino.cpp: cleanup unused code
Origin commit data
------------------
Commit: 0c8cd117a9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 18:07:39 +04:00
[CST] Focus
d82623992a neutrino.cpp: remove initGlobals(), global variables initialized to 0 anyway
Origin commit data
------------------
Commit: de99c8a741
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 17:28:01 +04:00
[CST] Focus
460122eab2 neutrino.cpp: use g_InfoViewer->setUpdateTimer(),
disable timer in standby


Origin commit data
------------------
Commit: e6afe59081
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
2012-11-02 16:10:32 +04:00