Commit Graph

3953 Commits

Author SHA1 Message Date
[CST] Focus
05ecb2205b gui/cam_menu.cpp: add option to ignore CI/card messages
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1ae59b68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-16 13:17:17 +04:00
[CST] Focus
1d4ac9f239 locals: add locale for ignore CI messages option
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8519d2db0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-16 13:16:40 +04:00
[CST] Focus
17808e8e84 neutrino.cpp: add ci_ignore_messages settings var
Origin commit data
------------------
Branch: ni/coolstream
Commit: f36200e0fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-16 13:16:16 +04:00
[CST] Focus
d5e8898282 gui/test_menu.cpp: fix compile
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cc3c213b5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-16 12:53:54 +04:00
[CST] Focus
e9edabd12f gui/infoviewer_bb.cpp: fix tuner icon display
Origin commit data
------------------
Branch: ni/coolstream
Commit: eedf2f9e49
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-16 12:50:24 +04:00
[CST] Focus
9867a3e921 remove more 'coolstream' from webif
Origin commit data
------------------
Branch: ni/coolstream
Commit: dcf0703cd0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-10 19:23:08 +04:00
[CST] Focus
1859fdb6ec remove 'coolstream' from webif
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b5a840b2e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-10 18:39:28 +04:00
Jacek Jendrzej
c8ac087adf src/neutrino.cpp: fix execute rcK script
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fe2f83987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-10 14:09:13 +04:00
[CST] Focus
2e5bd433fa neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-09 18:37:25 +04:00
[CST] Focus
0da88e2139 neutrino.cpp: fix unused variable warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c2362374d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-09 16:02:29 +04:00
[CST] Focus
8c9f0af590 src/neutrino.cpp: setSelected(old_num) on channel list exit wrong in case of sort
mode change - try to restore current channel id


Origin commit data
------------------
Branch: ni/coolstream
Commit: e250588705
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)



------------------
This commit was generated by Migit
2013-04-09 13:12:05 +04:00
[CST] Focus
f84e0a82c6 gui/channellist.cpp: set oldselected to selected on sort mode change,
else wrong selected restored on exit;
store channel to history only if adjustToChannelID called with bToo == true, which means zap


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89423d49b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)



------------------
This commit was generated by Migit
2013-04-09 13:10:56 +04:00
[CST] Focus
2e69c38b88 neutrino.cpp: stop PiP in standby
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f90276877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-09 10:58:54 +04:00
Jacek Jendrzej
ab3d050d20 src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72b82a1d0b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316

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

------------------
This commit was generated by Migit
2013-04-09 09:54:26 +04:00
Jacek Jendrzej
e8eea47e30 src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d214c2fe4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316

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

------------------
This commit was generated by Migit
2013-04-09 09:54:21 +04:00
Jacek Jendrzej
f65d5892de src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32909483ef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway

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

------------------
This commit was generated by Migit
2013-04-09 09:54:16 +04:00
Jacek Jendrzej
1fff9ec3fb revert 89251f648ea431eb2808e3e4e575b3dc1c25a1c8 && 89251f648ea431eb2808e3e4e575b3dc1c25a1c8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80c8607396
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-09 09:54:12 +04:00
[CST] Focus
948ba1373b gui/channellist.cpp: fix current transponder key
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06372e1856
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 18:02:03 +04:00
Stefan Seyfried
f2921ea799 fontrenderer: allow using customcolor.h colors for fonts
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4144b1de7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 13:04:40 +04:00
Stefan Seyfried
b9190be1d2 mp3dec: recover from PCM write errors without crashing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02efe0918a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 13:04:32 +04:00
Stefan Seyfried
9620d7a8c9 fontrenderer: use background color of framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: b0e07383c7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 13:04:22 +04:00
Stefan Seyfried
a4aa5435c1 CScanTs: add destructor to avoid leaks
Conflicts:
	src/gui/scan.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5371fd6c90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-08 13:01:00 +04:00
Stefan Seyfried
3739b6846f audioplayer: don't free curl_handle too early
Origin commit data
------------------
Branch: ni/coolstream
Commit: fcd65c2ce3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 10:14:17 +04:00
Michael Liebmann
8765de2984 src/gui/audioplayer.cpp: Fix segfault in audioplayer osd
Origin commit data
------------------
Branch: ni/coolstream
Commit: f1740ac21b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-07 (Sun, 07 Apr 2013)

Origin message was:
------------------
* src/gui/audioplayer.cpp: Fix segfault in audioplayer osd

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

------------------
This commit was generated by Migit
2013-04-08 10:02:40 +04:00
Stefan Seyfried
c7ae873506 nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db15cc630
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 10:02:33 +04:00
Thilo Graf
7014ca0c0a CTimeOsd: remove unused var timescale
Conflicts:
	src/gui/timeosd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 211f85966a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-08 10:01:04 +04:00
Stefan Seyfried
f2f486606b CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: b79b13a411
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-08 09:59:18 +04:00
Jacek Jendrzej
6f534c2fd6 revert commit f4ae5e17ce00575de61daba517f37a4bb9252836
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d56cc0696
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 09:59:04 +04:00
Stefan Seyfried
93ec89f184 msgbox: add rounded corners
This is not entirely correct, as the corners will be wong
if a msgbox without header or footer is used. But as the
only place where this is used is ShowMsg2UTF() which has
header and footer, it does not matter right now.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 230096c050
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)



