[CST] Bas
747783c85f
Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
...
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2012-11-13 (Tue, 13 Nov 2012)
2012-11-13 12:51:18 +08:00
Jacek Jendrzej
4b86495580
src/driver/rcinput.cpp: use standby_rc in repeat mode only if need
...
Origin commit data
------------------
Commit: 7d570537fd
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-11-12 (Mon, 12 Nov 2012)
2012-11-12 12:23:23 +01: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
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
6a015d7b92
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
------------------
Commit: d5d136f6c1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-10-31 (Wed, 31 Oct 2012)
2012-10-31 22:52:12 +01:00
Jacek Jendrzej
9c9febce57
neutrino: show epg infos on announce recording, ported from tuxcvs
...
Origin commit data
------------------
Commit: 654ca3656d
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-10-28 (Sun, 28 Oct 2012)
2012-10-28 20:05:42 +01: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
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
[CST] Bas
8965dc519f
Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
...
Conflicts:
src/timerd/timermanager.cpp
Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2012-09-26 (Wed, 26 Sep 2012)
2012-09-26 17:52:47 +08:00
[CST] Bas
5fdabf2554
neutrino: change all remote/frontpanel stuff to use the new headers.
...
Origin commit data
------------------
Commit: 83636ebb6e
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2012-09-25 (Tue, 25 Sep 2012)
2012-09-25 22:23:17 +08:00
Jacek Jendrzej
41e57ce7bc
comment out never used
...
Origin commit data
------------------
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-08-04 (Sat, 04 Aug 2012)
2012-08-04 10:03:19 +02:00
Stefan Seyfried
f8a42bcc53
Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
...
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
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
[CST] Focus
73ac1950c2
fix conflict
...
Origin commit data
------------------
Commit: 5dd54caf54
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-06-18 (Mon, 18 Jun 2012)
2012-06-18 14:56:17 +04:00
Jacek Jendrzej
67903dc13b
use empty() instead of size()
...
Origin commit data
------------------
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-06-16 (Sat, 16 Jun 2012)
Origin message was:
------------------
use empty() instead of size()
2012-06-16 09:44:42 +02:00
[CST] Focus
88a92f9948
remove obsolete and unused includes
...
Origin commit data
------------------
Commit: 35ee04049a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-06-14 (Thu, 14 Jun 2012)
2012-06-14 11:01:37 +04:00
Stefan Seyfried
0c599b3260
neutrino: allow power button repeat on SPARK
...
Origin commit data
------------------
Commit: 81702dd86d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-05-01 (Tue, 01 May 2012)
2012-05-01 20:20:05 +02:00
Stefan Seyfried
30f6af9752
rcinput: reopen mandatory input devices
...
this allows e.g. to restart lircd on spark without restarting neutrino
Origin commit data
------------------
Commit: fb39dc71e0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-04-14 (Sat, 14 Apr 2012)
2012-04-17 19:34:00 +02:00
Stefan Seyfried
83e56db64f
rcinput: really ignore EV_SYN events
...
Origin commit data
------------------
Commit: ffc3aa983d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-03-25 (Sun, 25 Mar 2012)
2012-04-17 19:33:57 +02:00
Stefan Seyfried
e503abd6dc
neutrino: fix input device repeat setting for pre 2.6.17 kernels
...
Origin commit data
------------------
Commit: 146c46da8e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-03-25 (Sun, 25 Mar 2012)
2012-04-17 19:33:57 +02:00
Stefan Seyfried
1f48c479b3
neutrino: add support for the SPARK frontpanel buttons
...
Origin commit data
------------------
Commit: 04ba38f14f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-03-19 (Mon, 19 Mar 2012)
2012-04-17 19:33:56 +02:00
Stefan Seyfried
a049f07a05
neutrino: silence rcinput debug output
...
Origin commit data
------------------
Commit: 40f50f88cc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2011-05-01 (Sun, 01 May 2011)
2012-04-17 19:33:47 +02:00
[CST] Focus
d99bbe8735
driver/rcinput.cpp: try to use monotonic time,
...
ifdef old code with USE_GETTIMEOFDAY;
dont set time in neutrino
Origin commit data
------------------
Commit: 361513c016
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-03-06 (Tue, 06 Mar 2012)
2012-03-06 18:28:35 +04:00
[CST] Focus
877e828040
driver/rcinput.cpp: process CZapitClient::EVT_TUNE_COMPLETE
...
Origin commit data
------------------
Commit: ff1e40d684
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-02-19 (Sun, 19 Feb 2012)
2012-02-19 14:15:21 +04:00
Jacek Jendrzej
da9659ae53
rcinput: -add RC_www
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2111 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: aa969f1fbe
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-02-17 (Fri, 17 Feb 2012)
2012-02-17 17:22:54 +00:00
[CST] Focus
500593c8ad
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
------------------
Commit: 46b07752b9
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-01-18 (Wed, 18 Jan 2012)
2012-01-18 08:58:13 +00:00
Jacek Jendrzej
759660f724
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
------------------
Commit: e17d63131e
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-01-17 (Tue, 17 Jan 2012)
2012-01-17 21:03:01 +00:00
Stefan Seyfried
49f27aaf01
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
------------------
Commit: fe1fcbe426
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-01-15 (Sun, 15 Jan 2012)
2012-01-15 21:54:59 +00:00
Jacek Jendrzej
015971dde8
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
------------------
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
2012-01-15 15:44:52 +00:00
Stefan Seyfried
3c48c87f81
neutrino: remove special Tripledragon input handling
...
With the new input device, no need for special casing in neutrino.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2052 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 0fa97c1652
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-01-09 (Mon, 09 Jan 2012)
2012-01-09 20:32:26 +00:00
[CST] Focus
e989e0dd4f
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
------------------
Commit: 5c8429673a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2011-07-21 (Thu, 21 Jul 2011)
2011-07-21 10:04:05 +00:00
[CST] Focus
b078822ee3
Add back key printf for DEBUG compile
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1302 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 3ad6c49d9a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2011-03-16 (Wed, 16 Mar 2011)
2011-03-16 10:53:02 +00:00
Stefan Seyfried
b8d191e180
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
------------------
Commit: 6efb0d5e47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2011-03-12 (Sat, 12 Mar 2011)
2011-03-12 12:36:13 +00:00
Stefan Seyfried
af701eb0d6
fix compilerwarning in rcinput
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1268 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 65ea10d988
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2011-03-06 (Sun, 06 Mar 2011)
2011-03-06 18:37:09 +00:00
[CST] Focus
683a2054d6
Testing pmt update while recording fix
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1095 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 43d4d88e40
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2011-01-30 (Sun, 30 Jan 2011)
2011-01-30 14:00:26 +00:00
Stefan Seyfried
9260cc429e
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
------------------
Commit: c6663124c2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2011-01-30 (Sun, 30 Jan 2011)
2011-01-30 12:30:18 +00:00
[CST] Focus
d1a99570ee
reworked CA menu code
...
* added support for internal cardreaders for future conax support
* added inactivity shutdown timer for EuP
WARNING: new libcoolstream and libOpenThreads needed.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@925 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: b8c1fa5cc1
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-12-07 (Tue, 07 Dec 2010)
Origin message was:
------------------
* reworked CA menu code
* added support for internal cardreaders for future conax support
* added inactivity shutdown timer for EuP
WARNING: new libcoolstream and libOpenThreads needed.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@925 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-07 10:00:52 +00:00
Jacek Jendrzej
09ff11d69d
add reloadsetup (neutrino.conf) to nhttpd controlapi
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@849 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 3bf282f8d4
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-10-21 (Thu, 21 Oct 2010)
Origin message was:
------------------
-add reloadsetup (neutrino.conf) to nhttpd controlapi
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@849 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-10-21 06:27:59 +00:00
[CST] Focus
c3b9e0fd11
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
------------------
Commit: 4bc9866683
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-09-17 (Fri, 17 Sep 2010)
2010-09-17 12:41:59 +00:00
Stefan Seyfried
acbdbb1eb3
neutrino: port "do not step time for small differences" from tuxbox
...
When receiving new system time data from the DVB stream, and the
difference to the current time is less than 120 seconds, do not step
the time but call adjtime(3) instead to do a continuous time correction.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@762 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 82fd0787ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2010-09-12 (Sun, 12 Sep 2010)
2010-09-12 14:42:40 +00:00
Jacek Jendrzej
a45a5d721b
fix delayed shutdown
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@723 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: e0403071de
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-08-15 (Sun, 15 Aug 2010)
Origin message was:
------------------
-fix delayed shutdown
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@723 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-15 08:49:37 +00:00
[CST] Focus
adb761e134
Removed libcontrold dependency
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 35d7d555b6
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-02-14 (Sun, 14 Feb 2010)
2010-02-14 13:09:07 +00:00
Jacek Jendrzej
9819856e7d
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
------------------
Commit: 8f59cc96ec
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-02-07 (Sun, 07 Feb 2010)
2010-02-07 14:32:21 +00:00
mws
0ed8ac5577
fix initializers and shadows
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 474790557f
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)
2009-12-29 13:56:52 +00:00
mws
c62aa94983
Mark unused vars as comment
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 16:23:09 +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