Commit Graph

3956 Commits

Author SHA1 Message Date
[CST] Focus
0dc2dca8f6 At the moment only configured satellites are saved, so getUnknownKeyQueryedFlag()
always return true -> config saved on every start.

Revert "femanager: save frontend.conf if new entries are present"

This reverts commit 46cd1161f3.

Conflicts:
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: da646d5d15
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 16:07:08 +04:00
[CST] Focus
41b33e398b gui/scan_setup.cpp: remove linkFrontends() from saveScanSetup() - its done if needed on leave tuner setup
Origin commit data
------------------
Commit: 3526df97ee
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 15:28:21 +04:00
[CST] Focus
102ff0ad57 zapit/src/frontend.cpp: reset transponder id in Init()
Origin commit data
------------------
Commit: 7b1cc74098
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 15:04:10 +04:00
[CST] Focus
9bdf283420 gui/cam_menu.cpp: add option to ignore CI/card messages
Origin commit data
------------------
Commit: ae1ae59b68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 13:17:17 +04:00
[CST] Focus
f5481cd0fe locals: add locale for ignore CI messages option
Origin commit data
------------------
Commit: b8519d2db0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 13:16:40 +04:00
[CST] Focus
b5c831bb3d neutrino.cpp: add ci_ignore_messages settings var
Origin commit data
------------------
Commit: f36200e0fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 13:16:16 +04:00
[CST] Focus
2cc610e175 gui/test_menu.cpp: fix compile
Origin commit data
------------------
Commit: 2cc3c213b5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 12:53:54 +04:00
[CST] Focus
15a29ba0e2 gui/infoviewer_bb.cpp: fix tuner icon display
Origin commit data
------------------
Commit: eedf2f9e49
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
2013-04-16 12:50:24 +04:00
[CST] Focus
78169914d5 remove more 'coolstream' from webif
Origin commit data
------------------
Commit: dcf0703cd0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 19:23:08 +04:00
[CST] Focus
c0c59e8b23 remove 'coolstream' from webif
Origin commit data
------------------
Commit: 4b5a840b2e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 18:39:28 +04:00
Jacek Jendrzej
56ea461119 src/neutrino.cpp: fix execute rcK script
Origin commit data
------------------
Commit: 9fe2f83987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 14:09:13 +04:00
[CST] Focus
c54a1188b7 neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 18:37:25 +04:00
[CST] Focus
49340af282 neutrino.cpp: fix unused variable warning
Origin commit data
------------------
Commit: 8c2362374d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 16:02:29 +04:00
[CST] Focus
60985d9431 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
------------------
Commit: e250588705
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 13:12:05 +04:00
[CST] Focus
8088afd2d6 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
------------------
Commit: 89423d49b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 13:10:56 +04:00
[CST] Focus
9e146aa35c neutrino.cpp: stop PiP in standby
Origin commit data
------------------
Commit: 0f90276877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 10:58:54 +04:00
Jacek Jendrzej
020fed2bb6 src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316
Origin commit data
------------------
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
2013-04-09 09:54:26 +04:00
Jacek Jendrzej
0a4ec2b54a src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316
Origin commit data
------------------
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
2013-04-09 09:54:21 +04:00
Jacek Jendrzej
bca2dfd6c4 src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway
Origin commit data
------------------
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
2013-04-09 09:54:16 +04:00
Jacek Jendrzej
ebdbee58b5 revert 89251f648ea431eb2808e3e4e575b3dc1c25a1c8 && 89251f648ea431eb2808e3e4e575b3dc1c25a1c8
Origin commit data
------------------
Commit: 80c8607396
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)
2013-04-09 09:54:12 +04:00
[CST] Focus
0fa4da9c7c gui/channellist.cpp: fix current transponder key
Origin commit data
------------------
Commit: 06372e1856
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)
2013-04-08 18:02:03 +04:00
Stefan Seyfried
3188e9c597 fontrenderer: allow using customcolor.h colors for fonts
Origin commit data
------------------
Commit: b4144b1de7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-08 13:04:40 +04:00
Stefan Seyfried
90d15fdd0c mp3dec: recover from PCM write errors without crashing
Origin commit data
------------------
Commit: 02efe0918a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-08 13:04:32 +04:00
Stefan Seyfried
2c9f34cafe fontrenderer: use background color of framebuffer
Origin commit data
------------------
Commit: b0e07383c7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 13:04:22 +04:00
Stefan Seyfried
7c0274d474 CScanTs: add destructor to avoid leaks
Conflicts:
	src/gui/scan.h


