mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,022 Commits 2 Branches 9 Tags
6127dbe28461736e10c9d2d1177cae3edfad1635
Commit Graph

143 Commits

Author SHA1 Message Date
Stefan Seyfried
6127dbe284 channellist: fix parental locking 
fix a merge error introduced during the twin merge (correct
code was in commt 593aba68a4)


Origin commit data
------------------
Commit: 7a4e58e44f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-16 (Sun, 16 Sep 2012)

Origin message was:
------------------
channellist: fix parental locking

fix a merge error introduced during the twin merge (correct
code was in commt 593aba68a4)
 2012-09-16 23:57:31 +02:00
Stefan Seyfried
28fb511a63 Merge branch 'neutrino-hd-tripledragon' into neutrino-mp 
Origin commit data
------------------
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)
 2012-09-15 12:14:33 +02:00
Stefan Seyfried
a52efec252 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: 3875af11de
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-08-14 (Tue, 14 Aug 2012)
 2012-08-14 11:52:17 +02:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f' 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
 2012-07-23 01:02:29 +02:00
[CST] Focus
9578e5da35 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: 6e0bc85a6c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
 2012-07-08 15:51:51 +04:00
Jacek Jendrzej
c4dfb269fc biggest chan number in list (revised) 
Origin commit data
------------------
Commit: 441cba7d4a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
 2012-07-07 21:10:10 +02:00
[CST] Focus
9e731dfdc7 gui/channellist.cpp: add comments for detail box draw 
Origin commit data
------------------
Commit: 9eb22c24c8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
 2012-07-02 20:53:20 +04:00
[CST] Focus
73ac1950c2 fix conflict 
Origin commit data
------------------
Commit: 5dd54caf54
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
 2012-06-18 14:56:17 +04:00
Jacek Jendrzej
18a471d92b use empty() instead of size() 
Origin commit data
------------------
Commit: c1a1aae4c1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
 2012-06-16 10:38:38 +02:00
Jacek Jendrzej
67903dc13b use empty() instead of size() 
Origin commit data
------------------
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
 2012-06-16 09:44:42 +02:00
[CST] Focus
4d152f3088 gui/channellist.cpp: remove direct access to channel->name 
Origin commit data
------------------
Commit: 90669b9945
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-13 (Wed, 13 Jun 2012)
 2012-06-13 17:07:55 +04:00
Jacek Jendrzej
aca2dcf451 add: sort channels in allchannel mode 
Origin commit data
------------------
Commit: 71832331d0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-24 (Tue, 24 Apr 2012)
 2012-04-24 14:14:42 +02:00
no@ma.il
ca80665eb6 channellist.cpp : fix biggest chan number in list 
Origin commit data
------------------
Commit: 6cfd4da52e
Author: no@ma.il <one@localhost.(none)>
Date: 2012-04-24 (Tue, 24 Apr 2012)
 2012-04-24 12:55:18 +02:00
[CST] Focus
178ba65e9a gui/channellist.cpp: add menu point to remove 'new' channel flag 
Origin commit data
------------------
Commit: 67c9e32bd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)
 2012-04-22 15:26:26 +04:00
[CST] Focus
db69cbe6db gui/channellist.cpp: fix last change in setSelected - always set tuned 
Origin commit data
------------------
Commit: 28352bcc52
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-21 (Sat, 21 Apr 2012)
 2012-04-21 16:52:02 +04:00
[CST] Focus
6b80fec434 gui/channellist.cpp: safe-check in setSelected(), to prevent crash if incorrect selected set 
Origin commit data
------------------
Commit: a3621a73ca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-20 (Fri, 20 Apr 2012)
 2012-04-20 20:09:25 +04:00
Stefan Seyfried
3dda6ee00f neutrino: adapt to the framebuffer_spark blitter change 
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content


Origin commit data
------------------
Commit: a029333c1a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
 2012-04-17 19:33:57 +02:00
