Commit Graph

15 Commits

Author SHA1 Message Date
Stefan Seyfried
3df9a6f7f5 Merge branch 'uncool/dvbsi++' commit '9d968280bac'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.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/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
2012-07-23 01:02:29 +02:00
Jacek Jendrzej
5ed8825b21 use empty() instead of size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()

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

------------------
This commit was generated by Migit
2012-06-16 09:44:42 +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
7901a756fe neutrino: avoid float for percent calculations
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb6633b7aa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-25 (Sun, 25 Dec 2011)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:51 +02:00
Stefan Seyfried
38458ac9e5 TD neutrino/lcdd: remove unnecessary includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2029 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bf6f26016
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-01 (Sun, 01 Jan 2012)



------------------
This commit was generated by Migit
2012-01-01 12:07:23 +00:00
Stefan Seyfried
25a41c9fd0 lcdd: add isUTF8() from edvbstring
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2028 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 00843bd5e3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-01 (Sun, 01 Jan 2012)



------------------
This commit was generated by Migit
2012-01-01 11:57:20 +00:00
Stefan Seyfried
748791d5d8 neutrino: improve TD LCD support in movieplayer
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2027 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: b35a163e85
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-01 (Sun, 01 Jan 2012)



------------------
This commit was generated by Migit
2012-01-01 11:57:16 +00:00
Stefan Seyfried
92e07ff083 lcdd: fix compiler warnings on Tripledragon
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1827 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: af296c6548
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-11-05 (Sat, 05 Nov 2011)



------------------
This commit was generated by Migit
2011-11-05 12:09:56 +00:00
Stefan Seyfried
687c64a705 lcdd: set has_lcd = false to hide useless LCD settings menu
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1516 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42e167fda4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-05 (Sun, 05 Jun 2011)



------------------
This commit was generated by Migit
2011-06-05 10:54:29 +00:00
Stefan Seyfried
7d233a41d2 neutrino/lcdd: fix compile with gcc-4.5.2
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1515 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a18280821
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-05 (Sun, 05 Jun 2011)



------------------
This commit was generated by Migit
2011-06-05 10:54:26 +00:00
Stefan Seyfried
00ae64919e lcdd: initialize variable to silence valgrind
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1514 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e331aec34
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-05 (Sun, 05 Jun 2011)



------------------
This commit was generated by Migit
2011-06-05 10:54:22 +00:00
Stefan Seyfried
bcd1a0b0b5 lcdd: blink the date if recording during standby
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1513 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32a4ad2c0d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-05 (Sun, 05 Jun 2011)



------------------
This commit was generated by Migit
2011-06-05 10:54:19 +00:00
Stefan Seyfried
739dcaebe1 neutrino: first (very) dirty hack to make TD LCD work
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1512 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30b37b3c1f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-05 (Sun, 05 Jun 2011)



------------------
This commit was generated by Migit
2011-06-05 10:54:16 +00:00
Jacek Jendrzej
437ebdcf9b tiny fix (other platform
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1425 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6615a15256
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-05-02 (Mon, 02 May 2011)



------------------
This commit was generated by Migit
2011-05-02 12:29:34 +00: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