Origin commit data
------------------
Commit: 5371fd6c90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 13:01:00 +04:00
Stefan Seyfried
39064ecae6 audioplayer: don't free curl_handle too early
Origin commit data
------------------
Commit: fcd65c2ce3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-08 10:14:17 +04:00
Michael Liebmann
1dccec2b95 src/gui/audioplayer.cpp: Fix segfault in audioplayer osd
Origin commit data
------------------
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
2013-04-08 10:02:40 +04:00
Stefan Seyfried
36c317f2d6 nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Commit: 5db15cc630
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 10:02:33 +04:00
Thilo Graf
fa485068e7 CTimeOsd: remove unused var timescale
Conflicts:
	src/gui/timeosd.cpp


Origin commit data
------------------
Commit: 211f85966a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-08 10:01:04 +04:00
Stefan Seyfried
609b8d88f1 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: b79b13a411
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 09:59:18 +04:00
Jacek Jendrzej
26db5ec262 revert commit f4ae5e17ce00575de61daba517f37a4bb9252836
Origin commit data
------------------
Commit: 6d56cc0696
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 09:59:04 +04:00
Stefan Seyfried
78e1332111 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
------------------
Commit: 230096c050
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-04-05 18:29:08 +04:00
Stefan Seyfried
a3bd83cd53 neutrino: do not display expired events in channel list
Origin commit data
------------------
Commit: 6bc2a8a5d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)
2013-04-05 16:32:43 +04:00
Stefan Seyfried
29998498f3 dvbsubtitle: free avcodec context in destructor
Origin commit data
------------------
Commit: 227bf9f2e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
2013-04-05 15:54:12 +04:00
Stefan Seyfried
1f0eb08e26 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
------------------
Commit: be1b73b7a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-08-14 (Tue, 14 Aug 2012)
2013-04-05 15:53:30 +04:00
Stefan Seyfried
9ba28c1287 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
------------------
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
2013-04-05 15:52:58 +04:00
[CST] Focus
ea33de8f9a 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
------------------
Commit: d79d592d27
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)
2013-04-05 15:15:44 +04:00
[CST] Focus
1d17890343 dutch.locale: update
Origin commit data
------------------
Commit: 83cbc1cbef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-05 14:54:22 +04:00
[CST] Focus
297c368291 driver/record.cpp: add record duration to stop menu
Origin commit data
------------------
Commit: 1c2f2a5750
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-05 14:54:22 +04:00
Stefan Seyfried
51a9a3b894 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
------------------
Commit: e09bc260da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)
2013-04-05 14:50:28 +04:00
[CST] Focus
71f85c907c zapit/src/bouquets.cpp: use FindChannelFuzzy() on cable-only box to help importing old bouquets
Origin commit data
------------------
Commit: 87abc0d1c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)
2013-04-02 14:32:23 +04:00
[CST] Focus
03226d57d5 zapit/src/getservices.cpp: fix FindChannelFuzzy for mixed frontends
Origin commit data
------------------
Commit: 4e2a08dba4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)
2013-04-02 14:30:28 +04:00
[CST] Focus
5545ae8ad9 zapit/src/femanager.cpp: add cached have_sat/cable flags
Origin commit data
------------------
Commit: 6753630b68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)
2013-04-02 14:30:01 +04:00
[CST] Focus
f84899764e deutsch.locale: remove 'coolstream' after merge
Origin commit data
------------------
Commit: 4d1bf5c3d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-01 16:30:36 +04:00
vanhofen
544669f8c9 bouqueteditor_chanselect.cpp: fix height
Conflicts:
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
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
2013-04-01 16:21:18 +04:00
Jacek Jendrzej
30c9a0e022 src/gui/channellist.cpp: fix to 36e95d7fbcd22dfbb94d03867f10634f7a72df63 if more bouquets empty
Origin commit data
------------------
Commit: 25653df890
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
2013-04-01 16:19:51 +04:00
Jacek Jendrzej
74eeae3a1e data/satellites.xml: update Eurobird 9A (9.0E)
Origin commit data
------------------
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)
2013-04-01 16:18:42 +04:00
vanhofen
a09ae782bf epgplus.cpp: use getScreen{Width/Height}Rel()
Origin commit data
------------------
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()
2013-04-01 16:18:31 +04:00
vanhofen
204d3ca7bb osd_progressbar_setup: rework locales; marginal changes in code
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
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
2013-04-01 16:14:29 +04:00
Stefan Seyfried
a8e77f8b06 filebrowser: simplify code using font pointers and ...
... make size, time and mode fields scale with fontsize


Origin commit data
------------------
Commit: 6bb85ef71d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-04-01 16:05:40 +04:00