mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-07 21:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,798 Commits 2 Branches 9 Tags
96e6ac64621f3ff669a704d78e4849a68e06e0c4
Commit Graph

145 Commits

Author SHA1 Message Date
Stefan Seyfried
fb74bc9a5b rcinput/neutrino: avoid the use of EVT_TIMESET 
sectionsd's EVT_TIMESET was only used to fix time calculations
for input repeat detection. I doubt this reliably worked anyway.
Just calculate an absolute input timestamp from CLOCK_MONOTONIC
and use that. Even better solution would be to use a newer
kernel with EVIOCSCLOCKID ioctl, leave that for later :-)


Origin commit data
------------------
Commit: 949e42445d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 16:14:10 +01:00
Stefan Seyfried
aa181b84b3 rcinput: remove unused code, comment FIXME 
I think I have mostly deciphered the meaning of this :-)


Origin commit data
------------------
Commit: 58c95460b9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 15:53:27 +01:00
Stefan Seyfried
7b9f11df7e Merge remote-tracking branch 'test/cst-next' 
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
 2015-02-19 14:10:26 +01:00
Jacek Jendrzej
2ba8c5da37 fix compiling warnings 
Origin commit data
------------------
Commit: 1bfcad398f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)
 2015-02-11 19:21:54 +01:00
Stefan Seyfried
a968a12b8d Merge remote-tracking branch 'check/cst-next' 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
[CST] Focus
59c54689c0 driver/rcinput.cpp: reset first key press only on key press event 
Origin commit data
------------------
Commit: 1398736bd8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-15 (Thu, 15 Jan 2015)
 2015-01-15 15:26:58 +03:00
Stefan Seyfried
ec1a9fce17 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
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
43c661223a neutrino, zapit: drop EVT_SCAN_REPORT_FREQUENCY, 
use EVT_SCAN_REPORT_FREQUENCYP to pass full feparams,
fix scan transponder display info


Origin commit data
------------------
Commit: 6e9b71af90
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)
 2014-10-02 14:23:36 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
[CST] Focus
4df9f78865 driver/rcinput.cpp: re-add shutdown after wakeup cancel, 
code from commit 49bcbda3a2 is lost after some pick ?


Origin commit data
------------------
Commit: c359fe4eaa
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-08 (Thu, 08 May 2014)
 2014-05-08 12:36:56 +04:00
Stefan Seyfried
f2e3d704a6 rcinput: fix invalid narrowing cast 
Origin commit data
------------------
Commit: 33d2fb319a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-05-02 (Fri, 02 May 2014)
 2014-05-02 09:47:42 +02:00
Stefan Seyfried
52836206c3 rcinput: fix invalid narrowing cast 
Origin commit data
------------------
Commit: 2c11b9f0f0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:25:52 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
[CST] Focus
88f00a7c43 driver/rcinput.cpp: add NeutrinoMessages::EVT_HOTPLUG 
Origin commit data
------------------
Commit: 2a6ef5b30d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-23 (Wed, 23 Apr 2014)
 2014-04-23 17:44:12 +04:00
martii
d5685885b9 driver/rcinput: let getUnicodeValue() return const char * 
Origin commit data
------------------
Commit: 34c23ed7a5
Author: martii <m4rtii@gmx.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-02-25 00:17:09 +01:00
martii
d267c7ed24 driver/rcinput: implement long key press support (but no rcsim/yWeb support at this time) 
driver/rcinput: drop unused gettimeofday code


Origin commit data
------------------
Commit: 7826ab0fca
Author: martii <m4rtii@gmx.de>
Date: 2014-02-25 (Tue, 25 Feb 2014)
 2014-02-25 00:09:14 +01:00
Stefan Seyfried
f9595188ff Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: f6d8c02313
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-19 (Wed, 19 Feb 2014)
 2014-02-19 11:29:29 +01:00
martii
652ae9296a driver/rcinput: minor cleanup 
Origin commit data
------------------
Commit: 088a75b6e2
Author: martii <m4rtii@gmx.de>
Date: 2014-02-17 (Mon, 17 Feb 2014)
 2014-02-18 20:07:39 +01:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
Michael Liebmann
308c8ce00a yWeb: Synchronize volume/audiomute settings yWeb => GUI 
Origin commit data
------------------
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)
 2014-02-12 06:02:27 +01:00
