Commit Graph

5110 Commits

Author SHA1 Message Date
Stefan Seyfried
d7704f4dc8 fontrenderer: allow using customcolor.h colors for fonts
Origin commit data
------------------
Commit: 90c252f6f9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-09 13:12:00 +02:00
Stefan Seyfried
ca13423a3e fontrenderer: use background color of framebuffer
Origin commit data
------------------
Commit: e66b57cd88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-09 13:11:53 +02: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
Jacek Jendrzej
18f297c8fe src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316
Origin commit data
------------------
Commit: 6a32e96920
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-08 21:03:46 +02:00
Jacek Jendrzej
8bd17820b9 src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316
Origin commit data
------------------
Commit: d23bdf7bb8
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-08 20:41:36 +02:00
Jacek Jendrzej
9d4b074a55 revert 13e8556e3e && 13e8556e3e
Origin commit data
------------------
Commit: f3dcf52ea0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)
2013-04-08 18:03:33 +02:00
Jacek Jendrzej
a6254bb9cf src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway
Origin commit data
------------------
Commit: 67e6ed102c
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-08 17:42:37 +02:00
Michael Liebmann
5650cd72f6 src/gui/audioplayer.cpp: Fix osd (draw frame)
Origin commit data
------------------
Commit: 55e37eb2b5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
* src/gui/audioplayer.cpp: Fix osd (draw frame)
2013-04-08 16:01:27 +01: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
13e8556e3e fontrenderer: allow using customcolor.h colors for fonts
Origin commit data
------------------
Commit: 89251f648e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-08 10:36:50 +02:00
Stefan Seyfried
f241d11c93 audioplayer: don't free curl_handle too early
Origin commit data
------------------
Commit: a5c6160384
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-08 10:36:18 +02:00
Stefan Seyfried
3fdff68dff test_menu: fix path to demo picture
Origin commit data
------------------
Commit: 88fde35e52
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-08 10:35:43 +02:00
Stefan Seyfried
02331f5f31 mp3dec: recover from PCM write errors without crashing
Origin commit data
------------------
Commit: cc1dea140a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-08 10:35:03 +02:00
Stefan Seyfried
00300dc276 fontrenderer: use background color of framebuffer
Origin commit data
------------------
Commit: 629dc8562f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 10:34:33 +02:00
Stefan Seyfried
9673036256 CScanTs: silence valgrind
Origin commit data
------------------
Commit: 13871d8328
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 10:32:56 +02:00
Stefan Seyfried
5a7387099d CScanTs: add destructor to avoid leaks
Origin commit data
------------------
Commit: c0a1b8690f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 10:32:45 +02: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
Michael Liebmann
cb1114083c src/gui/audioplayer.cpp: Fix segfault in audioplayer osd
Origin commit data
------------------
Commit: 9a9a347ee3
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-07 22:07:38 +01:00
Thilo Graf
718644d286 CProgressBar: use correct default colors in constructor
Origin commit data
------------------
Commit: 276fa6273e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 20:37:54 +02:00
Stefan Seyfried
691b4639b9 cc_frm: fix invalid cast
Origin commit data
------------------
Commit: 8d8ce4c55a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:20:58 +02:00
Stefan Seyfried
96bb27184b nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Commit: 2ba024168d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:20:47 +02:00
Stefan Seyfried
105fa78aa2 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: 80e7f9753b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:14:06 +02:00
Jacek Jendrzej
07e4bd384d revert commit b212f46c3d
Origin commit data
------------------
Commit: e0facfa2e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:13:47 +02:00
Michael Liebmann
6720ef7539 Supplement to commit dde336f...
- epgview: Fix colors in progress bar


Origin commit data
------------------
Commit: d4740238dd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)

Origin message was:
------------------
* Supplement to commit dde336f...

- epgview: Fix colors in progress bar
2013-04-06 15:18:12 +01:00
Thilo Graf
1fe3cbe0b3 CChannellist: add missig frame for timscale
Origin commit data
------------------
Commit: 6fa592323b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 10:21:22 +02:00
Thilo Graf
604d4e0f99 CComponentsInfoBox: move statement for check of image name
Ensure empty pic object otherwise it can be retained on exit
of paintPicture(), if an instance of Infobox already exists.

supplement to ab59797ae5


Origin commit data
------------------
Commit: d7ce847471
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 08:49:16 +02:00
Thilo Graf
ab0e31bd05 Progressbars: use default frame thickness
It's unnecessary overhead to set the value everywhere, except it's needed.


Origin commit data
------------------
Commit: f70a30defa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)
2013-04-06 08:33:51 +02:00
Thilo Graf
ff40ada214 CProgressBar: remove wrong intital value for frame thickness
Default value is 0, and should remain as specified in the base class.


Origin commit data
------------------
Commit: 210ae1491d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)
2013-04-06 08:33:51 +02:00
Michael Liebmann
dde336facd Fix order of colors for some progress bars
Origin commit data
------------------
Commit: adfbfe079c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)

Origin message was:
------------------
* Fix order of colors for some progress bars
2013-04-05 19:43:50 +01: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