Commit Graph

965 Commits

Author SHA1 Message Date
vanhofen
f1d6fb52cf neutrino.cpp: fix handling of g_settings.mode_left_right_key_tv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b18346c98
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-01 (Fri, 01 Mar 2013)

Origin message was:
------------------
- neutrino.cpp: fix handling of g_settings.mode_left_right_key_tv

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

------------------
This commit was generated by Migit
2013-03-01 20:49:47 +01:00
[CST] Focus
632df4ddb3 Merge branch 'pip' into next
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:45:41 +04:00
[CST] Focus
d0ccb2c97d 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
------------------
Branch: ni/coolstream
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:39:34 +04:00
[CST] Focus
244920fab8 neutrino.cpp: save/load pip key - default is 'help' button, stop PiP on pip key
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c162522b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-28 16:20:23 +04:00
[CST] Focus
f3cf41118c neutrino.cpp: save/load pip settings, group apollo-specific settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 876b697a14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-26 17:18:05 +04:00
Stefan Seyfried
77c08c4c15 Merge branch 'check/dvbsi++' commit c16f636011
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)



------------------
This commit was generated by Migit
2013-02-21 17:07:18 +01:00
Stefan Seyfried
0e01a7b32c 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
------------------
Branch: ni/coolstream
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2013-02-21 15:47:18 +01:00
[CST] Focus
e1b0837ce1 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-13 15:34:41 +04:00
Jacek Jendrzej
a46d3a42ef add progressbar opt to infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 18:03:50 +01:00
[CST] Focus
7212afe265 neutrino.cpp, settings.h: for apollo, add brightness/contrast/saturation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58c9c9f884
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 13:08:33 +04:00
[CST] Focus
071bfdeedd merge dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 46657a1c6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-11 13:29:09 +04:00
[CST] Focus
345db3eb8e neutrino.cpp: change led defaults for trinity
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fd4d4f439
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-11 13:12:49 +04:00
vanhofen
b9eccd608c neutrino.cpp: remove double determination of g_info.delivery_system
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2013-02-10 22:00:22 +01:00
vanhofen
ca1569c428 channellist: make miniTV switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable

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

------------------
This commit was generated by Migit
2013-02-04 22:25:15 +01:00
[CST] Focus
c641e5c0f8 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcd02435dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 17:40:19 +04:00
TangoCash
263340cd22 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)



------------------
This commit was generated by Migit
2013-01-30 19:17:52 +01:00
Stefan Seyfried
1b04f81e17 Merge branch 'uncool/dvbsi++' commit 785d3f2046
Conflicts:
	src/eitd/SIevents.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e701bfefc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)



------------------
This commit was generated by Migit
2013-01-29 21:27:41 +01:00
[CST] Focus
e4eee9ae88 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5776c67825
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-29 17:42:19 +04:00
vanhofen
785d3f2046 neutrino.cpp: fix wrong configfile in loadKeys()
Origin commit data
------------------
Branch: ni/coolstream
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()

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

------------------
This commit was generated by Migit
2013-01-29 13:13:55 +01:00
[CST] Focus
7f9de3998d neutrino.cpp: get bouquets with filtering;
move HD bouquet to 'all' to use sorting on it


Origin commit data
------------------
Branch: ni/coolstream
Commit: d591e90395
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)



