mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 18:03:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,659 Commits 2 Branches 9 Tags
40d45e44a3515953a83a932ae7e73e86aa2ab8ec
Commit Graph

127 Commits

Author SHA1 Message Date
Stefan Seyfried
40d45e44a3 add --enable-fastscan configure option 
The #define in src/gui/scan_setup.h did not work (undefining
ENABLE_FASTSCAN caused really strange side effects wrt background
scanning in standby mode), and all the unused code was still built.
With this configure option, people who really want this obscure feature
can enable it for their builds.


Origin commit data
------------------
Commit: 6525d1164a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-04 (Sat, 04 Feb 2017)
 2017-02-04 12:09:47 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes 
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
 2016-10-10 14:19:55 +02:00
Jacek Jendrzej
8377222814 src/gui/scan.cpp use_config.scanPIDs_in_tsScan_also (THX Janus) 
Origin commit data
------------------
Commit: 2f58a4732f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-01 (Tue, 01 Mar 2016)
 2016-03-01 16:50:33 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
vanhofen
6a4659bf77 framebuffer: revival of showFrame() function to allow ... 
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


Origin commit data
------------------
Commit: edc8527379
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- framebuffer: revival of showFrame() function to allow ...

... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons
 2015-05-05 12:01:04 +02:00
vanhofen
2f0e76ff67 record.h: remove include of vfd.h; use display.h instead 
Origin commit data
------------------
Commit: 09adc177d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- record.h: remove include of vfd.h; use display.h instead
 2015-04-16 13:39:35 +02:00
Stefan Seyfried
e47735fe44 frontend: use const char pointers in getDelSys() 
this avoids a lot of ugly casts, and the pointer targets were
const char* anyway


Origin commit data
------------------
Commit: cc24b2cf65
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-09 (Mon, 09 Feb 2015)
 2015-02-09 20:30:06 +01:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
baeb8dc565 gui/scan_setup.cpp: add pilot param to manual scan menu 
Origin commit data
------------------
Commit: 34691a1724
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
 2014-12-18 17:31:55 +03:00
[CST] Focus
43c661223a neutrino, zapit: drop EVT_SCAN_REPORT_FREQUENCY, 
use EVT_SCAN_REPORT_FREQUENCYP to pass full feparams,
fix scan transponder display info


Origin commit data
------------------
Commit: 6e9b71af90
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)
 2014-10-02 14:23:36 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
[CST] Focus
e3c53b6458 remove deprecated FEC_S2_XXX; 
zapit/src/transponder.cpp: fix missed modulation/delsys in compare(), in dump, show real delsys values;
zapit/src/getservices.cpp: fix satellite frequency, remove deprecated fec convert;
gui/scan_setup.cpp: fix missed modulation/delsys params update;
gui/scan.cpp: add missed modulation scan parameter


Origin commit data
------------------
Commit: 3ab885699c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
 2014-08-27 17:14:38 +04:00
[CST] Bas
307a1bab7f split fec to fec/modulation/delivery system; 
switch to new dvb-api headers;
improve dvb-t manual scan


Origin commit data
------------------
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
 2014-08-27 17:14:33 +04:00
[CST] Focus
b185167c86 gui/scan.cpp, gui/motorcontrol.cpp: increase signal bar height for 50% 
Origin commit data
------------------
Commit: bb77bafdca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
 2014-07-02 11:10:32 +04:00
[CST] Focus
d28cb865dd gui/scan.cpp: change signal/snr layout to vertical 
Origin commit data
------------------
Commit: 9f4aeb2074
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
 2014-07-02 11:10:14 +04:00
vanhofen
98c0a441d8 change RenderString() default to UTF8 
Origin commit data
------------------
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8
 2014-06-11 23:07:13 +02:00
vanhofen
3bba3094e2 change getRenderWidth() default to UTF8 
Origin commit data
------------------
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8
 2014-06-11 23:07:00 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
[CST] Focus
2e6b32e7e1 gui/scan.cpp: center scan header 
Origin commit data
------------------
Commit: 27a7cd0579
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-02 (Wed, 02 Apr 2014)
 2014-04-02 17:32:50 +04:00
Stefan Seyfried
02fc993e74 scansetup: add DVB-T 
Conflicts:
	src/gui/scan_setup.cpp
	src/gui/scan_setup.h


