Commit Graph

30 Commits

Author SHA1 Message Date
Stefan Seyfried
a3d104a600 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6d8c02313
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-19 (Wed, 19 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-19 11:29:29 +01:00
martii
1b03ad3abc driver/rcinput: minor cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 088a75b6e2
Author: martii <m4rtii@gmx.de>
Date: 2014-02-17 (Mon, 17 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-18 20:07:39 +01:00
Stefan Seyfried
2dcc32acd2 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
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
[CST] Focus
af3bd6e922 try to fix shutdown after wakeup, if several recordings was done,
cancel shutdown after wakeup, if remote used, based on code (c) martii <m4rtii@gmx.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d886a95acd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)



------------------
This commit was generated by Migit
2013-07-30 14:10:21 +04:00
Stefan Seyfried
083bc55347 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
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
[CST] Focus
21ffb607d0 driver/rcinput.cpp: add missing sleep, sub, pos keys
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65bd112d78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-06 (Wed, 06 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-06 15:42:23 +04:00
[CST] Focus
cc943abea0 driver/rcinput.h: try to fix libcs headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1413177ad1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:16:26 +04:00
[CST] Focus
b6e23fe1e3 src/driver/rcinput.cpp: change ifdefs for headers and set_rc_hw
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6380763209
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:04:07 +04:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


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



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
Michael Liebmann
17acd0c414 Fix include path for moved header files
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
* Fix include path for moved header files

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

------------------
This commit was generated by Migit
2012-12-13 18:09:09 +01:00
Stefan Seyfried
68cc0c3a78 add CRCInput::getKeyNameC to fix lifetime issues
in menu.cpp, getKeyName().c_str()'s destructor was already invoked
when the value was used, triggering a valgrind warning.


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



------------------
This commit was generated by Migit
2012-10-31 22:52:12 +01:00
Stefan Seyfried
485656f13a fixes for 64bit archs: don't assume a pointer is 32bit wide
Origin commit data
------------------
Branch: ni/coolstream
Commit: d806eeb544
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-07 17:09:17 +02:00
[CST] Bas
891e36bff4 neutrino: change all remote/frontpanel stuff to use the new headers.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83636ebb6e
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-25 22:23:17 +08:00
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
f564a0adef pedantic fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14fc80ed5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)

Origin message was:
------------------
-pedantic fixes

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

------------------
This commit was generated by Migit
2012-05-08 18:59:11 +02:00
Stefan Seyfried
fe6e793623 rcinput: reopen mandatory input devices
this allows e.g. to restart lircd on spark without restarting neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb39dc71e0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-14 (Sat, 14 Apr 2012)



------------------
This commit was generated by Migit
2012-04-17 19:34:00 +02:00
Stefan Seyfried
baa6504ec5 neutrino: add support for the SPARK frontpanel buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04ba38f14f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-19 (Mon, 19 Mar 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:56 +02:00
[CST] Focus
0b235ca9c9 Revert rev.2066 changes. Peace please.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2067 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 46b07752b9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-18 (Wed, 18 Jan 2012)



------------------
This commit was generated by Migit
2012-01-18 08:58:13 +00:00
Jacek Jendrzej
9a2735c61e seife:The svn is coolstream svn and not the other way
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2066 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e17d63131e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-01-17 (Tue, 17 Jan 2012)



------------------
This commit was generated by Migit
2012-01-17 21:03:01 +00:00
Stefan Seyfried
60ea1bea7c rcinput: fix build without nevis_ir.h
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2062 e54a6e83-5905-42d5-8d5c-058d10e6a962


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



------------------
This commit was generated by Migit
2012-01-15 21:54:59 +00:00
Jacek Jendrzej
a16834f0ea add alternative remote controls option (thx, patch by bellum)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2060 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 101870c27a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-01-15 (Sun, 15 Jan 2012)

Origin message was:
------------------
-add alternative remote controls option (thx, patch by bellum)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2060 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2012-01-15 15:44:52 +00:00
[CST] Focus
10c65d19e5 Allow killTimer to check and reset timer id
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1562 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c8429673a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)



------------------
This commit was generated by Migit
2011-07-21 10:04:05 +00:00
Stefan Seyfried
2f46127e61 neutrino: add missing includes to fix compile with gcc-4.5.2
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1311 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 156681e223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-03-18 (Fri, 18 Mar 2011)



------------------
This commit was generated by Migit
2011-03-18 18:54:28 +00:00
Stefan Seyfried
2c7ea22a9f get rid of HAVE_DVB_API_VERSION define
remove non-working legacy code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1289 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6efb0d5e47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-03-12 (Sat, 12 Mar 2011)



------------------
This commit was generated by Migit
2011-03-12 12:36:13 +00:00
Stefan Seyfried
8ff697b33e rcinput: add support for TD remote control
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1087 e54a6e83-5905-42d5-8d5c-058d10e6a962


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



------------------
This commit was generated by Migit
2011-01-30 12:30:18 +00:00
[CST] Focus
a10bb5d712 Update to test descrete codes. Power-toggle key should be redefined, if power key should work as descrete power-on
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@775 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc9866683
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-09-17 (Fri, 17 Sep 2010)



------------------
This commit was generated by Migit
2010-09-17 12:41:59 +00:00
nightshad
1c7f1cd491 Some indent cleanup.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@589 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd0d75f738
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2010-05-20 (Thu, 20 May 2010)



------------------
This commit was generated by Migit
2010-05-20 09:28:03 +00:00
Jacek Jendrzej
c17f47f698 change 'long long' tom int64_t'; change variable buf to new delete;
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f59cc96ec
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-07 (Sun, 07 Feb 2010)



------------------
This commit was generated by Migit
2010-02-07 14:32:21 +00:00
Stefan Seyfried
61bae2e705 fix build with gcc-4.4.x by adding necessary #includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@56 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 601e6b00fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2009-12-16 (Wed, 16 Dec 2009)



------------------
This commit was generated by Migit
2009-12-16 08:49:21 +00:00
mrcolor
bcecfb6585 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
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00