mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,192 Commits 2 Branches 9 Tags
c2cc8c434f28d43b5a452bcfa674967bcb4d8881
Commit Graph

64 Commits

Author SHA1 Message Date
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:19:49 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files 
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-02 13:43:57 +02:00
Stefan Seyfried
69dd02f458 neutrinoyparser: fix invalid logic in func_unmount_get_list 
Origin commit data
------------------
Commit: ea30b22119
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 12:41:05 +02:00
vanhofen
0d9a80486a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:36:34 +02:00
Stefan Seyfried
1c9982f2c9 neutrinoyparser: fix invalid logic in func_unmount_get_list 
Origin commit data
------------------
Commit: e04eb24ff4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:25:51 +02:00
vanhofen
a4b4a6c192 nhttpd: fix indentations 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: aeca17ea2c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: fix indentations

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-09-14 12:14:41 +02:00
vanhofen
4250a45ea5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)
 2017-09-07 16:41:06 +02:00
vanhofen
650374b236 nhttpd: fix indentations 
Origin commit data
------------------
Commit: cfd1a30160
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: fix indentations
 2017-09-05 09:34:03 +02:00
vanhofen
7c75ab360f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:15:22 +02:00
vanhofen
5628badb78 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 15:24:38 +02:00
Jacek Jendrzej
96edd2f2c1 some inits and never read var 
Origin commit data
------------------
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 12:58:26 +02:00
vanhofen
d9fc0a4a98 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:07:17 +01:00
vanhofen
20722a62cb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8a75efa81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:05:31 +01:00
vanhofen
3b3a096715 neutrinoyparser: remove workaround for Neo Twin 
Origin commit data
------------------
Commit: 59adc88491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: remove workaround for Neo Twin
 2017-03-19 01:04:48 +01:00
vanhofen
aa7d4ff017 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:39:43 +01:00
vanhofen
6c57da28be Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 22:47:35 +01:00
vanhofen
003c72673f neutrinoyparser: stay compatible with present code in Y_Blocks.txt 
Origin commit data
------------------
Commit: 60d3cfb962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: stay compatible with present code in Y_Blocks.txt
 2017-03-13 23:48:08 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
a8db520beb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:10:04 +01:00
vanhofen
a924473bb6 neutrinoyparser: use hw_caps in func_get_boxtype() ... 
... and func_get_boxmodel()


Origin commit data
------------------
Commit: 305b1a6da5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: use hw_caps in func_get_boxtype() ...

... and func_get_boxmodel()
 2017-03-10 15:07:52 +01:00
vanhofen
a360c99a70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:10:36 +01:00
vanhofen
260127f781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:09:50 +01:00
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
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +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
vanhofen
c84c215ac5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:48:39 +01:00
Stefan Seyfried
7e35a8e7df neutrinoyparser: fix string literal warning with newer gcc 
Origin commit data
------------------
Commit: ee5f73c64d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:43:37 +01:00
vanhofen
d44f98a01d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:34:20 +01:00
Stefan Seyfried
df635f87a1 neutrinoyparser: fix string literal warning with newer gcc 
Origin commit data
------------------
Commit: bc06052985
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 18:24:14 +01:00
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
6e38f7b956 Merge branch 'cst-next' into nmp-cst-next_test 
Origin commit data
------------------
Commit: f162708f6a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 16:52:10 +02:00
vanhofen
01add923d6 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 29009126df
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 16:06:36 +02:00
vanhofen
5223eb01dc tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile() 
Origin commit data
------------------
Commit: 3e283469db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()
 2016-08-26 16:05:45 +02:00
vanhofen
55efa2e847 neutrinoyparser: move search for channellogos to neutrinoyparser 
This is to respecting user's setting to use other channellogos for
WebIf. Now WebIf tries Tuxbox.LogosURL from nhttpd.conf first.

Controlapi ignores these setting and providing the default system
channelogos using NeutrinoAPI->getLogoFile().


Origin commit data
------------------
Commit: 7ac0ed9093
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- neutrinoyparser: move search for channellogos to neutrinoyparser

This is to respecting user's setting to use other channellogos for
WebIf. Now WebIf tries Tuxbox.LogosURL from nhttpd.conf first.

Controlapi ignores these setting and providing the default system
channelogos using NeutrinoAPI->getLogoFile().
 2016-08-26 16:05:45 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
ad4b6a897a nhttpd remove unused 
Origin commit data
------------------
Commit: d139c1c8dd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)
 2016-05-11 13:01:08 +02:00
Jacek Jendrzej
11ff271a19 nhttpd use epg id to get events 
Origin commit data
------------------
Commit: 52f4312aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)
 2016-05-11 12:52:11 +02:00
vanhofen
0493e5c8f8 neutrinoyparser: try to fix nevis build 
Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1
 BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2


Origin commit data
------------------
Commit: f764fe6c54
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-20 (Wed, 20 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: try to fix nevis build

Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1
   BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2
 2016-04-20 08:26:40 +02:00
vanhofen
cf223099a7 neutrinoyparser: fix Trinity detection 
Origin commit data
------------------
Commit: 5e6720a849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-19 (Tue, 19 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: fix Trinity detection
 2016-04-19 13:24:12 +02:00
vanhofen
5942128c5b neutrinoyparser: add Link and Trinity Duo 
Origin commit data
------------------
Commit: feae5aef97
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-19 (Tue, 19 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: add Link and Trinity Duo
 2016-04-19 13:10:48 +02:00
vanhofen
de7fd8bcde yWeb/neutrinoyparser: add icons for scrabled and webtv channels 
Origin commit data
------------------
Commit: 129dacc912
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- yWeb/neutrinoyparser: add icons for scrabled and webtv channels
 2016-03-14 21:55:45 +01:00
vanhofen
c1ab03bd44 yWeb: add link to get stream to channellist; thx to dasda 
Origin commit data
------------------
Commit: 5f613b0b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- yWeb: add link to get stream to channellist; thx to dasda
 2016-03-14 18:14:00 +01:00
vanhofen
6ad61a2b1b neutrinoyparser: smoother view in channellist; align icons right 
Origin commit data
------------------
Commit: 4fd9c12aa9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- neutrinoyparser: smoother view in channellist; align icons right
 2016-03-14 18:14:00 +01:00
Jacek Jendrzej
964e9042cb src/nhttpd/tuxboxapi/ fix AddressSanitizer: strcpy-param-overlap: memory ranges 
Origin commit data
------------------
Commit: 0f2c2c7631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)
 2016-03-12 18:55:53 +01:00
[CST] Focus
86c6632755 nhttpd: try to fix threaded nhttp crashes (again) 
Origin commit data
------------------
Commit: 14a73c3b80
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
 2016-03-08 18:05:34 +03:00
[CST] Focus
0c73944b02 nhttpd/tuxboxapi/neutrinoyparser.cpp: copy event to prevent crash in multi-threaded mode 
Origin commit data
------------------
Commit: 0f771856ab
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-22 (Mon, 22 Feb 2016)
 2016-02-22 18:03:35 +03:00