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

264 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
satbaby
c40361147d src/gui/epgview.cpp:check res after exec 2012-11-02 22:00:01 +01:00
[CST] Focus
af753fc4f1 gui/epgview.cpp: use g_InfoViewer->getUpdateTimer() 2012-11-02 16:09:30 +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
striper
6138e42948 - epgview: only hide info1 if info2 begins with info1 (port from tuxbox-cvs. THX Gaucho316) 2012-10-11 20:41:46 +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
satbaby
ab24c127c8 -add: show sore screenings in in extra window 2012-08-06 20:22:43 +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] Focus
5dd54caf54 fix conflict 2012-06-18 14:56:17 +04:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
35ee04049a remove obsolete and unused includes 2012-06-14 11:01:37 +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
6317064504 epgview: add event ID and table as last line to epg window 2012-04-17 19:33:53 +02:00
Stefan Seyfried
2f65aea744 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!
 2012-04-17 19:33:49 +02: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
346d3ad63e Use new class to fade 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1944 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-06 12:48:16 +00:00
focus
82d3290d98 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
 2011-11-26 12:45:02 +00:00
micha-bbg
4f4f46a912 Correct calculation of the size of logo in list header. 
- Function for calculating from infoviewer.cpp to pictureviewer.cpp moved
- Correct calculation in channellist.cpp, epgview.cpp and moviebrowser.cpp


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1869 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-21 23:11:52 +00:00
micha-bbg
2b12adebe0 Display error in the title of EPG information. 
- Calculate offset for the title when logo appears.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1799 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-01 09:00:38 +00:00
focus
28382c9aa5 Remove global allchans, use CServiceManager. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1649 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-01 12:24:18 +00:00
thilo
6a9a8d6d55 *neutrino epgview: fix max value of progressbar 
see also: http://www.dbox2-tuning.net/forum/viewtopic.php?p=380156#p380156
thx Gaucho316

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1641 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-08-31 16:25:02 +00:00
focus
9dadf4ff05 Remove extern; remove timer reset 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1564 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 10:11:55 +00:00
striper
339b869b64 - remove obsolete rtl workarounds (thx Gaucho316) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1492 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-25 16:47:36 +00:00
satbaby
3daae6d569 dont show logo if without Logo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1490 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-24 15:11:35 +00:00
focus
1df85f6ea3 Fade changes for new fb driver 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1413 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-23 10:24:09 +00:00
satbaby
7c49669d32 fix compil 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1387 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-11 14:00:35 +00:00
seife
90164158b3 epgview: rework hasFollowScreenings() and FollowScreenings() 
the current code has differences in hasFollowScreenings() and
FollowScreenings() leading to different results. hasFollow() returns
true but Follow() then notices that there are actually no repeats.
Fix this by making hasFollowScreenings() generate a list "followlist"
containing all repeats and FollowScreenings() use that list.
An added benefit is that the requested feature to add a possibility to
select one of the follow-ups for a record timer will be also able to
use that list ;-)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1383 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-10 18:10:25 +00:00
satbaby
74d2f2ee76 -add zapto time correction option 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1281 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-10 14:54:57 +00:00
thilo
be9380236d *neutrino epgview: unused variable removed 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1184 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-21 09:08:41 +00:00
thilo
e1f887af72 *neutrino buttonbars: reworked painting of buttonbar in 
channellist,
stringinput (also cleared some char format problems),
audioplayer,
bouqueteditor_bouqets,
bouqueteditor_channels,
bouqueteditor_chanselect,
bookmarkmanager,,
bouquetlist,
filebrowser,
epgplus,
epgview,
pictureviewer,
timerlist,
upnpbrowser

TODO:
This is still not a final solution. I would like to see buttonhandling in
own class for better integration and handling of window structure.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1179 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-21 09:08:10 +00:00
seife
e76b372031 neutrino: make big EPG window run-time configurable 
This was configurable with "-DUSE_SPACE_EFFICIENTLY" but can easily
be integrated into the OSD menu.
TODO: better locale texts could probably be found.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@967 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-26 11:34:13 +00:00
satbaby
d8489c3abc -fix set timer in findEvents 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@946 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-18 19:11:12 +00:00
satbaby
87b7d5db32 unintentional variable rename 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@838 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-10-13 18:04:28 +00:00
satbaby
dcb785079e osd fix, tab for screening 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@837 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-10-13 14:47:27 +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
253324226e Windows fade emulation. Some main windows at the moment only. New drivers needed. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@644 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-06-27 13:06:12 +00:00
satbaby
4f23553a27 show only standard icon size 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@632 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-06-18 04:57:07 +00:00
satbaby
a1603ae7c5 patch for width logos epilog ;) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@582 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-12 12:18:35 +00:00
satbaby
0dd250e707 patch for width logos 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@576 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-09 18:45:58 +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
satbaby
00d9b35c08 -add menu rounded corners on/off 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@395 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-20 21:29:30 +00:00
focus
8afd4d31d6 Separate subtitles preferences on request; Load english locale to use as default for not complete locales 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@385 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-19 14:00:53 +00:00
focus
e642e6f345 Fix black color corruption after scan; Change progressbar logic to follow progressbar_color setting, if bar created with blink enabled 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@333 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-13 10:52:19 +00:00
satbaby
8f59cc96ec change 'long long' tom int64_t'; change variable buf to new delete; 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-07 14:32:21 +00:00
focus
3fb6607ba0 Mode fb and picviewer cleanup; unify channel logo display code 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@259 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-05 15:26:57 +00:00
seife
808f965e7e neutrino: bring epgview code closer to tuxbox codebase 
* if epg title needs 2 lines, expand header downwards to make
  sure that we don't draw outside of the framebuffer
* if USE_SPACE_EFFICIENTLY is defined, do not resize the EPG window
  if the font size is switched but always paint the "big" window

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@227 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-30 17:28:38 +00:00
focus
95130dee5a All icon file names moved to icons.h; .raw extension removed from icon names 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@219 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-29 14:09:57 +00:00
satbaby
e27f666f80 reserve for head 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@207 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-24 10:20:49 +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