------------------
This commit was generated by Migit
2013-04-05 18:29:08 +04:00
Stefan Seyfried
800d10bfd5 neutrino: do not display expired events in channel list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6bc2a8a5d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)


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

------------------
This commit was generated by Migit
2013-04-05 16:32:43 +04:00
Stefan Seyfried
d7287af35d dvbsubtitle: free avcodec context in destructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 227bf9f2e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)


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

------------------
This commit was generated by Migit
2013-04-05 15:54:12 +04:00
Stefan Seyfried
c8375fc05c channellist: limit context-menu on non-unlocked bouquets
don't allow adding of channels from locked bouquets to favorites
or unlocked bouquets to avoit circumvention of bouquet locks


Origin commit data
------------------
Branch: ni/coolstream
Commit: be1b73b7a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-08-14 (Tue, 14 Aug 2012)



------------------
This commit was generated by Migit
2013-04-05 15:53:30 +04:00
Stefan Seyfried
d2478aa428 neutrino: add the possibility to lock bouquets by default
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)



------------------
This commit was generated by Migit
2013-04-05 15:52:58 +04:00
[CST] Focus
e948052a53 gui/channellist.cpp: move info/menu/zap icons from head to button bar;
add play button icon for PiP;
rework CChannelList::paintButtonBar;
handle PiP key binding in addition to play button


Origin commit data
------------------
Branch: ni/coolstream
Commit: d79d592d27
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)



------------------
This commit was generated by Migit
2013-04-05 15:15:44 +04:00
[CST] Focus
05543c248f dutch.locale: update
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83cbc1cbef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-05 14:54:22 +04:00
[CST] Focus
30115b940b driver/record.cpp: add record duration to stop menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c2f2a5750
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-05 14:54:22 +04:00
Stefan Seyfried
42e163074f neutrino: make button bar use available space intelligently
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e09bc260da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)



------------------
This commit was generated by Migit
2013-04-05 14:50:28 +04:00
[CST] Focus
37774baa82 zapit/src/bouquets.cpp: use FindChannelFuzzy() on cable-only box to help importing old bouquets
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87abc0d1c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-02 14:32:23 +04:00
[CST] Focus
5eb25b1b54 zapit/src/getservices.cpp: fix FindChannelFuzzy for mixed frontends
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e2a08dba4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-02 14:30:28 +04:00
[CST] Focus
87eb85b6bb zapit/src/femanager.cpp: add cached have_sat/cable flags
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6753630b68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-02 14:30:01 +04:00
[CST] Focus
108c61b111 deutsch.locale: remove 'coolstream' after merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d1bf5c3d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-01 16:30:36 +04:00
vanhofen
9b603cd559 bouqueteditor_chanselect.cpp: fix height
Conflicts:
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7754b8f54e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-29 (Fri, 29 Mar 2013)

Origin message was:
------------------
- bouqueteditor_chanselect.cpp: fix height

Conflicts:
	src/gui/bedit/bouqueteditor_chanselect.cpp


------------------
This commit was generated by Migit
2013-04-01 16:21:18 +04:00
Jacek Jendrzej
75ef8a2298 src/gui/channellist.cpp: fix to 36e95d7fbcd22dfbb94d03867f10634f7a72df63 if more bouquets empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25653df890
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)


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

------------------
This commit was generated by Migit
2013-04-01 16:19:51 +04:00
Jacek Jendrzej
638cfa83fa data/satellites.xml: update Eurobird 9A (9.0E)
Origin commit data
------------------
Branch: ni/coolstream
Commit: cecbd13107
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
data/satellites.xml: update Eurobird 9A (9.0E)

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

------------------
This commit was generated by Migit
2013-04-01 16:18:42 +04:00
vanhofen
106dcb7d17 epgplus.cpp: use getScreen{Width/Height}Rel()
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7ebed39cb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- epgplus.cpp: use getScreen{Width/Height}Rel()

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

------------------
This commit was generated by Migit
2013-04-01 16:18:31 +04:00
vanhofen
404e090810 osd_progressbar_setup: rework locales; marginal changes in code
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: c20d1ef6eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code

Conflicts:
	data/locale/deutsch.locale


------------------
This commit was generated by Migit
2013-04-01 16:14:29 +04:00
Stefan Seyfried
43d4b450a9 filebrowser: simplify code using font pointers and ...
... make size, time and mode fields scale with fontsize


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6bb85ef71d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)



------------------
This commit was generated by Migit
2013-04-01 16:05:40 +04:00
Stefan Seyfried
1a52a851d2 infoviewer: make oldinfo a member of the class
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ee9088f28
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)


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

------------------
This commit was generated by Migit
2013-04-01 15:48:00 +04:00
Stefan Seyfried
324fd24f55 channellist: refactor to avoid duplicated code
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d318fd296
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)



------------------
This commit was generated by Migit
2013-04-01 15:47:10 +04:00
Stefan Seyfried
52913632a9 CVolume: remove duplicate code
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3e333582c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)


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

------------------
This commit was generated by Migit
2013-04-01 15:43:37 +04:00