mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 1 Branch 51 Tags
0cfd982aa06aa45219db33ba370bafb024e6ea3b
Commit Graph

97 Commits

Author SHA1 Message Date
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
satbaby
59fa692bd0 supplement to 7bebdf91e0, simplification 2012-12-08 16:28:53 +01:00
satbaby
7bebdf91e0 add provider name to infobar , no gui option 2012-12-08 11:15:40 +01:00
Stefan Seyfried
57911bf009 infoviewer: make oldinfo a member of the class 2012-11-21 18:19:39 +01:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
 2012-11-03 10:45:33 +01:00
[CST] Focus
5c6c284c2f gui/infoviewer.cpp: add set/getUpdateTimer, dont set timer in start() 2012-11-02 16:09:25 +04:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
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
 2012-07-23 01:02:29 +02:00
[CST] Focus
343a2b9492 gui/infoviewer.cpp: comment unused CInfoViewerHandler 2012-06-13 15:25:55 +04:00
[CST] Focus
9013d64c14 gui/infoviewer.cpp: comment all showIcon_CA_Status calls, leave only one - on event; 
comment unused code
 2012-06-02 14:55:32 +04:00
micha-bbg
364b323607 * Infoviewer: rework buttonbar 
- add new class 'CInfoViewerBB' (infoviewer_bb.cpp)
- rework paint and calculate icons
- unused icons in the radio mode will not be displayed
- activate 'show resolution = off' in osd setup
- insert 'Display active tuner' in osd setup
 2012-05-19 15:46:37 +01:00
[CST] Focus
1e1b370321 gui/infoviewer.cpp: add destructor 2012-05-04 16:52:07 +04:00
Stefan Seyfried
38eb03547b neutrino: various fixes and ports from the original 
* avoid ambiguities in new and delete by always allocating char[]
* get rid of unused next_program_timer
* reduce code differences to original, known good neutrino code
 2012-04-17 19:33:56 +02:00
[CST] Focus
5027559691 Merge branch 'multituner' into dvbsi++ 2012-03-16 14:22:37 +04:00
[CST] Focus
68201bad9e fix conflict 2012-03-16 14:11:06 +04:00
satbaby
e7f4a0a9cc show infobar with colored freq after SDT freq update 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2150 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-15 18:06:22 +00:00
[CST] Focus
2c5e1e9948 gui/infoviewer.cpp: add showTitle for t_channel_id and CZapitChannel 2012-03-13 20:29:44 +04:00
[CST] Focus
f3d2895847 Merge branch 'master', remote-tracking branch 'origin' into dvbsi++ 2012-03-02 19:31:49 +04:00
[CST] Focus
2ecc60cf71 Merge branch 'master' into multituner 2012-03-02 18:59:50 +04:00
satbaby
987d592da5 infoviewer: extension infobar timeout for motor rotation 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2133 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-29 13:20:23 +00:00
[CST] Focus
8aace8f669 Merge branch 'master' into multituner 2012-02-15 13:51:38 +04:00
[CST] Focus
4dfaa13725 sync 2012-02-10 19:11:39 +04:00
micha-bbg
cce30fb301 * Custom Menu Icons 
- Use paint background to draw the icons in the info bar.
- Scale down var/hdd fill level in the info bar if larger icons are used.
- No change to use the original icons.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2083 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-07 11:12:52 +00:00
[CST] Focus
deeb24760e infoviewer: get satellite name from CServiceManager; add tuner number icon; use channel camap to display ca systems 2012-01-13 14:41:21 +04:00
focus
897a8293cd Pass reference to showMovieTitle; Fix function name 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1959 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-08 16:26:08 +00:00
focus
eed6f509a7 Use new class to fade. Old code commented for reference until confirmed no changes in behavior 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1951 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-06 15:13:04 +00:00
striper
57ed8ca478 - block FAV button in VirtualZAP mode to prevent unwanted/buggy behavior 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1768 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-21 11:03:11 +00:00
striper
ec402d9518 - add support for radiotext (needs testing) -> http://www.dbox2world.net/board293-coolstream-hd1/board296-coolstream-software/10635-radiotext-einbauen/ 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1501 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-06-02 15:29:40 +00:00
satbaby
e73cf4aa52 -add Logo+Kanalnummer/Signalbalken option 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1494 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-26 15:35:22 +00:00
seife
ca56d16908 infoviewer: scale filesystem bars with screen width 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1083 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 12:23:55 +00:00
satbaby
4ed28f963c reduce globales 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1078 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-28 09:45:30 +00:00
seife
65b1e20a83 movieplayer: display approx. playback position in infobar 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@891 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-11-27 13:57:01 +00:00
satbaby
34084de56f -add movieplayer icons to infoviewer 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@820 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-10-05 17:15:22 +00:00
seife
6861b2969c neutrino: port "show infobar on EPG change" from tuxbox 
Maybe this should be configurable besides the config file,
then another Menu item is needed...

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@736 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-08-22 17:25:56 +00:00
satbaby
c93a6b9797 optimize & fixes 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@703 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-08-04 16:23:15 +00:00
satbaby
1760ea8acb optimize & fixes 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@702 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-08-04 16:13:06 +00:00
satbaby
eed43dde92 -add resolution icon to infoviewer 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@694 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-07-31 14:11:05 +00:00
satbaby
adde01fe2e -add CA display mode 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@689 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-07-29 11:51:54 +00:00
satbaby
725dd0f905 patch for biger info icons in infobar 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@584 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-15 07:42:47 +00:00
satbaby
a61c82eaeb -add show infobar.txt window 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@583 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-14 12:20:57 +00:00
focus
56674d5561 Fixes for non-standart icon sizes. Not complete yet, work in progress. Probably will broke commit #568 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@569 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-06 09:39:29 +00:00
focus
8e2b5716ae Menu position settings 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@390 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-20 15:12:51 +00:00
satbaby
9a54710d40 git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@188 e54a6e83-5905-42d5-8d5c-058d10e6a962 2010-01-20 13:18:58 +00:00
satbaby
0efa0ba641 add change blink 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@182 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-18 15:37:10 +00:00
seife
34e3cf42d1 infoviewer: prepare for configurable logo position 
For now, this needs to be set with the LOGO_POS environment variable.
See the comment above showChannelLogo() for possible values.
Defaults should be the same as before, if not please report.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@178 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-17 20:05:20 +00:00
seife
697e3c6756 neutrino: consolidate CScale and CProgressBar code 
Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
      check if all progressbars still behave the same

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-03 10:39:40 +00:00
seife
115ba99f2e neutrino: rework infoviewer 
Make the infoviewer more "tuxbox-like". The default appearance should
only change marginally, but this provides infrastructure to:
*) disable the crypto icons (default if --disable-blinkenlights)
*) resize the infobar better to adapt to changed font sizes (not yet
   perfect, but better than before)
*) always vertically center the icons in the button bar (red green blue
   and AC3/16:9 etc)
The one thing visible immediately is that the infobar is always drawn
at the same height, regardless if the buttonbar is drawn below or not.
Originally I did it that way because a) the code was simpler and b) I
liked it better. If this is an issue, please report an I can change that.

I deliberately did not touch the display in file playback mode, this can
be done later once potential issues are shaken out.

Tis is a massive change, so I expect it to be not perfect. Please report
anything you find.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@98 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-20 21:08:35 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-08 11:05:11 +00:00