mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 15:41:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,610 Commits 2 Branches 9 Tags
c44f82f12a03960c7358d990f3a11cf33f2a2c0f
Commit Graph

403 Commits

Author SHA1 Message Date
Stefan Seyfried
f2a2e699c2 global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 10:40:03 +01:00
martii
1000ab9237 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
 2013-11-09 17:03:03 +01:00
Thilo Graf
5f9bb84b28 revert 2649ca147a 
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget


Origin commit data
------------------
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)
 2013-10-26 23:25:59 +02:00
Thilo Graf
2649ca147a CComponents: rename hide() to hideCC() 
There are too many name conflicts with hide-members in other classes.


Origin commit data
------------------
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
 2013-10-24 21:39:04 +02:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
defans
3b3597ae9a Fix infoviewer global font zoom faktor 
Change the zoom factor made ​​time display broken, left side


Origin commit data
------------------
Commit: ab1c33f024
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-03 (Thu, 03 Oct 2013)
 2013-10-03 18:01:15 +02:00
Thilo Graf
1b666d196b CInfoViewer: fix missing displaying content of infobar.txt 
Text from infobar.txt was not painted after channel switch or in
virtual zap mode.
Thx snafed for suggestion.

TODO: many flicker effects in "virtual zap mode"


Origin commit data
------------------
Commit: 648218fc99
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)
 2013-10-01 10:09:08 +02:00
Thilo Graf
e0d485befc CInfoViewer: remove unused code 
Logo background handling can be done with CComponentsChannelLogo object soon.


Origin commit data
------------------
Commit: 93f177b8aa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)
 2013-10-01 10:09:07 +02:00
Stefan Seyfried
14d73c9280 remove all fb->blit() calls 
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
 2013-09-28 13:01:03 +02:00
Thilo Graf
975673532a CComponents: remove member setCornerRadius(), 
setCorner() replaces this function, 2nd parameter sets type


Origin commit data
------------------
Commit: 33ec56ad6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)
 2013-09-19 08:24:40 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
[CST] Focus
8f3db3d809 gui/infoviewer.cpp: fix shadow 
Origin commit data
------------------
Commit: 036ef3399a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
 2013-07-30 15:24:51 +04:00
[CST] Focus
df055e6ce1 gui/infoviewer.cpp: disable EVT_NOEPG_YET in virtual zap mode 
Origin commit data
------------------
Commit: bbe63318b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
 2013-07-30 11:13:50 +04:00
Michael Liebmann
7b6498d39f Replace color indexes of the text colors by real color values for RenderString() 
- If necessary, Correct data types of the color values


Origin commit data
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
 2013-07-21 22:00:58 +02:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
Michael Liebmann
5e2fac3491 Fix paint VolumeBar on InfoViewer 
Origin commit data
------------------
Commit: 31e2dae622
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-26 (Wed, 26 Jun 2013)
 2013-07-03 07:30:09 +02:00
Stefan Seyfried
38ea5ba88c infoviewer: always paint 'no epg...' in the same place 
Origin commit data
------------------
Commit: 93a428c817
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 12:25:58 +02:00
Stefan Seyfried
6b1267e8e0 infoviewer: simplify show_current_next() 
Origin commit data
------------------
Commit: 06ea41f003
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 12:24:54 +02:00
Stefan Seyfried
fc9a9433d0 infoviewer: always paint 'no epg...' in the same place 
Origin commit data
------------------
Commit: da79e3b205
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 11:33:47 +02:00
Stefan Seyfried
139f4576f0 infoviewer: simplify show_current_next() 
Origin commit data
------------------
Commit: a579bd092b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 11:33:04 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Stefan Seyfried
748b384771 neutrino: explicitly include vfd/lcd header 
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).


Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
 2013-05-11 17:17:33 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
vanhofen
2511e2a700 infoviewer: get width of timescale from progressbar object ... 
.. to remove hardcoded timescale width in showInfoFile()


Origin commit data
------------------
Commit: 7d5ecda6e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- infoviewer: get width of timescale from progressbar object ...

.. to remove hardcoded timescale width in showInfoFile()
 2013-05-10 09:33:25 +02:00
Thilo Graf
15d4254054 CInfoViewer: use correct text color in showInfoFile() 
Origin commit data
------------------
Commit: 19f2d556ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)
 2013-04-27 22:20:10 +02:00
Thilo Graf
6458c5cfb1 CInfoViewer: add member killInfobarText() 
Ensure that no unnecessary instance of Components infobox is generated
and paint only changed text.


Origin commit data
------------------
Commit: 54d0f8b42b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)
 2013-04-27 22:20:10 +02:00
Thilo Graf
c1a2832e55 CInfoViewer: ensure hide on deleted info file 
Origin commit data
------------------
Commit: e30f4d2764
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-25 (Thu, 25 Apr 2013)
 2013-04-27 22:20:09 +02:00
