Commit Graph

186 Commits

Author SHA1 Message Date
Stefan Seyfried
04b916dbb7 add various variable initializations to keep valgrind happy 2012-10-31 23:02:34 +01:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.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/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
Thilo Graf
807dce9497 *CInfoViewer: don't show tuner icon with single boxes 2012-09-18 12:10:17 +02:00
[CST] Focus
1f4c39fdd3 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-13 15:00:34 +04:00
satbaby
576d3d9da0 infoviewer.cpp:fix showSysfsHdd 2012-09-13 12:59:18 +02:00
[CST] Focus
9fdbdbd343 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-13 11:24:13 +04:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
[CST] Focus
3f5a0e5bb1 remove channel_id mask for CEitManager getXXX calls 2012-08-30 14:50:01 +04:00
[CST] Focus
74a761ef50 use CEitManager to get EIT data 2012-08-30 11:40:02 +04:00
[CST] Focus
9630e1497d gui/infoviewer.cpp: adapt for new GetRecordMode() mask 2012-08-07 12:09:39 +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
satbaby
060c1c45b2 fix gcc 4.7.x warnings 2012-07-07 13:09:08 +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
svenhoefer
3b1d063c04 - infoviewer.cpp: more suitable icons for tuner 2012-05-14 21:56:16 +02:00
satbaby
489d88a9a2 initialize volues 2012-05-09 17:33:34 +02:00
[CST] Focus
1e1b370321 gui/infoviewer.cpp: add destructor 2012-05-04 16:52:07 +04:00
[CST] Focus
36b80096b9 gui/infoviewer.cpp: fix crash, if s.f_blocks is 0
happens if network_nfs_recordingdir set to not mounted dir under tmp or media
2012-04-19 18:26:47 +04:00
[CST] Focus
0b8adae5bd gui/infoviewer.cpp: dont use zapit client getCurrentServiceInfo() 2012-04-18 19:00:43 +04:00
Stefan Seyfried
a029333c1a 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
2012-04-17 19:33:57 +02:00
Stefan Seyfried
7fcd36ed66 spark: revert framebuffer scaling commits
we're going to use the STFB blitter instead of manually
scaling everything if the videomode is not 720p, so more
or less revert all commits regarding FB scaling:

Revert "fontrenderer: scale fonts for nonstandard FB resolutions"
Revert "neutrino: resize framebuffer on videomode change"
Revert "fontrenderer: fix issue with epgwindow font when FB is scaling"
Revert "neutrino: fix artefacts with scaling framebuffer and 1080i"
Revert "spark: draw lines 2px wide instead of 1 in full-HD mode"
Revert "spark: do not scale framebuffer for PAL mode"
Revert "spark: fix framebuffer glitches"
Revert "spark: do not sync blitter after every rectangle (improves performance)"
2012-04-17 19:33:57 +02:00
Stefan Seyfried
b8cf78a490 infoviewer: only show remaining time if time is set 2012-04-17 19:33:57 +02: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
Stefan Seyfried
3189f7fdc4 misc variable init fixes 2012-04-17 19:33:56 +02:00
Stefan Seyfried
1182430ac3 neutrino: fix artefacts with scaling framebuffer and 1080i 2012-04-17 19:33:54 +02:00
Stefan Seyfried
fb6633b7aa neutrino: avoid float for percent calculations 2012-04-17 19:33:51 +02:00
Stefan Seyfried
a99ff05934 neutrino: port "EPG title in LCD" from tuxbox 2012-04-17 19:33:45 +02:00
[CST] Focus
7fd5fc01e8 gui/infoviewer.cpp: set chanready on NeutrinoMessages::EVT_TUNE_COMPLETE 2012-04-17 14:58:11 +04:00
[CST] Focus
c14741dcd2 GUI: add support for L/R, use transponder::pol to display polarization 2012-04-16 16:56:26 +04:00
[CST] Focus
ea9c2fc136 gui/infoviewer.cpp: commit bouquetList checks, it never should be NULL 2012-04-05 20:32:09 +04:00
[CST] Focus
5027559691 Merge branch 'multituner' into dvbsi++ 2012-03-16 14:22:37 +04:00
[CST] Focus
02099ffd9a gui/infoviewer.cpp: add safe check 2012-03-16 14:20:26 +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
008940a3b7 WIP. stop assuming whole channel list selected == channel number 2012-03-14 19:44:06 +04: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
a41d93a686 Merge branch 'multituner' into dvbsi++ 2012-03-07 18:50:05 +04:00
[CST] Focus
55f29c5daf fix conflict 2012-03-07 17:55:10 +04:00
satbaby
2591100c42 remove never used volues
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-04 17:25:48 +00: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
bcfee650d2 gui/infoviewer.cpp: fix ca icons display 2012-02-23 17:27:58 +04:00
[CST] Focus
f8b3469f98 infoviewer.cpp: disable setServiceChanged 2012-02-21 18:58:49 +04:00
[CST] Focus
1af6f79d2c neutrino.cpp: register CZapitClient::EVT_TUNE_COMPLETE;
send full channel id with Sectionsd->setServiceChanged - mask will be done in sectionsd.cpp
2012-02-19 14:17:46 +04:00
[CST] Focus
e9430aec0d Merge remote-tracking branch 'origin/master' into dvbsi++ 2012-02-19 13:20:19 +04:00
[CST] Focus
97b72836a9 Merge branch 'master' into multituner 2012-02-19 12:25:28 +04:00
satbaby
382ec004ab -add settings menu screenshot
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2113 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-02-18 17:16:30 +00:00
[CST] Focus
8aace8f669 Merge branch 'master' into multituner 2012-02-15 13:51:38 +04:00