vanhofen
c4de218cb2
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
configure.ac
src/driver/Makefile.am
src/driver/framebuffer.h
src/gui/bookmarkmanager.cpp
src/gui/filebrowser.cpp
src/gui/widget/buttons.cpp
src/system/httptool.cpp
Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 13:19:03 +01:00
Stefan Seyfried
8b4c30e093
replace framebuffer.h include with forward declaration
...
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)
Origin commit data
------------------
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +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
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] 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
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
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
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
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
[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
7c0274d474
CScanTs: add destructor to avoid leaks
...
Conflicts:
src/gui/scan.h
Origin commit data
------------------
Commit: 5371fd6c90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 13:01:00 +04:00
Stefan Seyfried
5a7387099d
CScanTs: add destructor to avoid leaks
...
Origin commit data
------------------
Commit: c0a1b8690f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 10:32:45 +02:00
Stefan Seyfried
6dfd0861bf
CScanTs: add destructor to avoid leaks
...
Origin commit data
------------------
Commit: 14783a7581
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 16:59:13 +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
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
[CST] Focus
3c0f160958
gui/scan.cpp: add delivery type member, use it to find scanned type
...
Origin commit data
------------------
Commit: 4372df5a25
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-16 (Wed, 16 Jan 2013)
2013-01-16 15:58:13 +04:00
Stefan Seyfried
3cf264b99f
fixes for 64bit archs: don't assume a pointer is 32bit wide
...
Origin commit data
------------------
Commit: d806eeb544
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-10-06 (Sat, 06 Oct 2012)
2012-10-07 17:09:17 +02:00
Jacek Jendrzej
7b13741d59
jump to next/prev transponder with up/down rc in test signal mode
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@747 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 5b90ef18c3
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-09-04 (Sat, 04 Sep 2010)
Origin message was:
------------------
jump to next/prev transponder with up/down rc in test signal mode
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@747 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-09-04 20:06:37 +00:00
Jacek Jendrzej
38d954d78f
scale fixes
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@676 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 98450fa609
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-07-17 (Sat, 17 Jul 2010)
2010-07-17 13:54:51 +00:00
[CST] Focus
66bf1cb93b
Show tuner locked or not using green or red radar, experimental
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@503 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 791eba8069
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-03-18 (Thu, 18 Mar 2010)
2010-03-18 17:19:06 +00:00
[CST] Focus
4765d5cea3
Menu position settings
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@390 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 8e2b5716ae
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-02-20 (Sat, 20 Feb 2010)
2010-02-20 15:12:51 +00:00
Jacek Jendrzej
01fb944e27
add change blink
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@182 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 0efa0ba641
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-01-18 (Mon, 18 Jan 2010)
2010-01-18 15:37:10 +00:00
Stefan Seyfried
9a1513bee7
neutrino: consolidate CScale and CProgressBar code
...
Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.
TODO: documentation ;)
check if all progressbars still behave the same
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 697e3c6756
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2010-01-03 (Sun, 03 Jan 2010)
Origin message was:
------------------
neutrino: consolidate CScale and CProgressBar code
Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.
TODO: documentation ;)
check if all progressbars still behave the same
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-03 10:39:40 +00:00
mrcolor
cb8dd3394d
our current experimental Neutrino branch
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00