mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,180 Commits 2 Branches 9 Tags
a41569e6977cf949ffbeeb166f2cb643bc45f98b
Commit Graph

11 Commits

Author SHA1 Message Date
vanhofen
ba302de46b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 2017-02-12 09:21:04 +01: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] Bas
8f536ee896 neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me. 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
 2014-10-22 16:14:05 +04:00
Stefan Seyfried
30ebd0a0c0 drivertool: fix device names, add backwards compatibility 
Origin commit data
------------------
Commit: 0219f7f135
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)
 2013-05-12 17:09:52 +02:00
[CST] Focus
83bd65934e drivertool.c: try to fix different includes 
Origin commit data
------------------
Commit: 8266597ef1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 15:14:39 +04:00
[CST] Bas
80bec3f0fa neutrino: fix code to new 'generic' frontpanel/ir headers. 
Origin commit data
------------------
Commit: 5aeca6ef13
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
 2012-09-26 18:19:35 +08:00
Jacek Jendrzej
0167ca346b drivertool: -fix close fd 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1586 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 4eec05e0e9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
 2011-07-21 12:49:02 +00:00
Stefan Seyfried
e7baca39ce drivertool: fix compiler warnings 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1548 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e7b01e7da5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-19 (Sun, 19 Jun 2011)
 2011-06-19 13:20:46 +00:00
Stefan Seyfried
567fa1e7ad drivertool: add shortcuts to switch TD and CS remote 
* add shortcut options for TD and CS remotes
* use nevis_ir.h if present
Needs testing frontpanel driver to work properly.

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


Origin commit data
------------------
Commit: b55ee717d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-19 (Sun, 19 Jun 2011)
 2011-06-19 11:00:05 +00:00
Stefan Seyfried
25712838f3 add 'drivertool' to experiment with the driver ioctls 
This allows to play with the ioctls of the frontpanel driver
and the IR driver on the command line.
Can be extended for more drivers in the future.
Expert tool, use at your own risk :-)

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


Origin commit data
------------------
Commit: 3422f5f719
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-04-16 (Sat, 16 Apr 2011)
 2011-04-16 11:57:37 +00:00