Commit Graph

94 Commits

Author SHA1 Message Date
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
[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
9673036256 CScanTs: silence valgrind
Origin commit data
------------------
Commit: 13871d8328
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 10:32:56 +02: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
9c9250e262 CScanTs: silence valgrind
Origin commit data
------------------
Commit: 351f47c3a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 16:59:39 +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
ed0a43474b CScanTs: revert to pu/cc code
Origin commit data
------------------
Commit: 2ed1f7eee2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 16:58:19 +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
58495102d0 gui/scan.cpp: fix 0bb9a8470e,
inside start wizard zap crash, because neutrino channel list not created yet


Origin commit data
------------------
Commit: 8f500e80fd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)
2013-03-19 13:56:13 +04:00
[CST] Focus
1809e23dc4 neutrino.cpp, gui/scan.cpp: force re-zap without setSelected()
Origin commit data
------------------
Commit: b3923a7d5d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-13 (Wed, 13 Mar 2013)
2013-03-13 18:59:44 +04:00
[CST] Focus
ae4cae153a use ENABLE_PIP for pip code
Origin commit data
------------------
Commit: cbfa6f88c5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-05 18:34:47 +04:00
[CST] Focus
ddc00bba81 Merge branch 'pip' into next
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:45:41 +04: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
[CST] Focus
0bb9a8470e gui/scan.cpp: add zap to current channel_id after scan
Origin commit data
------------------
Commit: f567d3b85d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 15:53:07 +04:00
Stefan Seyfried
80a87017f3 neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2013-02-21 15:47:18 +01: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
4c7a4f15cc neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: e0acbd3ddb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 14:05:48 +01:00
Stefan Seyfried
ece959de32 scan: make radar display more smooth
Origin commit data
------------------
Commit: cc02aec30a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 12:33:16 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a'
...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


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 10:45:33 +01:00
Stefan Seyfried
151bb79b28 CScanTs: fix progressbar and rcinput memleaks
Origin commit data
------------------
Commit: 44a44d6673
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
2012-10-31 22:55:08 +01:00
Jacek Jendrzej
8b29bbdb57 fix memleak
Origin commit data
------------------
Commit: b3db5f7f7c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-16 (Tue, 16 Oct 2012)
2012-10-16 15:42:10 +02:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...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


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
Stefan Seyfried
294a355ba6 scan: fix window size
Origin commit data
------------------
Commit: a96376ff23
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-08 (Mon, 08 Oct 2012)
2012-10-08 17:01:45 +02:00
Stefan Seyfried
55c5c86185 scan: fix manual scan test for DVB-T
Origin commit data
------------------
Commit: 6d8b029802
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-08 (Mon, 08 Oct 2012)
2012-10-08 17:01:45 +02:00
Stefan Seyfried
34823f1c8d add basic support for DVB-T
This needs more fine tuning wrt scan setup etc, but should work for now.


Origin commit data
------------------
Commit: b02886aa92
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)
2012-10-07 17:09:17 +02: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
Stefan Seyfried
28fb511a63 Merge branch 'neutrino-hd-tripledragon' into neutrino-mp
Origin commit data
------------------
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)
2012-09-15 12:14:33 +02:00
Jacek Jendrzej
cc285043ad my_system fix
Origin commit data
------------------
Commit: 87342fd0d9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-15 (Sat, 15 Sep 2012)
2012-09-15 11:20:49 +02:00
Jacek Jendrzej
878d7528e4 add wakeup_hdd & file_exists to system-helpers
Origin commit data
------------------
Commit: c6ae7255ac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)

Origin message was:
------------------
-add wakeup_hdd & file_exists to system-helpers
2012-09-11 20:35:47 +02:00
Jacek Jendrzej
de296904a0 start SCRIPTs with-my_system
Origin commit data
------------------
Commit: 3389defb17
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:33:34 +02:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
Jacek Jendrzej
57a7091601 fixes strncpy & buf size
Origin commit data
------------------
Commit: 7359504dd7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)

Origin message was:
------------------
-fixes strncpy & buf size
2012-08-07 18:51:44 +02:00