Commit Graph

124 Commits

Author SHA1 Message Date
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
755ddcb3da gui/streaminfo2.cpp: fix crash, when shown without current channel
(i.e. channel list empty)
2012-10-22 11:03:05 +04: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
Stefan Seyfried
022f269e09 streaminfo: fix possible crash if channel == NULL 2012-10-07 17:09:17 +02:00
satbaby
8f509f5dcf use new for buf, fix for last commit 2012-09-18 19:43:24 +02:00
satbaby
a84ba36e0b use new for buf, fix possible memlaek 2012-09-18 18:38:03 +02:00
satbaby
7b2ac6d337 streaminfo2.cpp:tiny fix 2012-09-17 14:17:16 +02:00
satbaby
7359504dd7 -fixes strncpy & buf size 2012-08-07 18:51:44 +02: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] Bas
b3038287d1 frontend: use a private version of FrontendParameters to include (optional) additional parameters like rolloff, delsys. 2012-06-22 14:15:30 +08:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
2f67821e5f gui/streaminfo2.cpp: unify sat/cable transponder info; cleanup; replace getCurrentServiceInfo() 2012-04-18 19:09:32 +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
1c86d5b334 streaminfo2: poll more often to avoid demux overflows
additionally a tiny loop optimization
2012-04-17 19:33:56 +02:00
Stefan Seyfried
3ac9bb5388 neutrino: simplify streaminfo and make it scaling-aware
fb->paintLine() is aware of scaling, but fb->paintPixel() is not.
Use paintLine() in streaminfo to fix it for scaling FB mode.
Simplify the code while we are at it.
2012-04-17 19:33:54 +02:00
Stefan Seyfried
1ab98c13f8 streaminfo: partly flickering fix (not ready for upstream) 2012-04-17 19:33:48 +02: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
93d6d19016 gui/streaminfo2.cpp: remove commented code 2012-03-14 19:42:41 +04:00
[CST] Focus
b060b88605 fix conflict 2012-03-11 16:30:15 +04:00
focus
4710b5b41d gui/streaminfo2.cpp: unify hex numbers to upper case
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2144 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-09 13:43:39 +00: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
focus
013ce5ce28 Enable screenshots; handle screenshot key in streaminfo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2091 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-02-15 13:34:07 +00:00
[CST] Focus
71bca85637 streaminfo2.cpp: add frontend class member;
show tuner number with name;
use channel ca sys map in place of global pmt_caids;
simplify paintCASystem
2012-01-13 15:31:05 +04:00
focus
c41baaaeab Remove redundant CStreamInfo2Handler
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1894 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-25 10:03:56 +00:00
focus
ba0e9b61e4 Close all on menu key; allow sat and fav keys
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1892 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-25 09:44:37 +00:00
thilo
db5065a357 *neutrino: revert changes for streaminfo
sorry, merge error in r1693

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1695 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-17 19:45:23 +00:00
thilo
f63e3a532f *neutrino record: reworked some code parts from last multirec commits
- avoids using of boolean structures for record modes calls, handling of
  enum calls from record manager class should be easier
- remove boolean structure from infoviewer
- use commonly member name for count of recordings,
  GetRecordCount should be more plausible than GetRecmapSize

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1693 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-17 19:32:34 +00:00
striper
99894a26d1 - fix streaminfo menu handler (patch by snafed)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1687 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-12 16:04:49 +00:00
focus
f677b002da Remove extern frontend, change demux
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1576 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-07-21 11:08:10 +00:00
satbaby
0d8febb9f6 streaminfo2:-fix osd
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1538 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-13 14:16:42 +00:00
satbaby
958ca99122 streaminfo2: -fix repaint casystem
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1458 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-05-11 10:15:33 +00:00
satbaby
42ba7d0dea streaminfo2: -fix repaint casystem
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1457 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-05-11 09:40:55 +00:00
satbaby
5f96e75c31 streaminfo2: show pmt version, show new pids after pmt update
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1455 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-05-10 18:24:43 +00:00
seife
34af85a647 fix "operation on 'sigBox_pos' may be undefined" compiler warning
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1442 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-05-07 09:06:09 +00:00
striper
798946e020 - streaminfo: set cable scaling to 27000 (for private cable providers)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1294 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-14 20:03:34 +00:00
satbaby
d3e779d811 -streaminfo2: scaling value for DVB-S2 to 27000
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1206 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-25 21:00:35 +00:00
thilo
ebb1370676 *neutrino streaminfo: use correct font color,
COL_MENUCONTENTDARK has bad sideeffect,  font is too bright (e.g Olive)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1053 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-26 11:04:36 +00:00
satbaby
d54571e6cd -add tuner name to streaminfo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@975 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-30 16:27:31 +00:00
seife
2590adfe15 add generic dispatcher headers for frontend etc
add generic audio, video and demux headers in zapit/include (TODO: put them
into a better place, or put wrappers into lib directories) that automatically
dispatch to the hardware specific functions and use them in the code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@962 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-25 17:43:28 +00:00
satbaby
8aa57aa5a7 -add frame rates
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@705 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-04 17:50:58 +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
focus
913a94ce76 Fix bouquet name in epgplus; Fix bitrate for radio channels; Show language settings before setup banner
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@688 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-07-29 11:25:43 +00:00
satbaby
9319eb06de optimize
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@368 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-18 11:36:50 +00:00
satbaby
0327137454 -fix cryptoinfo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@349 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-15 22:03:56 +00:00
satbaby
29ebf23541 -fix cryptoinfo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@348 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-15 21:55:11 +00:00
satbaby
f4dbb0ff36 git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@346 e54a6e83-5905-42d5-8d5c-058d10e6a962 2010-02-15 20:11:57 +00:00
satbaby
259f49c1bc tiny fix
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@344 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-15 09:52:17 +00:00
satbaby
273340f299 tiny fix
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@343 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-15 09:08:36 +00:00