Commit Graph

4569 Commits

Author SHA1 Message Date
Jacek Jendrzej
a1b099722c src/gui/channellist.cpp: fix to 1f453938a7
Origin commit data
------------------
Commit: 838cf61a69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 20:43:32 +02:00
Jacek Jendrzej
1f453938a7 src/gui/channellist.cpp: fix paint details with different font size
Origin commit data
------------------
Commit: 4a8350c382
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 19:28:30 +02: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
Jacek Jendrzej
19fc4580a7 src/neutrino.cpp: fix execute rcK script
Origin commit data
------------------
Commit: f5297f06d9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 11:59:48 +02: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
Stefan Seyfried
90a2e693bb fontrenderer: fix rendering problems with accelerated blitting
Origin commit data
------------------
Commit: ca9b85b3f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 13:12:09 +02:00
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