Origin commit data
------------------
Commit: 1a4f65302e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)
 2014-02-28 13:44:22 +04:00
Stefan Seyfried
fcf785599d add basic support for DVB-T 
This needs more fine tuning wrt scan setup etc, but should work for now.

Conflicts:
	data/Makefile.am
	data/locale/english.locale
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/getservices.h
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 5f4c1b986c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)
 2014-02-28 13:44:22 +04:00
Jacek Jendrzej
839c7e9509 Revert "scan.cpp cam_menu.cpp fix Werror=format" 
This reverts commit 80f223f3c6.


Origin commit data
------------------
Commit: 8bad5565e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 17:01:43 +01:00
Jacek Jendrzej
80f223f3c6 scan.cpp cam_menu.cpp fix Werror=format 
Origin commit data
------------------
Commit: a48d8306ec
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 14:04:35 +01:00
Stefan Seyfried
f3f8cf3b56 Merge remote-tracking branch 'check/next-cc-fixed' 
Origin commit data
------------------
Commit: 78f51baf66
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 00:33:08 +01:00
Thilo Graf
5ad73f09aa CComponentsHeader: rework constructors, add CComponentsHeaderLocalized 
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


Origin commit data
------------------
Commit: 5ea7ec48df
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized

Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.
 2014-01-24 23:09:56 +01:00
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
 2014-01-22 12:37:21 +01:00
Michael Liebmann
336fa941e0 CSignalBar: Fix display "value caption" 
Origin commit data
------------------
Commit: 4fa3a245df
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
 2014-01-21 18:09:46 +01:00
Michael Liebmann
c7fb87a9a3 CScanSettings: convert char[...] configuration values to std::string 
Origin commit data
------------------
Commit: 0a5a7b3146
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
 2014-01-19 20:57:38 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
martii
b574d17b63 gui/motorcontrol, gui/scan: switch to CSignalBox 
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	src/gui/scan.cpp


Origin commit data
------------------
Commit: 5b5fed3bd7
Author: martii <m4rtii@gmx.de>
Date: 2013-12-18 (Wed, 18 Dec 2013)
 2013-12-18 20:48:43 +01:00
[CST] Focus
811a1dbae4 gui/scan.cpp: fix memleak 
Origin commit data
------------------
Commit: afe8427b2b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-02 (Mon, 02 Dec 2013)
 2013-12-02 12:33:20 +04:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 16:55:53 +01:00
Thilo Graf
41d131eb32 CComponents: add unfied header file for general include of cc classes 
Provides a unified header file, so it is not required to select a
certain header file.


Origin commit data
------------------
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
 2013-10-24 21:19: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
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
Michael Liebmann
61ca93e63d src/gui/scan.cpp: Fix pixel error with transponder scan. 
fix for 68b4ad8082


Origin commit data
------------------
Commit: 874cf44b42
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-17 (Sat, 17 Aug 2013)
 2013-08-17 20:56:26 +02:00
Michael Liebmann
68b4ad8082 src/gui/scan.cpp: Fix pixel error with transponder scan. 
Origin commit data
------------------
Commit: 9c175234e5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
 2013-08-08 21:29:26 +02: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
fce4dbbe72 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
Michael Liebmann
176d7e22a9 Add volume bar to osd timeouts in the OSD setup 
Origin commit data
------------------
Commit: d08d18522e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-03 (Mon, 03 Jun 2013)

Origin message was:
------------------
* Add volume bar to osd timeouts in the OSD setup
 2013-06-04 01:17:39 +02:00
vanhofen
266bbf91e7 scan: using CComponentsHeader to paint header 
Origin commit data
------------------
Commit: 69d9045d50
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-29 (Wed, 29 May 2013)

Origin message was:
------------------
- scan: using CComponentsHeader to paint header
 2013-05-29 21:17:09 +02:00
Stefan Seyfried
60cfc1e04f scansetup: add DVB-T 
Origin commit data
------------------
Commit: 179e8559f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)
 2013-05-12 02:47:00 +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
Thilo Graf
51e81122b5 CVolumeBar: rework volumebar handling 
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon


Origin commit data
------------------
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)
 2013-05-08 05:11:24 +01:00