Commit Graph

17 Commits

Author SHA1 Message Date
Stefan Seyfried
06a7d16bf8 lcdd/simple_display: adapt to new API
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbafc5c9ba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-26 17:27:58 +01:00
Stefan Seyfried
c8e3ec41a9 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
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
martii
14f4b12384 add thread for determining free hdd (recording dir) space, enable hdd usage icons on vfd (untested)
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/simple_display.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/moviebrowser.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp
	src/system/ytcache.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c15db185f
Author: martii <m4rtii@gmx.de>
Date: 2013-11-27 (Wed, 27 Nov 2013)



------------------
This commit was generated by Migit
2014-09-11 17:58:19 +04:00
Stefan Seyfried
ebb147d8d5 remove unneeded CConfigFile from lcdd and shutdown_count
Origin commit data
------------------
Branch: ni/coolstream
Commit: 769d310455
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:39:04 +01:00
Stefan Seyfried
d2ccb40e1e remove unneeded CConfigFile from lcdd and shutdown_count
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2791fa792
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-09 16:00:00 +01:00
Stefan Seyfried
0310ec1ee6 lcdd: add dummy setBacklight
Origin commit data
------------------
Branch: ni/coolstream
Commit: d63a4be03f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-01 19:47:18 +02:00
Stefan Seyfried
00cfd31e82 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
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)



------------------
This commit was generated by Migit
2013-05-11 17:17:33 +02:00
Stefan Seyfried
4a209e560f lcdd: update icon names
Origin commit data
------------------
Branch: ni/coolstream
Commit: cb3a84cbec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-11 17:03:50 +02:00
Stefan Seyfried
88b0fd5fe3 lcdd: add proper destructor to kill time thread
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44d1d8a808
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-03 21:52:21 +01:00
Stefan Seyfried
690bd7bca5 tripledragon: small cosmetic LCD fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: be99a52526
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-10 13:56:17 +01:00
Stefan Seyfried
1825f38ed3 simple_display: stop thread on shutdown
TODO: tripledragon code needs testing


Origin commit data
------------------
Branch: ni/coolstream
Commit: 46a2a11d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 23:48:44 +02:00
Stefan Seyfried
3a153918dd simple_display: add basic support for SPARK vfd display
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2050eeda4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-23 (Sun, 23 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-23 21:35:02 +02:00
Stefan Seyfried
21359893fc neutrino: first preliminary support for AZbox ME
this is very experimental and depends on more fixes in
libstb-hal, but audio / video / OSD are basically working


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2541edc918
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-18 (Mon, 18 Jun 2012)



------------------
This commit was generated by Migit
2012-06-27 21:18:19 +02:00
Stefan Seyfried
98f6f2a7e0 spark: improve time display in standby mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a22a029d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-30 (Fri, 30 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-04-17 19:33:57 +02:00
Stefan Seyfried
bee653af52 spark: use LED display for time and volume
This is a first draft of code to display time and
volume percent on the 4 digit display on spark boxes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ab80482fa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-28 (Wed, 28 Mar 2012)



------------------
This commit was generated by Migit
2012-04-17 19:33:57 +02:00
Stefan Seyfried
1690939b9f spark: build stubbed out lcddisplay code to fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: eabeec110c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-04-17 19:33:53 +02:00
Stefan Seyfried
0d0f7c215c add lcd display code for Tripledragon, mostly from tuxbox
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@964 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66dd0b0174
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-12-25 (Sat, 25 Dec 2010)



------------------
This commit was generated by Migit
2010-12-25 17:43:43 +00:00