------------------
This commit was generated by Migit
2013-01-28 14:44:45 +04:00
[CST] Focus
a001015cd9 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ea1a39e0a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-16 16:36:07 +04:00
Jacek Jendrzej
a1e95e20ad neutrino-tell-the-user-if-no-frontend-is-found1.patch from neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0ea4ad62e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-13 (Sun, 13 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-13 21:52:37 +01:00
Jacek Jendrzej
71874b399a src/neutrino.cpp: revert
Origin commit data
------------------
Branch: ni/coolstream
Commit: be0eb77373
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-13 (Sun, 13 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-13 21:45:08 +01:00
Stefan Seyfried
b32ccc925c neutrino: enable screenshots
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-13 18:49:37 +01:00
Stefan Seyfried
c278fca4e9 neutrino: tell the user if no frontend is found
even though there is not much left to do if no frontend is present,
at least the user can be informed about that fact before crashing :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa098a7701
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)



------------------
This commit was generated by Migit
2013-01-13 17:42:47 +01:00
[CST] Focus
c2f8a2dbec neutrino.cpp: ifdef for new analog modes
Origin commit data
------------------
Branch: ni/coolstream
Commit: a746945c2d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 15:15:07 +04:00
[CST] Focus
0afd2ce386 merge public git changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-09 19:30:07 +04:00
[CST] Focus
84dc8e7890 neutrino.cpp: temporary disable hw standby
Origin commit data
------------------
Branch: ni/coolstream
Commit: 01209180b0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-09 16:11:38 +04:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


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



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
Stefan Seyfried
d57e57367f Revert "neutrino: fix segfault if not found frontend"
This reverts commit 2fff862e8b.

(it does not fix the real problem)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dcd92d557
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
2012-12-30 20:56:19 +01:00
Jacek Jendrzej
2fff862e8b neutrino: fix segfault if not found frontend
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0806c47c73
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-20 (Thu, 20 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-20 20:13:44 +01:00
Michael Liebmann
17acd0c414 Fix include path for moved header files
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-12-13 18:09:09 +01:00
Jacek Jendrzej
fa069d793b supplement to faad967b97, simplification
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59fa692bd0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-08 16:28:53 +01:00
Jacek Jendrzej
faad967b97 add provider name to infobar , no gui option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bebdf91e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-08 11:15:40 +01:00
[CST] Bas
fe727eb954 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)



------------------
This commit was generated by Migit
2012-12-07 14:39:05 +08:00
[CST] Focus
7532a717e4 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
------------------
Branch: ni/coolstream
Commit: d5cd463e17
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)



------------------
This commit was generated by Migit
2012-12-04 14:52:03 +04:00
[CST] Focus
21018da479 neutrino.cpp: revert mount at startup to system -
fs can be not only ext3 but different


Origin commit data
------------------
Branch: ni/coolstream
Commit: c77138f260
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)



------------------
This commit was generated by Migit
2012-12-04 13:58:41 +04:00
[CST] Bas
0a8662961a neutrino: set new cpu clock after returning from standby.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8940ba4e7d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-04 00:31:36 +08:00
[CST] Bas
8bf199565c neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time).
Origin commit data
------------------
Branch: ni/coolstream
Commit: b018c08cce
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-04 00:28:34 +08:00
Stefan Seyfried
4edeb50241 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
------------------
Branch: ni/coolstream
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)



------------------
This commit was generated by Migit
2012-11-23 18:45:22 +01:00
Stefan Seyfried
05ac640b31 neutrino: clear currentnext event info when waking from standby
this ensures that the EVT_CURRENTEPG is delivered and playback
properly started after resuming from standby


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86876c76b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-21 (Wed, 21 Nov 2012)



------------------
This commit was generated by Migit
2012-11-21 16:41:37 +01:00
Jacek Jendrzej
050a3aef1b src/neutrino.cpp: add cancel message to RC_standby_on and RC_power_off (THX Gaucho316)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f8c9bbef1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-16 13:36:12 +01:00
[CST] Focus
6b429a3eae 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
------------------
Branch: ni/coolstream
Commit: b478212140
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)



------------------
This commit was generated by Migit
2012-11-15 19:12:13 +04:00
[CST] Bas
849d5ca191 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)



------------------
This commit was generated by Migit
2012-11-13 12:51:18 +08:00
[CST] Bas
fe5acac85c neutrino: destruct cpufreq if it was instantiated.
Origin commit data
------------------
Branch: ni/coolstream
Commit: be3c098cb8
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-13 12:42:20 +08:00
Stefan Seyfried
fbee2df820 Merge branch 'uncool/dvbsi++'
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


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



------------------
This commit was generated by Migit
2012-11-11 01:45:22 +01:00
Jacek Jendrzej
0af735aa17 src/gui/channellist.cpp:-add sort by channel number
Origin commit data
------------------
Branch: ni/coolstream
Commit: c47aebdb64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-09 17:32:15 +01:00
Jacek Jendrzej
e591a56cfd src/neutrino.cpp: see the appropriate message depending on settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: fdb1fa6352
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-09 15:31:26 +01:00
Jacek Jendrzej
548de02193 src/neutrino.cpp:use LOCALE_SLEEPTIMERBOX_ANNOUNCE , supplement to c8ecddea7a
Origin commit data
------------------
Branch: ni/coolstream
Commit: b56c863953
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-09 15:05:34 +01:00
Jacek Jendrzej
c8ecddea7a src/neutrino.cpp:-add ask MESSAGEBOX for INACTIVITY SLEEPTIMER
Origin commit data
------------------
Branch: ni/coolstream
Commit: 282560875b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-09 14:50:55 +01:00