Stefan Seyfried
ea063c5755 Merge remote-tracking branch 'broken/next-cc' 
Origin commit data
------------------
Commit: 65437a60a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-28 (Tue, 28 Jan 2014)
 2014-01-28 13:22:00 +01:00
Jacek Jendrzej
5b91bb9e46 webif standby -add option CEC standby off (dont use TV off) 
Origin commit data
------------------
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
 2014-01-28 10:30:29 +01:00
Stefan Seyfried
473b274f4a Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)
 2014-01-27 21:00:18 +01:00
Jacek Jendrzej
ac3ee0cf9b add webif option dont use CEC with standbyoff 
Origin commit data
------------------
Commit: 4be0273083
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-26 (Sun, 26 Jan 2014)

Origin message was:
------------------
-add webif option dont use CEC with standbyoff
 2014-01-26 22:24:17 +01:00
Stefan Seyfried
767f705096 rcinput: avoid theoretically possible timerid overflow 
Origin commit data
------------------
Commit: 081e35b3e5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-26 13:37:36 +01:00
Stefan Seyfried
b382211ab7 rcinput: avoid theoretically possible timerid overflow 
Origin commit data
------------------
Commit: 164ab9ab42
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 22:23:41 +01:00
vanhofen
d6c1108d7e Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit f2a2e699c2.


Origin commit data
------------------
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
f2a2e699c2 global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 10:40:03 +01: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
martii
1000ab9237 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
 2013-11-09 17:03:03 +01:00
[CST] Focus
37b0040625 driver/rcinput.cpp: increase neutrino.sock listen backlog - 
try to avoid dead-lock on zap flood, when neutrino wait response for command,
while zapit try to send event to neutrino


Origin commit data
------------------
Commit: af49e54d22
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-25 13:03:11 +04:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
vanhofen
1392bdf4e7 yweb: fix /control/reboot 
Origin commit data
------------------
Commit: 5227f726c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)

Origin message was:
------------------
- yweb: fix /control/reboot
 2013-09-28 22:25:41 +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
[CST] Focus
ce2f9ac922 neutrino: add EVT_BACK_ZAP_COMPLETE event for background epg scan zap 
Origin commit data
------------------
Commit: f210a8c048
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)
 2013-08-13 20:10:02 +04:00
[CST] Focus
49bcbda3a2 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
------------------
Commit: d886a95acd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
 2013-07-30 14:10:21 +04: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
[CST] Focus
34784bb5ca neutrinoMessages.h, rcinput.cpp: add NeutrinoMessages::EVT_EIT_COMPLETE 
Origin commit data
------------------
Commit: 6cf3ceef4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
 2013-06-12 18:46:34 +04:00
Jacek Jendrzej
7acdd872a4 fix comma at end of enumerator list 
Origin commit data
------------------
Commit: a549b97924
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-28 (Tue, 28 May 2013)
 2013-05-28 15:52:31 +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
Stefan Seyfried
0d17a37fd2 rcinput: open input device with apropriate flags 
Origin commit data
------------------
Commit: d1cdbd34c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)
 2013-05-04 13:13:35 +02:00
Stefan Seyfried
bc3710042a neutrino: remove glthread, use GLFramebuffer instead 
now that libstb-hal provides an easy to use virtual framebuffer,
use it instead of the glthread implementation.


Origin commit data
------------------
Commit: e388b08dfe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)
 2013-05-04 13:07:52 +02:00
[CST] Focus
fcc42c03fc driver/rcinput.cpp: add missing sleep, sub, pos keys 
Origin commit data
------------------
Commit: 65bd112d78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-06 (Wed, 06 Mar 2013)
 2013-03-06 15:42:23 +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
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
f31d12dcb8 driver/rcinput.cpp: change device back to /dev/input/nevis_ir, apollo has link 
Origin commit data
------------------
Commit: 8267a53049
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 15:16:52 +04:00
[CST] Focus
c69d1f4b7c src/driver/rcinput.cpp: change ifdefs for headers and set_rc_hw 
Origin commit data
------------------
Commit: 6380763209
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 14:04:07 +04:00
[CST] Bas
375e3056b3 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
 2012-12-07 14:39:05 +08:00
Stefan Seyfried
8baeccb8a1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
 2012-11-23 18:45:22 +01:00
Stefan Seyfried
8cd0502cc1 rcinput: add ugly hack for azbox rc 
Origin commit data
------------------
Commit: e0282a0537
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-21 (Wed, 21 Nov 2012)
 2012-11-21 23:49:59 +01:00