Stefan Seyfried
9c93e4eabf channellist: always start video if parental lock is disabled 
this fixes an obscure wakeup-from-standby bug if parental locking is
disabled but a bouquet is marked as "locked" anyway


Origin commit data
------------------
Commit: 98e8e0f856
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
 2012-04-17 19:33:54 +02:00
Stefan Seyfried
692621d4b4 neutrino: do not display expired events in channel list 
Origin commit data
------------------
Commit: 3f84fb416f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)
 2012-04-17 19:33:52 +02:00
Stefan Seyfried
87b161bb16 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.

Attention: This code is GPL v3+ only for now!


Origin commit data
------------------
Commit: 2f65aea744
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)
 2012-04-17 19:33:49 +02:00
Stefan Seyfried
593aba68a4 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.


Origin commit data
------------------
Commit: 3999e8d0e2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
 2012-04-17 19:33:49 +02:00
Stefan Seyfried
2ffdc7e0d3 neutrino: port "EPG title in LCD" from tuxbox 
Origin commit data
------------------
Commit: a99ff05934
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)
 2012-04-17 19:33:45 +02:00
[CST] Focus
233b39dde0 gui/scan_setup.cpp, 
gui/channellist.cpp,
gui/bedit/bouqueteditor_channels.cpp,
gui/bedit/bouqueteditor_chanselect.cpp: use transponder::description to show channel details


Origin commit data
------------------
Commit: 1c2363cfb4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-17 (Tue, 17 Apr 2012)
 2012-04-17 18:42:52 +04:00
[CST] Focus
d3a2e853ee GUI: add support for L/R, use transponder::pol to display polarization 
Origin commit data
------------------
Commit: c14741dcd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-16 (Mon, 16 Apr 2012)
 2012-04-16 16:56:26 +04:00
[CST] Focus
0fda29614e gui/channellist.cpp: remove bouquetList checks, it never should be NULL 
Origin commit data
------------------
Commit: 9bcc63ea01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-05 (Thu, 05 Apr 2012)
 2012-04-05 20:29:07 +04:00
[CST] Focus
feb8ad00d3 gui/channellist.cpp: remove unused if/else in CChannelList::paintDetails 
Origin commit data
------------------
Commit: 7abc312042
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-05 (Thu, 05 Apr 2012)
 2012-04-05 19:57:49 +04:00
[CST] Focus
9bae735344 gui/channellist.cpp: remove CmpChannel.. 
Origin commit data
------------------
Commit: 07a250130b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-05 (Thu, 05 Apr 2012)
 2012-04-05 18:57:50 +04:00
[CST] Focus
f68ef9fd75 gui/channellist.cpp: remove switch(), use CRCInput::getNumericValue 
Origin commit data
------------------
Commit: 2cb3edd0eb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-04 (Wed, 04 Apr 2012)
 2012-04-04 18:45:40 +04:00
[CST] Focus
1d130adc7e gui/channellist.cpp: reuse code as updateSelection() 
Origin commit data
------------------
Commit: 3d5d834f3c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-04 (Wed, 04 Apr 2012)
 2012-04-04 18:34:51 +04:00
[CST] Focus
ad35ccbc83 Mark some found bugs with FIXME 
Origin commit data
------------------
Commit: 2209489d3e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-22 (Thu, 22 Mar 2012)
 2012-03-22 18:15:18 +04:00
[CST] Focus
7ee579ca93 gui/channellist.cpp: bugfix, reset selected chid in setSelected 
Origin commit data
------------------
Commit: 70371b93a9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-19 (Mon, 19 Mar 2012)
 2012-03-19 18:06:57 +04:00
[CST] Focus
5566fa4cc6 gui/channellist.cpp: comment CVFD::getInstance()->setMode in show(), 
call it after channel list closed, to prevent recursive calls on
bouquet lists close. Some places to call could be missed


Origin commit data
------------------
Commit: a0fff2b417
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)
 2012-03-16 15:08:09 +04:00