Jacek Jendrzej
b08214b3a9 CInfoViewer::showInfoFile -check file size 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 6d088357c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
 2013-04-26 18:31:40 +02:00
Thilo Graf
eb10fd6315 CInfoViewer: implement CComponentsInfoBox() to show infobar.txt content 
Origin commit data
------------------
Commit: a09d7f4a7e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-24 (Wed, 24 Apr 2013)
 2013-04-26 18:31:39 +02:00
Stefan Seyfried
bba4c62902 infoviewer: remove unneeded blit() 
Origin commit data
------------------
Commit: c7a4927b53
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-21 (Sun, 21 Apr 2013)
 2013-04-21 18:07:41 +02:00
Michael Liebmann
96c018bca8 Infoviewer: Fix key handling for PiP 
Origin commit data
------------------
Commit: 9e3e8e981b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)

Origin message was:
------------------
* Infoviewer: Fix key handling for PiP
 2013-04-19 00:38:34 +01:00
[CST] Focus
1bd0bd8a7b Merge branch 'pu/cc' into next-cc 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)
 2013-04-17 13:32:12 +04:00
Stefan Seyfried
c6d32100f1 CInfoViewer: delete infoViewerBB in destructor 
Origin commit data
------------------
Commit: 268c5b84e9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-17 10:21:33 +04:00
Stefan Seyfried
a7725b24b0 CInfoViewer: delete infoViewerBB in destructor 
Origin commit data
------------------
Commit: 5e4603071e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-15 19:46:12 +02:00
Stefan Seyfried
d02ee9940d CInfoViewer: delete infoViewerBB in destructor 
Origin commit data
------------------
Commit: 17c624db4d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-14 19:15:46 +02:00
Stefan Seyfried
f0f32ff08f Merge branch 'check/pu-cc' into master 
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 14:28:16 +02:00
Thilo Graf
ab0e31bd05 Progressbars: use default frame thickness 
It's unnecessary overhead to set the value everywhere, except it's needed.


Origin commit data
------------------
Commit: f70a30defa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)
 2013-04-06 08:33:51 +02:00
Michael Liebmann
dde336facd Fix order of colors for some progress bars 
Origin commit data
------------------
Commit: adfbfe079c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)

Origin message was:
------------------
* Fix order of colors for some progress bars
 2013-04-05 19:43:50 +01:00
vanhofen
3a045fdc0a infoviewer: remove frame from timescale inside infoviewer 
Origin commit data
------------------
Commit: 85ab392a09
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
- infoviewer: remove frame from timescale inside infoviewer
 2013-04-04 14:41:13 +02:00
Thilo Graf
03b22f2d23 CComponents: add progressbar class to cc-items 
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework


Origin commit data
------------------
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
 2013-04-02 09:31:05 +02:00
Stefan Seyfried
d4ca138d16 infoviewer: make oldinfo a member of the class 
Origin commit data
------------------
Commit: 1ee9088f28
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
 2013-04-01 15:48:00 +04:00
[CST] Focus
ba928d8665 gui/infoviewer.cpp: fix tuner icon display 
Origin commit data
------------------
Commit: d60f6691d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 19:54:29 +04:00
[CST] Focus
b78629cf13 gui/infoviewer.cpp: update progress in file play mode while visible 
Origin commit data
------------------
Commit: 60cfc785cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 18:46:09 +04:00
[CST] Focus
2a42185417 gui/infoviewer.cpp: show playback speed with play state icon 
Origin commit data
------------------
Commit: bbc4285510
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 17:40:04 +04:00
Stefan Seyfried
c6dee7045d infoviewer: make oldinfo a member of the class 
Origin commit data
------------------
Commit: 5033a9e4ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
 2013-03-25 18:02:46 +01:00
Stefan Seyfried
0a6e405603 Merge branch 'check/next' into master 
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 8048673dec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-07 (Thu, 07 Mar 2013)
 2013-03-07 17:10:11 +01:00
[CST] Focus
e15f1c4c72 Merge branch 'dvbsi++' into next 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
 2013-02-28 16:39:34 +04:00
Jacek Jendrzej
14f531d7c9 src/gui/infoviewer.cpp: fix paint progressbar opt 1 
Origin commit data
------------------
Commit: 662955f9e7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-23 (Sat, 23 Feb 2013)
 2013-02-23 17:34:12 +01:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
 2013-02-21 17:07:18 +01:00
Jacek Jendrzej
6c5cdcf5d0 src/gui/infoviewer.cpp: fix div by zero 
Origin commit data
------------------
Commit: 0fc78c5738
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-16 (Sat, 16 Feb 2013)
 2013-02-16 21:25:02 +01:00