[CST] Focus
e538503806 gui/channellist.cpp: fix warning 
Origin commit data
------------------
Commit: 984eccc84a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)
 2012-03-16 14:27:58 +04:00
[CST] Focus
d699d54d64 Merge branch 'multituner' into dvbsi++ 
Origin commit data
------------------
Commit: 5027559691
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)
 2012-03-16 14:22:37 +04:00
[CST] Focus
846e9a1f11 gui/channellist.cpp: add getActiveChannel; 
remove old and commented code;
add left key as backspace in numericZap;
simplify numericZap and virtual zap;


Origin commit data
------------------
Commit: 521486229c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)
 2012-03-16 14:18:40 +04:00
[CST] Focus
539781822a fix conflict 
Origin commit data
------------------
Commit: 68201bad9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)
 2012-03-16 14:11:06 +04:00
Michael Liebmann
c055d3b43f Fix error message in CChannelList::putChannel 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2148 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: f13a3203af
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-03-15 (Thu, 15 Mar 2012)

Origin message was:
------------------
* Fix error message in CChannelList::putChannel


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2148 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-15 08:24:43 +00:00
[CST] Focus
1f64ea04fd WIP. stop assuming whole channel list selected == channel number 
Origin commit data
------------------
Commit: 008940a3b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-14 (Wed, 14 Mar 2012)
 2012-03-14 19:44:06 +04:00
[CST] Focus
2423afd411 gui/channellist.cpp: style, remove space before () 
Origin commit data
------------------
Commit: d0af67f529
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
 2012-03-13 14:49:52 +04:00
[CST] Focus
fedd70b214 Merge remote-tracking branch 'origin/master' into dvbsi++ 
Origin commit data
------------------
Commit: e9430aec0d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)
 2012-02-19 13:20:19 +04:00
[CST] Focus
5a1ee9bfd0 Merge branch 'master' into multituner 
Origin commit data
------------------
Commit: 97b72836a9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)
 2012-02-19 12:25:28 +04:00
Thilo Graf
330df85965 neutrino channellist: hide list on starting record 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2102 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e0b3e556e8
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-02-15 (Wed, 15 Feb 2012)

Origin message was:
------------------
*neutrino channellist: hide list on starting record

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2102 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 18:21:45 +00:00
[CST] Focus
498eee39b8 Merge branch 'master' into multituner 
Origin commit data
------------------
Commit: 7e469e7c4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
 2012-01-26 19:37:46 +04:00
Jacek Jendrzej
2fafab9ef7 dont reload chanellist after manuel reload 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2065 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 163052cd39
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-01-17 (Tue, 17 Jan 2012)
 2012-01-17 20:07:13 +00:00
[CST] Focus
55ad5c1b9a channellist: new SameTP with channel param; use CFEManager to get frontend and check is it possible to zap 
Origin commit data
------------------
Commit: 7a5d87d6b1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)
 2012-01-13 15:08:14 +04:00
[CST] Focus
c326df4e72 Fix ghost infobar, if channel zap not possible because of recording 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1972 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: c253d606c7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-14 (Wed, 14 Dec 2011)
 2011-12-14 13:34:25 +00:00
[CST] Focus
02e2745f22 Use new class to fade 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1942 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 3c2845d590
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-06 (Tue, 06 Dec 2011)
 2011-12-06 12:29:16 +00:00
[CST] Focus
74d57ebc3c Experimental: save/restore screen for channel list context menu 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1935 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e85c48501f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-05 (Mon, 05 Dec 2011)
 2011-12-05 14:16:28 +00:00
[CST] Focus
ff2de7c8cb Remove unused g_settings.gtx_alpha1/2 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1917 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 82d3290d98
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)
 2011-11-26 12:45:02 +00:00
[CST] Focus
70204c7dce Remove global c_SMSKeyInput 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1915 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: a73ea424b9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)
 2011-11-26 11:28:17 +00:00